X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fspear-common.h;h=86e14ffac85804bdd6e63c2a43ada72b7d2d5724;hb=c4203e1d73d8c56d64f9b92299f2f6a4547e4e4a;hp=f75c306b574ab02affa82e332383a60acfd61482;hpb=ef0f2f57524ec85fb9058a23298f2c4995e0d950;p=u-boot diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index f75c306b57..86e14ffac8 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -11,14 +11,11 @@ * Common configurations used for both spear3xx as well as spear6xx */ -#define CONFIG_SYS_GENERIC_BOARD - -/* U-boot Load Address */ +/* U-Boot Load Address */ #define CONFIG_SYS_TEXT_BASE 0x00700000 /* Ethernet driver configuration */ #define CONFIG_MII -#define CONFIG_PHYLIB #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ @@ -38,7 +35,6 @@ /* I2C driver configuration */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_DW #if defined(CONFIG_SPEAR600) #define CONFIG_SYS_I2C_BASE 0xD0200000 #elif defined(CONFIG_SPEAR300) @@ -84,7 +80,6 @@ #define CONFIG_PL011_SERIAL #define CONFIG_PL011_CLOCK (48 * 1000 * 1000) #define CONFIG_CONS_INDEX 0 -#define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, \ 57600, 115200 } @@ -97,28 +92,16 @@ #define CONFIG_NAND_FSMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_ONFI_DETECTION -#define CONFIG_SYS_NAND_QUIET_TEST /* * Command support defines */ -#define CONFIG_CMD_I2C #define CONFIG_CMD_NAND -#define CONFIG_CMD_ENV #define CONFIG_CMD_SAVES -#define CONFIG_CMD_MII -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP /* * Default Environment Varible definitions */ -#if defined(CONFIG_SPEAR_USBTTY) -#define CONFIG_BOOTDELAY -1 -#else -#define CONFIG_BOOTDELAY 1 -#endif - #define CONFIG_ENV_OVERWRITE /* @@ -182,26 +165,20 @@ "console=ttyAMA0,115200 $(othbootargs);" \ CONFIG_BOOTCOMMAND - #define CONFIG_ENV_SIZE 0x02000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* Miscellaneous configurable options */ #define CONFIG_ARCH_CPU_INIT -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_DISPLAY_CPUINFO #define CONFIG_BOOT_PARAMS_ADDR 0x00000100 #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R -#define CONFIG_ZERO_BOOTDELAY_CHECK #define CONFIG_SYS_MEMTEST_START 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x04000000 #define CONFIG_SYS_MALLOC_LEN (1024*1024) -#define CONFIG_IDENT_STRING "-SPEAr" #define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_PROMPT "u-boot> " #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_CBSIZE 256 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ @@ -209,7 +186,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_LOAD_ADDR 0x00800000 -#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_SYS_FLASH_EMPTY_INFO