[U-Boot] [PATCH 05/30] Convert CONFIG_ENV_IS_IN_FLASH to Kconfig

[Daniel Schwierzeck]

Am 09.07.2017 um 22:52 schrieb Simon Glass:
> This converts the following to Kconfig:
>    CONFIG_ENV_IS_IN_FLASH
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 

...

> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 579371e8ee..3046d90b4d 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -21,6 +21,7 @@ config TARGET_QEMU_MIPS
>  	select SUPPORTS_CPU_MIPS64_R1
>  	select SUPPORTS_CPU_MIPS64_R2
>  	select ROM_EXCEPTION_VECTORS
> +	imply ENV_IS_IN_FLASH
>  
>  config TARGET_MALTA
>  	bool "Support malta"
> @@ -42,6 +43,7 @@ config TARGET_MALTA
>  	select SWAP_IO_SPACE
>  	select MIPS_L1_CACHE_SHIFT_6
>  	select ROM_EXCEPTION_VECTORS
> +	imply ENV_IS_IN_FLASH
>  
>  config TARGET_VCT
>  	bool "Support vct"
> @@ -108,6 +110,7 @@ config TARGET_BOSTON
>  	select SUPPORTS_CPU_MIPS64_R2
>  	select SUPPORTS_CPU_MIPS64_R6
>  	select ROM_EXCEPTION_VECTORS
> +	imply ENV_IS_IN_FLASH
>  
>  config TARGET_XILFPGA
>  	bool "Support Imagination Xilfpga"
> @@ -197,6 +200,7 @@ config CPU_MIPS64_R2
>  	bool "MIPS64 Release 2"
>  	depends on SUPPORTS_CPU_MIPS64_R2
>  	select 64BIT
> +	imply ENV_IS_IN_FLASH
>  	help
>  	  Choose this option to build a kernel for release 2 through 5 of the
>  	  MIPS64 architecture.
> @@ -297,6 +301,7 @@ config CPU_MIPS32
>  config CPU_MIPS64
>  	bool
>  	default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6
> +	imply ENV_IS_IN_FLASH

this is wrong as CONFIG_CPU_MIPS64 is a generic MIPS symbol and not a
specific for a machine or board

>  
>  config MIPS_TUNE_4KC
>  	bool
> @@ -401,6 +406,7 @@ config DYNAMIC_IO_PORT_BASE
>  
>  config MIPS_CM
>  	bool
> +	imply ENV_IS_IN_FLASH

dito for CONFIG_MIPS_CM

>  	help
>  	  Select this if your system contains a MIPS Coherence Manager and you
>  	  wish U-Boot to configure it or make use of it to retrieve system

...

> diff --git a/configs/vct_platinum_defconfig b/configs/vct_platinum_defconfig
> index f8b9d7e61b..0e4fcbaa26 100644
> --- a/configs/vct_platinum_defconfig
> +++ b/configs/vct_platinum_defconfig
> @@ -12,6 +12,7 @@ CONFIG_CMD_DHCP=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_SNTP=y
>  CONFIG_CMD_FAT=y
> +CONFIG_ENV_IS_IN_FLASH=y

for consistency with the other MIPS boards in this patch, this should be
added as "imply CONFIG_ENV_IS_IN_FLASH" in arch/mips/Kconfig under
"config TARGET_VCT"

>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
> diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig
> index 2b49d4c9a0..eafece0723 100644
> --- a/configs/vct_platinum_small_defconfig
> +++ b/configs/vct_platinum_small_defconfig
> @@ -18,5 +18,6 @@ CONFIG_SYS_PROMPT="$ "
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  # CONFIG_ISO_PARTITION is not set
> +CONFIG_ENV_IS_IN_FLASH=y

dito

>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_SYS_NS16550=y
> diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig
> index 5efe2236a3..ebbf6c1a02 100644
> --- a/configs/vct_platinumavc_defconfig
> +++ b/configs/vct_platinumavc_defconfig
> @@ -11,5 +11,6 @@ CONFIG_CMD_I2C=y
>  CONFIG_CMD_DHCP=y
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_ISO_PARTITION is not set
> +CONFIG_ENV_IS_IN_FLASH=y

dito

>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_SYS_NS16550=y
> diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig
> index 1b5c125893..f7823ef050 100644
> --- a/configs/vct_platinumavc_small_defconfig
> +++ b/configs/vct_platinumavc_small_defconfig
> @@ -18,5 +18,6 @@ CONFIG_SYS_PROMPT="$ "
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  # CONFIG_ISO_PARTITION is not set
> +CONFIG_ENV_IS_IN_FLASH=y

dito

>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_SYS_NS16550=y
> diff --git a/configs/vct_premium_defconfig b/configs/vct_premium_defconfig
> index 24f776b49f..f89a0a5ee5 100644
> --- a/configs/vct_premium_defconfig
> +++ b/configs/vct_premium_defconfig
> @@ -12,6 +12,7 @@ CONFIG_CMD_DHCP=y
>  CONFIG_CMD_PING=y
>  CONFIG_CMD_SNTP=y
>  CONFIG_CMD_FAT=y
> +CONFIG_ENV_IS_IN_FLASH=y

dito

>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_SYS_NS16550=y
>  CONFIG_USB=y
> diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig
> index 276650dbe1..0420cd15a6 100644
> --- a/configs/vct_premium_small_defconfig
> +++ b/configs/vct_premium_small_defconfig
> @@ -18,5 +18,6 @@ CONFIG_SYS_PROMPT="$ "
>  # CONFIG_CMD_NFS is not set
>  # CONFIG_CMD_MISC is not set
>  # CONFIG_ISO_PARTITION is not set
> +CONFIG_ENV_IS_IN_FLASH=y

dito

>  CONFIG_MTD_NOR_FLASH=y
>  CONFIG_SYS_NS16550=y


-- 
- Daniel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170711/c09ebeb5/attachment.sig>