Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / smdkc100.h

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index dded4d4bf9098cc6c57eb477a2b0d05912103bbb..8a0718e3de16ef93a44810909e903ad588df4462 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -32,12 +32,10 @@
 #define CONFIG_SYS_SDRAM_BASE          0x30000000
 
 /* Text Base */
-#define CONFIG_SYS_TEXT_BASE           0x34800000
 
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
 /*
  * Size of malloc() pool
@@ -56,25 +54,9 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
-/***********************************************************
- * Command definition
- ***********************************************************/
-#undef CONFIG_CMD_NAND
-
-#define CONFIG_CMD_ONENAND
-
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
-#define MTDIDS_DEFAULT         "onenand0=s3c-onenand"
-#define MTDPARTS_DEFAULT       "mtdparts=s3c-onenand:256k(bootloader)"\
-                               ",128k@0x40000(params)"\
-                               ",3m@0x60000(kernel)"\
-                               ",16m@0x360000(test)"\
-                               ",-(UBI)"
-
-#define NORMAL_MTDPARTS_DEFAULT MTDPARTS_DEFAULT
-
 #define CONFIG_BOOTCOMMAND     "run ubifsboot"
 
 #define CONFIG_RAMDISK_BOOT    "root=/dev/ram0 rw rootfstype=ext2" \
@@ -83,10 +65,7 @@
 
 #define CONFIG_COMMON_BOOT     "console=ttySAC0,115200n8" \
                                " mem=128M " \
-                               " " MTDPARTS_DEFAULT
-
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock5 ubi.mtd=4" \
-                       " rootfstype=cramfs " CONFIG_COMMON_BOOT
+                               " " CONFIG_MTDPARTS_DEFAULT
 
 #define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
                        " onenand write 0x32008000 0x0 0x40000\0"
@@ -127,7 +106,7 @@
                "set bootargs " CONFIG_RAMDISK_BOOT \
                " initrd=0x33000000,8M ramdisk=8192\0" \
        "rootfstype=cramfs\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "meminfo=mem=128M\0" \
        "nfsroot=/nfsroot/arm\0" \
        "bootblock=5\0" \
@@ -137,12 +116,7 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_CBSIZE      256     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE      384     /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS     16      /* max number of command args */
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x5e00000)
@@ -174,7 +148,6 @@
 /*-----------------------------------------------------------------------
  * Boot configuration
  */
-#define CONFIG_ENV_IS_IN_ONENAND       1
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128KiB, 0x20000 */
 #define CONFIG_ENV_ADDR                        (256 << 10)     /* 256KiB, 0x40000 */
 #define CONFIG_ENV_OFFSET              (256 << 10)     /* 256KiB, 0x40000 */
@@ -189,9 +162,6 @@
  * Ethernet Contoller driver
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_SMC911X         1       /* we have a SMC9115 on-board   */
-#define CONFIG_SMC911X_16_BIT  1       /* SMC911X_16_BIT Mode          */
-#define CONFIG_SMC911X_BASE    0x98800300      /* SMC911X Drive Base   */
 #define CONFIG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
 #endif /* CONFIG_CMD_NET */