From 64561639080a30aad055e6024612ffe9b2a38baa Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:15 +0000 Subject: 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 --- include/configs/dreamplug.h | 7 +++++-- include/configs/guruplug.h | 11 +++++++++++ include/configs/sheevaplug.h | 13 +++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) (limited to 'include') 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 @@ -123,6 +127,13 @@ #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 */ + /* * File system */ 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 @@ -132,6 +136,13 @@ #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 */ + /* * File system */ @@ -146,4 +157,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_CMD_MTDPARTS +#define CONFIG_SYS_ALT_MEMTEST + #endif /* _CONFIG_SHEEVAPLUG_H */ -- cgit v1.2.1 From 82a19de3d2d5430ce401b6933dbfce39a45bb26c Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:16 +0000 Subject: arm: kirkwood: Remove duplicate definition of CONFIG_CMD_FAT include/configs/guruplug.h defined CONFIG_CMD_FAT twice. Signed-off-by: Quentin Armitage --- include/configs/guruplug.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 318ea87597..48dd0e606b 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 -- cgit v1.2.1 From 5e69947f51d72a2f75f2132c2cc8bae3f0ebcdef Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:17 +0000 Subject: arm: kirkwood: Move configuration of some commands to _defconfig files 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 --- include/configs/dreamplug.h | 4 ---- include/configs/guruplug.h | 9 --------- include/configs/sheevaplug.h | 9 --------- 3 files changed, 22 deletions(-) (limited to 'include') diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index bd834e4328..4c5eafb57a 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 48dd0e606b..3f52f11758 100644 --- a/include/configs/guruplug.h +++ b/include/configs/guruplug.h @@ -39,24 +39,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_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 1eb4858f51..60294ff697 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -39,25 +39,16 @@ */ #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 -- cgit v1.2.1 From ea944003d57e9ac68774742b98bb15ca6a9b6d9c Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:18 +0000 Subject: arm: kirkwood: Use common definition for filesystems 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 --- include/configs/guruplug.h | 25 ++++++++++--------------- include/configs/sheevaplug.h | 25 ++++++++++--------------- 2 files changed, 20 insertions(+), 30 deletions(-) (limited to 'include') diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h index 3f52f11758..3a1f0fae76 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 @@ -49,6 +48,16 @@ #define CONFIG_CMD_IDE #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 60294ff697..f466ee46ec 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 @@ -50,6 +49,16 @@ #define CONFIG_CMD_MII #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 */ -- cgit v1.2.1 From f6b1f665ab01d1ed65c1c078cc1b91c68ad57080 Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:19 +0000 Subject: arm: kirkwood: Align configuration files 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 --- include/configs/dreamplug.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 4c5eafb57a..0c01209280 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -41,6 +41,11 @@ /* 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 */ @@ -131,6 +136,4 @@ */ #define CONFIG_DISPLAY_CPUINFO -#define CONFIG_OF_LIBFDT - #endif /* _CONFIG_DREAMPLUG_H */ -- cgit v1.2.1 From 310866b2e8719cd67cc5f604a6db97e3bb6d60d4 Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:20 +0000 Subject: arm: kirkwood: Remove duplicate definition from dreamplug.h CONFIG_DISPLAY_CPUINFO is already defined in mv-common.h Signed-off-by: Quentin Armitage --- include/configs/dreamplug.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 0c01209280..97b3def079 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 */ -- cgit v1.2.1 From 38c0e864d3f411470093fd5e9dc6ed0c05818212 Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Wed, 28 Oct 2015 00:47:21 +0000 Subject: arm: kirkwood: Move common definitions into common file 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 --- 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 (limited to 'include') diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 97b3def079..3f35616bca 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 3a1f0fae76..712bfd776a 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 0000000000..d7d8d81cb9 --- /dev/null +++ b/include/configs/mv-plug-common.h @@ -0,0 +1,64 @@ +/* + * (C) Copyright 2009-2015 + * Marvell Semiconductor + * + * 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 f466ee46ec..ebc3d642f1 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 */ -- cgit v1.2.1 From f9edf38fa79a28de0a7f3de9d2eafa558cc5e1f5 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 20:32:04 +0100 Subject: arm: kirkwood: ib62x0: drop CONFIG_MACH_TYPE Mainline kernel for this device has only support for device tree. We can safely drop this legacy code. Signed-off-by: Luka Perkov --- include/configs/ib62x0.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 594fceb457..9f1dc8a708 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -22,11 +22,6 @@ #define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* - * Machine type - */ -#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210 - /* * Enable device tree support */ -- cgit v1.2.1 From bd4c1d3e965fc82d6f3ecb059a2833fc0d224266 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 20:33:39 +0100 Subject: arm: kirkwood: ib62x0: build u-boot.kwb Avoid double typing in the shell and build u-boot.kwb when running "make" only. Signed-off-by: Luka Perkov --- include/configs/ib62x0.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include') diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 9f1dc8a708..73caaca0f1 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -22,6 +22,9 @@ #define CONFIG_KW88F6281 /* 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" + /* * Enable device tree support */ -- cgit v1.2.1 From e19f42c3eb2423af8fffe4e947b3a67cd953dc4a Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 21:08:35 +0100 Subject: arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV define The CONFIG_CMD_ENV is enabled by default so we can safely remove it. Signed-off-by: Luka Perkov --- include/configs/ib62x0.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 73caaca0f1..ad966bd9ac 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -42,7 +42,6 @@ */ #define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */ #define CONFIG_SYS_MVFS -#define CONFIG_CMD_ENV #define CONFIG_CMD_BOOTZ #define CONFIG_CMD_IDE #define CONFIG_CMD_MII -- cgit v1.2.1 From ab71ece5055375f61dec144fc5a67b910d7aab03 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 21:23:34 +0100 Subject: arm: kirkwood: ib62x0: make use of defconfig Signed-off-by: Luka Perkov --- include/configs/ib62x0.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index ad966bd9ac..976147da3c 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -45,9 +45,6 @@ #define CONFIG_CMD_BOOTZ #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 -- cgit v1.2.1 From 6d559637d50f7966369580cf1ee6db5464c192d9 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 21:23:51 +0100 Subject: arm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDT It is already defined in included mv-common.h file. Signed-off-by: Luka Perkov --- include/configs/ib62x0.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 976147da3c..fb59ce29f2 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -25,11 +25,6 @@ /* Add target to build it automatically upon "make" */ #define CONFIG_BUILD_TARGET "u-boot.kwb" -/* - * Enable device tree support - */ -#define CONFIG_OF_LIBFDT - /* * Compression configuration */ -- cgit v1.2.1 From 6a26748c5e5558073b72ff55de4dc3ea245d3726 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Sat, 31 Oct 2015 21:28:44 +0100 Subject: arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFS These options were already defined in mv-common.h file. Signed-off-by: Luka Perkov --- include/configs/ib62x0.h | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'include') diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index fb59ce29f2..57b1a43cd4 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -9,7 +9,6 @@ #ifndef _CONFIG_IB62x0_H #define _CONFIG_IB62x0_H - /* * Version number information */ @@ -30,7 +29,6 @@ */ #define CONFIG_BZIP2 #define CONFIG_LZMA -#define CONFIG_LZO /* * Commands configuration @@ -115,17 +113,4 @@ #define CONFIG_RTC_MV #endif /* CONFIG_CMD_DATE */ -/* - * File system - */ -#define CONFIG_CMD_EXT2 -#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 - #endif /* _CONFIG_IB62x0_H */ -- cgit v1.2.1