[for-next] arndale: Enable config_distro_defaults.h

Message ID 1411741537-29691-1-git-send-email-ijc@hellion.org.uk
State New
Headers show

Commit Message

Ian Campbell Sept. 26, 2014, 2:25 p.m.
From: Ian Campbell <ian.campbell@citrix.com>

...and remove explicit setting of things which this implies.

I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 include/configs/arndale.h | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

Comments

Ian Campbell Sept. 26, 2014, 3 p.m. | #1
On Fri, 2014-09-26 at 15:25 +0100, Ian Campbell wrote:
> From: Ian Campbell <ian.campbell@citrix.com>
> 
> ...and remove explicit setting of things which this implies.
> 
> I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

Also FYI Inderpal Singh <inderpal.singh@linaro.org> bounces (person no
longer @ linaro). Not sure what should happen to
board/samsung/arndale/MAINTAINERS then.

Ian.
Ian Campbell Oct. 15, 2014, 8:57 a.m. | #2
On Fri, 2014-09-26 at 15:25 +0100, Ian Campbell wrote:
> From: Ian Campbell <ian.campbell@citrix.com>
> 
> ...and remove explicit setting of things which this implies.
> 
> I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

So it seems I need to rebase this over "config: Move arndale to use
common exynos5250 file" which has made me wonder where in the chain
arndale.h -> exynos5250-common.h -> exynos5-common.h -> exynos-common.h
it would be appropriate to introduce the common config stuff.

Since config_cmd_default.h is in exynos-common.h my initial thought
would be to do both distro_defaults and distro_bootcmd in
exynos-common.h. Sound sane?

Ian.

> ---
>  include/configs/arndale.h | 22 ++--------------------
>  1 file changed, 2 insertions(+), 20 deletions(-)
> 
> diff --git a/include/configs/arndale.h b/include/configs/arndale.h
> index 75f9933..197d0fc 100644
> --- a/include/configs/arndale.h
> +++ b/include/configs/arndale.h
> @@ -45,7 +45,6 @@
>  #define CONFIG_SETUP_MEMORY_TAGS
>  #define CONFIG_CMDLINE_TAG
>  #define CONFIG_INITRD_TAG
> -#define CONFIG_CMDLINE_EDITING
>  
>  /* Power Down Modes */
>  #define S5P_CHECK_SLEEP			0x00000BAD
> @@ -98,15 +97,9 @@
>  /* Command definition*/
>  #include <config_cmd_default.h>
>  
> -#define CONFIG_CMD_PING
> -#define CONFIG_CMD_ELF
>  #define CONFIG_CMD_MMC
> -#define CONFIG_CMD_EXT2
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_NET
>  #define CONFIG_CMD_HASH
>  
> -#define CONFIG_BOOTDELAY		3
>  #define CONFIG_ZERO_BOOTDELAY_CHECK
>  
>  /* USB */
> @@ -133,8 +126,6 @@
>  #define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
>  
>  /* Miscellaneous configurable options */
> -#define CONFIG_SYS_LONGHELP		/* undef to save memory */
> -#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
>  #define CONFIG_SYS_PROMPT		"ARNDALE # "
>  #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
> @@ -201,8 +192,6 @@
>  #define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
>  #define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
>  
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_EFI_PARTITION
>  #define CONFIG_CMD_PART
>  #define CONFIG_PARTITION_UUIDS
>  
> @@ -221,6 +210,8 @@
>  #define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
>  #define CONFIG_I2C_EDID
>  
> +#include <config_distro_defaults.h>
> +
>  /* PMIC */
>  #define CONFIG_PMIC
>  #define CONFIG_POWER_I2C
> @@ -238,15 +229,6 @@
>  #define CONFIG_ENV_SROM_BANK		1
>  #endif /*CONFIG_CMD_NET*/
>  
> -/* Enable PXE Support */
> -#ifdef CONFIG_CMD_NET
> -#define CONFIG_CMD_PXE
> -#define CONFIG_MENU
> -#endif
> -
> -/* Enable devicetree support */
> -#define CONFIG_OF_LIBFDT
> -
>  /* Enable Time Command */
>  #define CONFIG_CMD_TIME
>
Simon Glass Oct. 15, 2014, 10:55 a.m. | #3
Hi Ian,

On 15 October 2014 10:57, Ian Campbell <ian.campbell@citrix.com> wrote:
> On Fri, 2014-09-26 at 15:25 +0100, Ian Campbell wrote:
>> From: Ian Campbell <ian.campbell@citrix.com>
>>
>> ...and remove explicit setting of things which this implies.
>>
>> I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD
>>
>> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>
> So it seems I need to rebase this over "config: Move arndale to use
> common exynos5250 file" which has made me wonder where in the chain
> arndale.h -> exynos5250-common.h -> exynos5-common.h -> exynos-common.h
> it would be appropriate to introduce the common config stuff.
>
> Since config_cmd_default.h is in exynos-common.h my initial thought
> would be to do both distro_defaults and distro_bootcmd in
> exynos-common.h. Sound sane?

I like that idea.

Regards,
Simon

Patch

diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 75f9933..197d0fc 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -45,7 +45,6 @@ 
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
 
 /* Power Down Modes */
 #define S5P_CHECK_SLEEP			0x00000BAD
@@ -98,15 +97,9 @@ 
 /* Command definition*/
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MMC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_HASH
 
-#define CONFIG_BOOTDELAY		3
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* USB */
@@ -133,8 +126,6 @@ 
 #define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"ARNDALE # "
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
@@ -201,8 +192,6 @@ 
 #define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
 #define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 #define CONFIG_CMD_PART
 #define CONFIG_PARTITION_UUIDS
 
@@ -221,6 +210,8 @@ 
 #define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
 #define CONFIG_I2C_EDID
 
+#include <config_distro_defaults.h>
+
 /* PMIC */
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C
@@ -238,15 +229,6 @@ 
 #define CONFIG_ENV_SROM_BANK		1
 #endif /*CONFIG_CMD_NET*/
 
-/* Enable PXE Support */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
-#endif
-
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-
 /* Enable Time Command */
 #define CONFIG_CMD_TIME