From d7d95fd629d0c00b80e1c533c62439e08c1f25e4 Mon Sep 17 00:00:00 2001 From: John Rigby Date: Thu, 27 Sep 2012 13:46:45 -0600 Subject: LINARO: enable u-boot API for supported platforms Signed-off-by: John Rigby --- include/configs/highbank.h | 2 ++ include/configs/mx51_efikamx.h | 2 ++ include/configs/mx51evk.h | 2 ++ include/configs/mx53ard.h | 2 ++ include/configs/mx53loco.h | 2 ++ include/configs/mx6qarm2.h | 2 ++ include/configs/mx6qsabrelite.h | 2 ++ include/configs/omap3_beagle.h | 2 ++ include/configs/omap3_overo.h | 2 ++ include/configs/omap4_panda.h | 3 +++ include/configs/smdk5250.h | 2 ++ include/configs/snowball.h | 23 +++++++---------------- include/configs/vexpress_ca5x2.h | 2 +- include/configs/vexpress_ca9x4.h | 2 +- include/configs/vexpress_common.h | 3 +++ 15 files changed, 35 insertions(+), 18 deletions(-) diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 62cc08ceb..cfaaa0dc8 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -66,6 +66,8 @@ * Command line configuration. */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #define CONFIG_CMD_BDI #define CONFIG_CMD_DHCP diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index ffe771f2d..24535269f 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -25,6 +25,8 @@ #define __CONFIG_H #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 /* * High Level Board Configuration Options diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index dcae53786..4df7c8a52 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -145,6 +145,8 @@ ***********************************************************/ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 62cb42bc4..89cee6b7d 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -78,6 +78,8 @@ /* Command definition */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 55efeb741..eb0e367b2 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -104,6 +104,8 @@ /* Command definition */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index fbc51625b..dd582162b 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -70,6 +70,8 @@ /* Command definition */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #undef CONFIG_CMD_IMLS diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index ec9ab2649..2395d3186 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -126,6 +126,8 @@ /* Command definition */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #undef CONFIG_CMD_IMLS diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index cb2db84a5..42850ea03 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -157,6 +157,8 @@ /* commands to include */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #define CONFIG_CMD_ASKENV diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 626cf7afd..afd3f6022 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -91,6 +91,8 @@ /* commands to include */ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #define CONFIG_CMD_CACHE #define CONFIG_CMD_EXT2 /* EXT2 Support */ diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index bcbc6df46..94dba9f7e 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -70,6 +70,9 @@ #include #define CONFIG_CMD_NET +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 + /* GPIO */ #define CONFIG_CMD_GPIO diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index c0f86228b..3c2582752 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -90,6 +90,8 @@ /* Command definition*/ #include +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #define CONFIG_CMD_PING #define CONFIG_CMD_ELF diff --git a/include/configs/snowball.h b/include/configs/snowball.h index 48dc3ae78..a7ce95fa0 100644 --- a/include/configs/snowball.h +++ b/include/configs/snowball.h @@ -96,23 +96,19 @@ #define CONFIG_GENERIC_MMC #define CONFIG_DOS_PARTITION +#define CONFIG_SYS_NO_FLASH + /* * Commands */ -#define CONFIG_CMD_MEMORY -#define CONFIG_CMD_BOOTD -#define CONFIG_CMD_BDI -#define CONFIG_CMD_IMI -#define CONFIG_CMD_MISC -#define CONFIG_CMD_RUN -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_CONSOLE -#define CONFIG_CMD_LOADS -#define CONFIG_CMD_LOADB +#include + #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_SOURCE + +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 #ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 1 @@ -237,11 +233,6 @@ #define CFG_EMMC_BASE 0x80114000 #define CFG_MMC_BASE 0x80126000 -/* - * FLASH and environment organization - */ -#define CONFIG_SYS_NO_FLASH - /* * base register values for U8500 */ diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h index 599853075..aa60d0d4d 100644 --- a/include/configs/vexpress_ca5x2.h +++ b/include/configs/vexpress_ca5x2.h @@ -31,4 +31,4 @@ #include "vexpress_common.h" #define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca5x2" -#endif // __VEXPRESS_CA5X2_h +#endif diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index f8066a28d..f30e9270d 100644 --- a/include/configs/vexpress_ca9x4.h +++ b/include/configs/vexpress_ca9x4.h @@ -31,4 +31,4 @@ #include "vexpress_common.h" #define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca9x4" -#endif // VEXPRESS_CA9X4_H +#endif diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index ce293fa85..efdb2f182 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -188,6 +188,9 @@ #define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI #define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 #define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000 +#define CONFIG_API +#define CONFIG_SYS_MMC_MAX_DEVICE 2 +#define CONFIG_NET_MULTI /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -- cgit v1.2.3