[U-Boot] [PATCH 0/7] When building u-boot for a Sheevaplug and a Dreamplug, I noticed that
the commands available were not consistent. Particularly important was the omission of support for the ext4 commands on the Dreamplug.
This series of patches starts by making the available commands (excluding flash related commands) consistent across the Sheevaplug, Guruplug and Dreamplug. After this patch, the remaining changes don't alter the code produced, but fixes a few anomalies and streamlines the configuration.
Some commands are able to be configured in the .config file, and if they are also defined in the include/configs/*plug.h files, it causes compiler warnings. Moving the definition into the configs/*plug_defconfig files resolves this.
Some more streaminging of the include/configs/*plug.h files is finally followed by moving all the common definitions into mv-plug-common.h, which is then included from the include/configs/*plug.h files. This should make it easier to maintain consistency of the configurations for the different plug computers.
I have tested the generated u-boots on a Sheevaplug and a Dreamplug, put I don't have a Guruplug to be able to test on.
Quentin Armitage (7): kirkwood: standardise the configuration kirkwood: Remove duplicate definition of CONFIG_CMD_FAT kirkwood: Move configuration of some commands to _defconfig files kirkwood: Use common definition for filesystems kirkwood: Align configuration files kirkwood: Remove duplicate definition from dreamplug.h kirkwood: Move common definitions into common file
configs/dreamplug_defconfig | 5 +++ configs/guruplug_defconfig | 5 +++ configs/sheevaplug_defconfig | 5 +++ include/configs/dreamplug.h | 34 ++------------------ include/configs/guruplug.h | 52 ++---------------------------- include/configs/mv-plug-common.h | 64 ++++++++++++++++++++++++++++++++++++++ include/configs/sheevaplug.h | 49 +++------------------------- 7 files changed, 92 insertions(+), 122 deletions(-) create mode 100644 include/configs/mv-plug-common.h
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 ---
include/configs/dreamplug.h | 7 +++++-- include/configs/guruplug.h | 11 +++++++++++ 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 2815ad8..bd834e4 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 675ec52..318ea87 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 76cdbe0..1eb4858 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 */
Hi Quentin,
On Wed, Oct 28, 2015 at 12:47:15AM +0000, Quentin Armitage wrote:
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
include/configs/dreamplug.h | 7 +++++-- include/configs/guruplug.h | 11 +++++++++++ include/configs/sheevaplug.h | 13 +++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-)
Thank you for the cleanup work. If you plan to do some more please go ahead! All patches applied and pushed into marvell/master.
Luka
include/configs/guruplug.h defined CONFIG_CMD_FAT twice.
Signed-off-by: Quentin Armitage quentin@armitage.org.uk ---
include/configs/guruplug.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 318ea87..48dd0e6 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -57,7 +57,6 @@ #define CONFIG_CMD_NAND #define CONFIG_CMD_PING #define CONFIG_CMD_USB -#define CONFIG_CMD_FAT
/* * mv-common.h should be defined after CMD configs since it used them
For Marvell plugs, move the configuration of DHCP, NAND/SF, PING and USB commands, and HUSH_PARSER into the _defconfig file, rather than the include/configs/*plug.h files.
This avoids compiler warnings of duplicate definitions if the option is selected in the .config, but also defined in the include/configs/*plug.h file.
Signed-off-by: Quentin Armitage quentin@armitage.org.uk ---
configs/dreamplug_defconfig | 5 +++++ configs/guruplug_defconfig | 5 +++++ configs/sheevaplug_defconfig | 5 +++++ include/configs/dreamplug.h | 4 ---- include/configs/guruplug.h | 9 --------- include/configs/sheevaplug.h | 9 --------- 6 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 501fbbf..ec2a749 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -5,3 +5,8 @@ CONFIG_TARGET_DREAMPLUG=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set CONFIG_SPI_FLASH=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_SF=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig index 20b83e3..b7f79a3 100644 --- a/configs/guruplug_defconfig +++ b/configs/guruplug_defconfig @@ -4,3 +4,8 @@ CONFIG_TARGET_GURUPLUG=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 54e2ad7..5a37eea 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -4,3 +4,8 @@ CONFIG_TARGET_SHEEVAPLUG=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set +CONFIG_HUSH_PARSER=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PING=y +CONFIG_CMD_USB=y diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index bd834e4..4c5eafb 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -46,16 +46,12 @@ */ #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
/* * 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 48dd0e6..3f52f11 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -40,23 +40,14 @@ #define CONFIG_OF_LIBFDT
/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ - -/* * Commands configuration */ #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 #define CONFIG_CMD_MII -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB
/* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 1eb4858..60294ff 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -40,24 +40,15 @@ #define CONFIG_OF_LIBFDT
/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ - -/* * Commands configuration */ #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 #define CONFIG_CMD_MII #define CONFIG_CMD_MMC -#define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_USB
/* * mv-common.h should be defined after CMD configs since it used them
include/configs/mv-common.h brings in the required filesystems if CONFIG_SYS_MVFS is defined, so use it for Sheevaplug and Guruplug.
Signed-off-by: Quentin Armitage quentin@armitage.org.uk ---
include/configs/guruplug.h | 25 ++++++++++--------------- include/configs/sheevaplug.h | 25 ++++++++++--------------- 2 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 3f52f11..3a1f0fa 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -32,7 +32,6 @@ */ #define CONFIG_BZIP2 #define CONFIG_LZMA -#define CONFIG_LZO
/* * Enable device tree support @@ -50,6 +49,16 @@ #define CONFIG_CMD_MII
/* + * Standard filesystems + */ +#define CONFIG_SYS_MVFS + +/* + * Extra file system + */ +#define CONFIG_CMD_EXT4 + +/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros */ @@ -124,20 +133,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */
-/* - * File system - */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_RBTREE -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_MTDPARTS - #define CONFIG_SYS_ALT_MEMTEST
#endif /* _CONFIG_GURUPLUG_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 60294ff..f466ee4 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -32,7 +32,6 @@ */ #define CONFIG_BZIP2 #define CONFIG_LZMA -#define CONFIG_LZO
/* * Enable device tree support @@ -51,6 +50,16 @@ #define CONFIG_CMD_MMC
/* + * Standard filesystems + */ +#define CONFIG_SYS_MVFS + +/* + * Extra file system + */ +#define CONFIG_CMD_EXT4 + +/* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros */ @@ -134,20 +143,6 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */
-/* - * File system - */ -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT -#define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_RBTREE -#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define CONFIG_MTD_PARTITIONS -#define CONFIG_CMD_MTDPARTS - #define CONFIG_SYS_ALT_MEMTEST
#endif /* _CONFIG_SHEEVAPLUG_H */
Cosmetic: CONFIG_OF_LIBFDT was in a different position in the config file for the Dreamplug, compared to the Sheevaplug and Guruplug.
Signed-off-by: Quentin Armitage quentin@armitage.org.uk ---
include/configs/dreamplug.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 4c5eafb..0c01209 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -42,6 +42,11 @@ #define CONFIG_BUILD_TARGET "u-boot.kwb"
/* + * Enable device tree support + */ +#define CONFIG_OF_LIBFDT + +/* * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ @@ -131,6 +136,4 @@ */ #define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_OF_LIBFDT - #endif /* _CONFIG_DREAMPLUG_H */
CONFIG_DISPLAY_CPUINFO is already defined in mv-common.h
Signed-off-by: Quentin Armitage quentin@armitage.org.uk ---
include/configs/dreamplug.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 0c01209..97b3def 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -131,9 +131,4 @@
#define CONFIG_SYS_ALT_MEMTEST
-/* - * display enhanced info about the cpu at boot. - */ -#define CONFIG_DISPLAY_CPUINFO - #endif /* _CONFIG_DREAMPLUG_H */
Create include/configs/mv-plug-common.h for common definitions for Sheevaplug, Guruplug and Dreamplug. This will make it easier to ensure the built u-boots stay in track with each other
Signed-off-by: Quentin Armitage quentin@armitage.org.uk
---
include/configs/dreamplug.h | 29 +---------------- include/configs/guruplug.h | 44 +------------------------- include/configs/mv-plug-common.h | 64 ++++++++++++++++++++++++++++++++++++++ include/configs/sheevaplug.h | 40 +---------------------- 4 files changed, 70 insertions(+), 107 deletions(-) create mode 100644 include/configs/mv-plug-common.h
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 97b3def..3f35616 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -34,35 +34,19 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG -#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ - -/* Add target to build it automatically upon "make" */ -#define CONFIG_BUILD_TARGET "u-boot.kwb" - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT
/* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 #define CONFIG_CMD_FAT -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII
/* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h"
/* * Environment variables configurations @@ -122,13 +106,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/
-/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_DREAMPLUG_H */ diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 3a1f0fa..712bfd7 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -20,33 +20,7 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #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 - */ -#define CONFIG_BZIP2 -#define CONFIG_LZMA - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - -/* - * Commands configuration - */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII
/* * Standard filesystems @@ -54,15 +28,10 @@ #define CONFIG_SYS_MVFS
/* - * Extra file system - */ -#define CONFIG_CMD_EXT4 - -/* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h"
/* * Environment variables configurations @@ -126,13 +95,4 @@ #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /*CONFIG_MVSATA_IDE*/
-/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_GURUPLUG_H */ diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h new file mode 100644 index 0000000..d7d8d81 --- /dev/null +++ b/include/configs/mv-plug-common.h @@ -0,0 +1,64 @@ +/* + * (C) Copyright 2009-2015 + * Marvell Semiconductor <www.marvell.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _CONFIG_MARVELL_PLUG_H +#define _CONFIG_MARVELL_PLUG_H + + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#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 + */ +#ifdef CONFIG_SYS_MVFS +#define CONFIG_BZIP2 +#define CONFIG_LZMA +#define CONFIG_CMD_BOOTZ +#endif /* CONFIG_SYS_MVFS */ + +/* + * Enable device tree support + */ +#define CONFIG_OF_LIBFDT + +/* + * Commands configuration + */ +#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_CMD_DATE +#define CONFIG_CMD_ENV +#define CONFIG_CMD_IDE +#define CONFIG_CMD_MII + +/* + * Extra file system + */ +#define CONFIG_CMD_EXT4 + +/* + * mv-common.h should be defined after CMD configs since it used them + * to enable certain macros + */ +#include "mv-common.h" + +/* + * RTC driver configuration + */ +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + +#define CONFIG_SYS_ALT_MEMTEST + +#endif /* _CONFIG_MARVELL_PLUG_H */ diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index f466ee4..ebc3d64 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -20,33 +20,11 @@ * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ -#define CONFIG_KW88F6281 1 /* SOC Name */ #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 - */ -#define CONFIG_BZIP2 -#define CONFIG_LZMA - -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT
/* * Commands configuration */ -#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -#define CONFIG_CMD_BOOTZ -#define CONFIG_CMD_DATE -#define CONFIG_CMD_ENV -#define CONFIG_CMD_IDE -#define CONFIG_CMD_MII #define CONFIG_CMD_MMC
/* @@ -55,15 +33,10 @@ #define CONFIG_SYS_MVFS
/* - * Extra file system - */ -#define CONFIG_CMD_EXT4 - -/* - * mv-common.h should be defined after CMD configs since it used them + * mv-plug-common.h should be defined after CMD configs since it used them * to enable certain macros */ -#include "mv-common.h" +#include "mv-plug-common.h"
/* * Environment variables configurations @@ -136,13 +109,4 @@ #define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif /* CONFIG_CMD_IDE */
-/* - * RTC driver configuration - */ -#ifdef CONFIG_CMD_DATE -#define CONFIG_RTC_MV -#endif /* CONFIG_CMD_DATE */ - -#define CONFIG_SYS_ALT_MEMTEST - #endif /* _CONFIG_SHEEVAPLUG_H */
participants (2)
-
Luka Perkov -
Quentin Armitage