Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 6a5bc126b07f1174fec87678d43371e3f278d340..57a698520bde19cb34fcb2c51b44b4f9834858e3 100644 (file)
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -11,7 +11,6 @@
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
 
 #define CONFIG_CMD_NAND
@@ -55,7 +54,6 @@
 #endif
 
 /* Boot Linux */
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_BOOTARGS                "console=ttyAMA0,115200"
 #define CONFIG_BOOTCOMMAND     "bootm"