[PATCH 1/2] rockchip: puma-rk3399: enforce ENV_IS_NOWHERE with Kconfig select

[Kever Yang]

On 2023/3/2 01:31, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> Instead of letting the compiler error out if CONFIG_ENV_IS_NOWHERE is
> not selected by the user, let's just enforce it when the user builds for
> Puma RK3399 so that no check needs to be performed by the compiler and
> the configuration is always valid.
>
> Suggested-by: Tom Rini <trini at konsulko.com>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   board/theobroma-systems/puma_rk3399/Kconfig       | 1 +
>   board/theobroma-systems/puma_rk3399/puma-rk3399.c | 4 ----
>   configs/puma-rk3399_defconfig                     | 1 -
>   3 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/board/theobroma-systems/puma_rk3399/Kconfig b/board/theobroma-systems/puma_rk3399/Kconfig
> index 15af55574c0..cc745f56b57 100644
> --- a/board/theobroma-systems/puma_rk3399/Kconfig
> +++ b/board/theobroma-systems/puma_rk3399/Kconfig
> @@ -11,6 +11,7 @@ config SYS_CONFIG_NAME
>   
>   config BOARD_SPECIFIC_OPTIONS # dummy
>   	def_bool y
> +	select ENV_IS_NOWHERE
>   
>   config ENV_SIZE
>   	default 0x4000
> diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
> index 97f398bd754..614a60ee8f9 100644
> --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
> +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
> @@ -136,10 +136,6 @@ int mmc_get_env_dev(void)
>   	return CONFIG_SYS_MMC_ENV_DEV;
>   }
>   
> -#if !IS_ENABLED(CONFIG_ENV_IS_NOWHERE)
> -#error Please enable CONFIG_ENV_IS_NOWHERE
> -#endif
> -
>   enum env_location arch_env_get_location(enum env_operation op, int prio)
>   {
>   	const char *boot_device =
> diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
> index 9e3e23f825c..59017b26944 100644
> --- a/configs/puma-rk3399_defconfig
> +++ b/configs/puma-rk3399_defconfig
> @@ -55,7 +55,6 @@ CONFIG_SPL_OF_CONTROL=y
>   CONFIG_OF_LIVE=y
>   CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
>   CONFIG_ENV_OVERWRITE=y
> -CONFIG_ENV_IS_NOWHERE=y
>   CONFIG_ENV_IS_IN_MMC=y
>   CONFIG_ENV_IS_IN_SPI_FLASH=y
>   CONFIG_ENV_SPI_MAX_HZ=50000000
>