[U-Boot] [PATCH v2 1/2] rockchip: configs: only add available BOOT_TARGET_DEVICES

[Dr. Philipp Tomsich]

> On 6 Oct 2017, at 17:08, Klaus Goger <klaus.goger at theobroma-systems.com> wrote:
> 
> BOOT_TARGET_DEVICES should only be added if the corresponding u-boot
> command is enabled.
> 
> Signed-off-by: Klaus Goger <klaus.goger at theobroma-systems.com>

Reviewed-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>

Required changes below.

> ---
> 
> Changes in v2:
> - Add patch to series to prevent build errors if boards don't enable the
>  required u-boot command for distroboot
> 
> include/configs/rockchip-common.h | 39 +++++++++++++++++++++++++++------------
> 1 file changed, 27 insertions(+), 12 deletions(-)
> 
> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
> index 2d190a964a..3292525fd5 100644
> --- a/include/configs/rockchip-common.h
> +++ b/include/configs/rockchip-common.h
> @@ -11,22 +11,37 @@
> #ifndef CONFIG_SPL_BUILD
> #include <config_distro_defaults.h>
> 
> -/* First try to boot from SD (index 0), then eMMC (index 1 */
> +/* First try to boot from SD (index 0), then eMMC (index 1) */
> +#ifdef CONFIG_CMD_MMC
> +	#define BOOT_TARGET_MMC(func) \
> +		func(MMC, mmc, 0) \
> +		func(MMC, mmc, 1)
> +#else
> +	#define BOOT_TARGET_MMC(func)
> +#endif
> +
> #ifdef CONFIG_CMD_USB
> -#define BOOT_TARGET_DEVICES(func) \
> -	func(MMC, mmc, 0) \
> -	func(MMC, mmc, 1) \
> -	func(USB, usb, 0) \
> -	func(PXE, pxe, na) \
> -	func(DHCP, dhcp, na)
> +	#define BOOT_TARGET_USB(func) func(USB, usb, 0)
> #else
> -#define BOOT_TARGET_DEVICES(func) \
> -	func(MMC, mmc, 0) \
> -	func(MMC, mmc, 1) \
> -	func(PXE, pxe, na) \
> -	func(DHCP, dhcp, na)
> +	#define BOOT_TARGET_USB(func)
> +#endif
> +
> +#if CONFIG_CMD_PXE

As this section is #ifndef CONFIG_SPL_BUILD anyway, please us
CONFIG_IS_ENABLED(CMD_PXE) here.

> +	#define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
> +#else
> +	#define BOOT_TARGET_PXE(func)
> +#endif
> +
> +#if CONFIG_CMD_DHCP

Same as above (note that #if is not the same as #ifdef).

> +	#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
> #endif

There is an #else path missing for this one.

> +#define BOOT_TARGET_DEVICES(func) \
> +	BOOT_TARGET_MMC(func) \
> +	BOOT_TARGET_USB(func) \
> +	BOOT_TARGET_PXE(func) \
> +	BOOT_TARGET_DHCP(func)
> +
> #define CONFIG_RANDOM_UUID
> 
> #ifdef CONFIG_ARM64
> -- 
> 2.11.0
>