Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / include / configs / PMC405.h

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index c2db5ea..8235b85 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -59,7 +59,6 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_PPC4xx_EMAC
@@ -110,9 +109,6 @@
 #define CONFIG_SYS_PROMPT      "=> "           /* Monitor Command Prompt */
 
 #undef CONFIG_SYS_HUSH_PARSER                  /* use "hush" command parser */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#endif
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O Buffer Size */
@@ -330,7 +326,6 @@
 /* End of used area in RAM */
 #define CONFIG_SYS_INIT_RAM_SIZE               CONFIG_SYS_OCM_DATA_SIZE
 
-/* size in bytes reserved for initial data */
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - \
                                         GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET