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

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

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 667d68f960aa48fa62afbc8b37459c2d182023ab..c4990883af266945b6457623303ff0d6c1a0401a 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9263"
 #define CONFIG_PM9263          1       /* on a Ronetix PM9263 Board    */
 #define CONFIG_ARCH_CPU_INIT
-#define CONFIG_SYS_TEXT_BASE   0
 
 #define CONFIG_MACH_TYPE       MACH_TYPE_PM9263
 
@@ -169,9 +168,6 @@
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE      1
-#define CONFIG_BOOTP_BOOTPATH          1
-#define CONFIG_BOOTP_GATEWAY           1
-#define CONFIG_BOOTP_HOSTNAME          1
 
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS   1
@@ -278,18 +274,9 @@
 
 #define CONFIG_CON_ROT                 "fbcon=rotate:3 "
 
-#define MTDIDS_DEFAULT                 "nor0=physmap-flash.0,nand0=nand"
-#define MTDPARTS_DEFAULT               \
-       "mtdparts=physmap-flash.0:"     \
-               "256k(u-boot)ro,"       \
-               "64k(u-boot-env)ro,"    \
-               "1408k(kernel),"        \
-               "-(rootfs);"            \
-       "nand:-(nand)"
-
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
-       "mtdids=" MTDIDS_DEFAULT "\0"                           \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                       \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                            \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                        \
        "partition=nand0,0\0"                                   \
        "ramargs=setenv bootargs $(bootargs) $(mtdparts)\0"     \
        "nfsargs=setenv bootargs root=/dev/nfs rw "             \
@@ -309,13 +296,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_PBSIZE              \
-               (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP            1
-#define CONFIG_CMDLINE_EDITING         1
-
 /*
  * Size of malloc() pool
  */