Re: [ptxdist] [PATCH 2/7] u-boot: add support for oldconfig/menuconfig

[Michael Olbrich <m.olbrich@pengutronix.de>]

Hi,

So it looks like we'll need to support the old mechanism as well.
Add a option 'EXTERNAL_CONFIG' to enable the config file.

On Wed, Oct 10, 2018 at 02:03:33PM +0200, Ahmad Fatoum wrote:
> while at it, remove U_BOOT_PATH, because it's PATH=$(CROSS_PATH) already
> by default.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  rules/u-boot.make | 42 ++++++++++++++++++++++++++++++++++--------
>  1 file changed, 34 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index aa7a01ca8fea..46cfc192825a 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -26,6 +26,9 @@ U_BOOT_SOURCE	:= $(SRCDIR)/$(U_BOOT).$(U_BOOT_SUFFIX)
>  U_BOOT_DIR	:= $(BUILDDIR)/$(U_BOOT)
>  U_BOOT_LICENSE	:= GPL-2.0-only
>  

ifdef PTXCONF_EXTERNAL_CONFIG

> +U_BOOT_CONFIG	:= $(call ptx/in-platformconfigdir, \
> +		$(call remove_quotes, $(PTXCONF_U_BOOT_CONFIG)))
> +
>  # ----------------------------------------------------------------------------
>  # Prepare
>  # ----------------------------------------------------------------------------
> @@ -37,17 +40,26 @@ U_BOOT_WRAPPER_BLACKLIST := \
>  	TARGET_DEBUG \
>  	TARGET_BUILD_ID
>  
> -U_BOOT_PATH	:= PATH=$(CROSS_PATH)
> -U_BOOT_MAKE_OPT	:= CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) HOSTCC=$(HOSTCC)
> +U_BOOT_CONF_ENV	:= KCONFIG_NOTIMESTAMP=1
> +U_BOOT_CONF_TOOL	:= kconfig
> +U_BOOT_CONF_OPT	:= CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) HOSTCC=$(HOSTCC)
>  U_BOOT_MAKE_PAR	:= NO
>  U_BOOT_TAGS_OPT	:= ctags cscope etags
> +U_BOOT_MAKE_OPT	:= $(U_BOOT_CONF_OPT)
>  
> -$(STATEDIR)/u-boot.prepare:
> -	@$(call targetinfo)

ifdef PTXCONF_EXTERNAL_CONFIG
	@$(call world/prepare, U_BOOT)
else
	... the old stuff
endif

> -	cd $(U_BOOT_DIR) && \
> -		$(U_BOOT_PATH) \
> -		$(MAKE) $(U_BOOT_MAKE_OPT) $(PTXCONF_U_BOOT_CONFIG)
> -	@$(call touch)
> +ifdef PTXCONF_U_BOOT
> +$(U_BOOT_CONFIG):
> +	@echo
> +	@echo "****************************************************************************"
> +	@echo "***** Please generate a u-boot config with 'ptxdist menuconfig u-boot' *****"
> +	@echo "****************************************************************************"
> +	@echo
> +	@echo
> +	@exit 1
> +endif
> +
> +
> +$(STATEDIR)/u-boot.prepare: $(U_BOOT_CONFIG)

This is no longer needed. PTXdist creates this dependency implicitly.

Michael

>  
>  # ----------------------------------------------------------------------------
>  # Install
> @@ -91,4 +103,18 @@ $(STATEDIR)/u-boot.clean:
>  	@rm -f $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec $(IMAGEDIR)/u-boot.elf
>  	@rm -f $(IMAGEDIR)/u-boot.imx
>  
> +# ----------------------------------------------------------------------------
> +# oldconfig / menuconfig
> +# ----------------------------------------------------------------------------
> +
> +u-boot_oldconfig u-boot_menuconfig u-boot_nconfig: $(STATEDIR)/u-boot.extract
> +	@$(call world/kconfig-setup, U_BOOT)
> +
> +	@cd $(U_BOOT_DIR) && \
> +		$(U_BOOT_PATH) $(U_BOOT_ENV) $(MAKE) $(U_BOOT_CONF_OPT) \
> +		$(subst u-boot_,,$@)
> +
> +	@$(call world/kconfig-sync, U_BOOT)
> +
> +
>  # vim: syntax=make
> -- 
> 2.19.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de