diff options
| author | Quentin Armitage <quentin@armitage.org.uk> | 2015-10-28 00:47:15 +0000 |
|---|---|---|
| committer | Luka Perkov <luka.perkov@sartura.hr> | 2015-11-17 23:41:41 +0100 |
| commit | 64561639080a30aad055e6024612ffe9b2a38baa (patch) | |
| tree | d7a2c0c87f7f3b5e8af3a137d01119917dda78a4 /include | |
| parent | a21b4f0f9977915f9a609fe8cc8fba2d1a3ba629 (diff) | |
| download | blackbird-obmc-uboot-64561639080a30aad055e6024612ffe9b2a38baa.tar.gz blackbird-obmc-uboot-64561639080a30aad055e6024612ffe9b2a38baa.zip | |
arm: kirkwood: standardise the configuration
The Marvell plugs are very similar systems, and so it makes sense
for their u-boots to have the same commands/configuration.
Add EXT4 and MII to Dreamplug, DATE to Guruplug and Sheevaplug.
Add CONFIG_SYS_ALT_MEMTEST to Sheevaplug.
There are still command differences around NAND, SPI/NOR.
Also default to building u-boot.kwb for Sheevaplug and Guruplug.
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/dreamplug.h | 7 | ||||
| -rw-r--r-- | include/configs/guruplug.h | 11 | ||||
| -rw-r--r-- | include/configs/sheevaplug.h | 13 |
3 files changed, 29 insertions, 2 deletions
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 2815ad8623..bd834e4328 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -45,14 +45,17 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 #define CONFIG_CMD_FAT +#define CONFIG_CMD_IDE +#define CONFIG_CMD_MII #define CONFIG_CMD_SF #define CONFIG_CMD_PING #define CONFIG_CMD_USB -#define CONFIG_CMD_IDE -#define CONFIG_CMD_DATE /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 675ec52bcf..318ea87597 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -24,6 +24,9 @@ #define CONFIG_MACH_GURUPLUG /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" + /* * Compression configuration */ @@ -46,6 +49,7 @@ */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_BOOTZ +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE @@ -124,6 +128,13 @@ #endif /*CONFIG_MVSATA_IDE*/ /* + * RTC driver configuration + */ +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + +/* * File system */ #define CONFIG_CMD_EXT2 diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 76cdbe0c6d..1eb4858f51 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -24,6 +24,9 @@ #define CONFIG_MACH_SHEEVAPLUG /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" + /* * Compression configuration */ @@ -46,6 +49,7 @@ */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #define CONFIG_CMD_BOOTZ +#define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE @@ -133,6 +137,13 @@ #endif /* CONFIG_CMD_IDE */ /* + * RTC driver configuration + */ +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + +/* * File system */ #define CONFIG_CMD_EXT2 @@ -146,4 +157,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS +#define CONFIG_SYS_ALT_MEMTEST + #endif /* _CONFIG_SHEEVAPLUG_H */ |
