X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fspear-common.h;h=269ce7e0f3b96da0b46a95dc2868eff5126fe24e;hb=cb04db155f4e7ccaec1b961d8a84e1a1b9524594;hp=c0eba3721d70d30306f2ea9826d63a19547ac3e2;hpb=a7e8c15f71456d55ccb27f843862af03a00e0957;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index c0eba37..269ce7e 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 */ -/* U-boot Load Address */ +/* U-Boot Load Address */ #define CONFIG_SYS_TEXT_BASE 0x00700000 /* Ethernet driver configuration */ #define CONFIG_MII -#define CONFIG_DESIGNWARE_ETH -#define CONFIG_NET_MULTI -#define CONFIG_PHYLIB #define CONFIG_PHY_RESET_DELAY 10000 /* in usec */ #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ @@ -37,8 +34,8 @@ #define CONFIG_EXTRA_ENV_USBTTY "usbtty=cdc_acm\0" /* I2C driver configuration */ -#define CONFIG_HARD_I2C -#define CONFIG_DW_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_DW #if defined(CONFIG_SPEAR600) #define CONFIG_SYS_I2C_BASE 0xD0200000 #elif defined(CONFIG_SPEAR300) @@ -97,24 +94,14 @@ #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_MEMORY -#define CONFIG_CMD_RUN #define CONFIG_CMD_SAVES -#define CONFIG_CMD_NET #define CONFIG_CMD_MII -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP - -/* This must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include /* * Default Environment Varible definitions @@ -188,7 +175,6 @@ "console=ttyAMA0,115200 $(othbootargs);" \ CONFIG_BOOTCOMMAND - #define CONFIG_ENV_SIZE 0x02000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE @@ -201,17 +187,12 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_MISC_INIT_R #define CONFIG_ZERO_BOOTDELAY_CHECK -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_STOP_STR " " -#define CONFIG_AUTOBOOT_PROMPT \ - "Hit SPACE in %d seconds to stop autoboot.\n", bootdelay #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 + \