[ptxdist] [PATCH 1/3] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[ptxdist] [PATCH 1/3] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[Roland Hieber]

Until now this worked without setting the variable because
ptxd_make_world_init tries to autodetect the config tool, but we should
make this explicit.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/barebox.make                              | 1 +
 rules/kernel.make                               | 1 +
 rules/templates/template-barebox-imx-habv4-make | 1 +
 rules/templates/template-barebox-make           | 1 +
 rules/templates/template-kernel-make            | 1 +
 5 files changed, 5 insertions(+)

diff --git a/rules/barebox.make b/rules/barebox.make
index 2a9262a44032..b2ca49b9fb85 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH)
 BAREBOX_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_CONF_TOOL := kconfig
 BAREBOX_CONF_OPT := \
 	-C $(BAREBOX_DIR) \
 	O=$(BAREBOX_BUILD_DIR) \
diff --git a/rules/kernel.make b/rules/kernel.make
index 7032b0caaba0..d1df7f98f515 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -79,6 +79,7 @@ KERNEL_SHARED_OPT += \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 endif
 
+KERNEL_CONF_TOOL := kconfig
 KERNEL_CONF_OPT := \
 	$(KERNEL_SHARED_OPT)
 
diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
index 3ee6e83805bb..09c099bb5076 100644
--- a/rules/templates/template-barebox-imx-habv4-make
+++ b/rules/templates/template-barebox-imx-habv4-make
@@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index 9bed9dbeb7c9..dc30dc57c4b1 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index c53110165ec3..77bcd628948d 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT	+= \
 	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 
+KERNEL_@PACKAGE@_CONF_TOOL := kconfig
 KERNEL_@PACKAGE@_CONF_OPT	:= \
 	$(KERNEL_@PACKAGE@_SHARED_OPT)
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/3] barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config

[Roland Hieber]

These config targets are documented in the man page, but until now, they
only resulted in an error:

    $ ptxdist alldefconfig kernel
    ptxdist: Checking dependencies. This may take some seconds.

    make: *** No rule to make target 'kernel_alldefconfig'.  Stop.

Both kernel and barebox support all config targets which can be given on
the ptxdist command line, so keep the match in the make recipe broad, as
the ptxdist option parser will catch unknown config targets.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/barebox.make                              | 2 +-
 rules/barebox_mlo.make                          | 2 +-
 rules/kernel.make                               | 2 +-
 rules/templates/template-barebox-imx-habv4-make | 2 +-
 rules/templates/template-barebox-make           | 2 +-
 rules/templates/template-kernel-make            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index b2ca49b9fb85..94534db39ebe 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -207,7 +207,7 @@ $(STATEDIR)/barebox.clean:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-barebox_oldconfig barebox_menuconfig barebox_nconfig: $(STATEDIR)/barebox.extract
+barebox_%config: $(STATEDIR)/barebox.extract
 	@$(call world/kconfig, BAREBOX, $(subst barebox_,,$@))
 
 # vim: syntax=make
diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
index f0d79f151e08..ffb2741dae7f 100644
--- a/rules/barebox_mlo.make
+++ b/rules/barebox_mlo.make
@@ -97,7 +97,7 @@ $(STATEDIR)/barebox_mlo.clean:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-barebox_mlo_oldconfig barebox_mlo_menuconfig barebox_mlo_nconfig: $(STATEDIR)/barebox_mlo.extract
+barebox_mlo_%config: $(STATEDIR)/barebox_mlo.extract
 	@if test -e $(BAREBOX_MLO_CONFIG); then \
 		cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \
 	fi
diff --git a/rules/kernel.make b/rules/kernel.make
index d1df7f98f515..89d4cf5daf7d 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -321,7 +321,7 @@ endif
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract
+kernel_%config: $(STATEDIR)/kernel.extract
 	@$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
 
 # vim: syntax=make
diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
index 09c099bb5076..cfe4c2de36eb 100644
--- a/rules/templates/template-barebox-imx-habv4-make
+++ b/rules/templates/template-barebox-imx-habv4-make
@@ -112,7 +112,7 @@ $(STATEDIR)/barebox-@package@.clean:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract
+barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract
 	@$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@))
 
 # vim: syntax=make
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index dc30dc57c4b1..6a9599240b64 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -92,7 +92,7 @@ $(STATEDIR)/barebox-@package@.clean:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract
+barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract
 	@$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@))
 
 # vim: syntax=make
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index 77bcd628948d..73b39d0db718 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -115,7 +115,7 @@ $(STATEDIR)/kernel-@package@.targetinstall:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel-@package@_oldconfig kernel-@package@_menuconfig kernel-@package@_nconfig: $(STATEDIR)/kernel-@package@.extract
+kernel-@package@_%config: $(STATEDIR)/kernel-@package@.extract
 	@$(call world/kconfig, KERNEL_@PACKAGE@, $(subst kernel-@package@_,,$@))
 
 # vim: syntax=make
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/3] doc: ref parameter: document 'alldefconfig'

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/ref_parameter.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
index 3e6df6f83e55..1d54fa4b4428 100644
--- a/doc/ref_parameter.rst
+++ b/doc/ref_parameter.rst
@@ -95,12 +95,13 @@ Setup and Project Actions
   functionality as ``menuconfig``. It can be used instead of ``menuconfig``
   for all the component described above.
 
-``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig [<component>]``, ``allnoconfig [<component>]``, ``randconfig [<component>]``
+``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig [<component>]``, ``allnoconfig [<component>]``, ``alldefconfig [<component>]``, ``randconfig [<component>]``
   this action will run the corresponding kconfig action for the specified
   component. ``oldconfig`` will prompt for all new options.
-  ``allmodconfig``, ``allyesconfig`` and ``allnoconfig`` will set all
-  options to 'm', 'y' or 'n' respectively. ``randconfig`` will randomize
-  the options. The ``KCONFIG_ALLCONFIG`` and ``KCONFIG_SEED`` environment
+  ``allmodconfig``, ``allyesconfig``, ``allnoconfig`` or ``alldefconfig``
+  will set all options to 'm', 'y', 'n', or their default values respectively.
+  ``randconfig`` will randomize the options.
+  The ``KCONFIG_ALLCONFIG`` and ``KCONFIG_SEED`` environment
   variables can be used as described in the Linux kernel documentation.
 
 ``migrate``
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 1/3] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[Michael Olbrich]

On Fri, Aug 07, 2020 at 12:44:23PM +0200, Roland Hieber wrote:
> Until now this worked without setting the variable because
> ptxd_make_world_init tries to autodetect the config tool, but we should
> make this explicit.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/barebox.make                              | 1 +
>  rules/kernel.make                               | 1 +
>  rules/templates/template-barebox-imx-habv4-make | 1 +
>  rules/templates/template-barebox-make           | 1 +
>  rules/templates/template-kernel-make            | 1 +
>  5 files changed, 5 insertions(+)
> 
> diff --git a/rules/barebox.make b/rules/barebox.make
> index 2a9262a44032..b2ca49b9fb85 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH)
>  BAREBOX_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_CONF_TOOL := kconfig
>  BAREBOX_CONF_OPT := \

I prefer tab aligned ':=' when there are multiple lines...

>  	-C $(BAREBOX_DIR) \
>  	O=$(BAREBOX_BUILD_DIR) \
> diff --git a/rules/kernel.make b/rules/kernel.make
> index 7032b0caaba0..d1df7f98f515 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -79,6 +79,7 @@ KERNEL_SHARED_OPT += \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  endif
>  
> +KERNEL_CONF_TOOL := kconfig
>  KERNEL_CONF_OPT := \
>  	$(KERNEL_SHARED_OPT)
>  
> diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
> index 3ee6e83805bb..09c099bb5076 100644
> --- a/rules/templates/template-barebox-imx-habv4-make
> +++ b/rules/templates/template-barebox-imx-habv4-make
> @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
>  BAREBOX_@PACKAGE@_CONF_OPT := \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
> diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
> index 9bed9dbeb7c9..dc30dc57c4b1 100644
> --- a/rules/templates/template-barebox-make
> +++ b/rules/templates/template-barebox-make
> @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
>  BAREBOX_@PACKAGE@_CONF_OPT := \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
> diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
> index c53110165ec3..77bcd628948d 100644
> --- a/rules/templates/template-kernel-make
> +++ b/rules/templates/template-kernel-make
> @@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT	+= \
>  	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  
> +KERNEL_@PACKAGE@_CONF_TOOL := kconfig
>  KERNEL_@PACKAGE@_CONF_OPT	:= \

Especially here where the existing line already has the tab.

Michael

>  	$(KERNEL_@PACKAGE@_SHARED_OPT)
>  
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config

[Michael Olbrich]

Thanks, applied as b0f9f2fe33ca9027a554395c7ff467cabdc255e3.

Michael

[sent from post-receive hook]

On Mon, 17 Aug 2020 08:18:22 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> These config targets are documented in the man page, but until now, they
> only resulted in an error:
> 
>     $ ptxdist alldefconfig kernel
>     ptxdist: Checking dependencies. This may take some seconds.
> 
>     make: *** No rule to make target 'kernel_alldefconfig'.  Stop.
> 
> Both kernel and barebox support all config targets which can be given on
> the ptxdist command line, so keep the match in the make recipe broad, as
> the ptxdist option parser will catch unknown config targets.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200807104425.30276-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/barebox.make b/rules/barebox.make
> index 2a9262a44032..90e193c8ea9a 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -206,7 +206,7 @@ $(STATEDIR)/barebox.clean:
>  # oldconfig / menuconfig
>  # ----------------------------------------------------------------------------
>  
> -barebox_oldconfig barebox_menuconfig barebox_nconfig: $(STATEDIR)/barebox.extract
> +barebox_%config: $(STATEDIR)/barebox.extract
>  	@$(call world/kconfig, BAREBOX, $(subst barebox_,,$@))
>  
>  # vim: syntax=make
> diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make
> index f0d79f151e08..ffb2741dae7f 100644
> --- a/rules/barebox_mlo.make
> +++ b/rules/barebox_mlo.make
> @@ -97,7 +97,7 @@ $(STATEDIR)/barebox_mlo.clean:
>  # oldconfig / menuconfig
>  # ----------------------------------------------------------------------------
>  
> -barebox_mlo_oldconfig barebox_mlo_menuconfig barebox_mlo_nconfig: $(STATEDIR)/barebox_mlo.extract
> +barebox_mlo_%config: $(STATEDIR)/barebox_mlo.extract
>  	@if test -e $(BAREBOX_MLO_CONFIG); then \
>  		cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \
>  	fi
> diff --git a/rules/kernel.make b/rules/kernel.make
> index c91267c34da0..593e03dc4a3e 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -322,7 +322,7 @@ endif
>  # oldconfig / menuconfig
>  # ----------------------------------------------------------------------------
>  
> -kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract
> +kernel_%config: $(STATEDIR)/kernel.extract
>  	@$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
>  
>  # vim: syntax=make
> diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
> index 3ee6e83805bb..a7d287822547 100644
> --- a/rules/templates/template-barebox-imx-habv4-make
> +++ b/rules/templates/template-barebox-imx-habv4-make
> @@ -111,7 +111,7 @@ $(STATEDIR)/barebox-@package@.clean:
>  # oldconfig / menuconfig
>  # ----------------------------------------------------------------------------
>  
> -barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract
> +barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract
>  	@$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@))
>  
>  # vim: syntax=make
> diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
> index 9bed9dbeb7c9..ae7e06038e23 100644
> --- a/rules/templates/template-barebox-make
> +++ b/rules/templates/template-barebox-make
> @@ -91,7 +91,7 @@ $(STATEDIR)/barebox-@package@.clean:
>  # oldconfig / menuconfig
>  # ----------------------------------------------------------------------------
>  
> -barebox-@package@_oldconfig barebox-@package@_menuconfig barebox-@package@_nconfig: $(STATEDIR)/barebox-@package@.extract
> +barebox-@package@_%config: $(STATEDIR)/barebox-@package@.extract
>  	@$(call world/kconfig, BAREBOX_@PACKAGE@, $(subst barebox-@package@_,,$@))
>  
>  # vim: syntax=make
> diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
> index c53110165ec3..697c18145cec 100644
> --- a/rules/templates/template-kernel-make
> +++ b/rules/templates/template-kernel-make
> @@ -114,7 +114,7 @@ $(STATEDIR)/kernel-@package@.targetinstall:
>  # oldconfig / menuconfig
>  # ----------------------------------------------------------------------------
>  
> -kernel-@package@_oldconfig kernel-@package@_menuconfig kernel-@package@_nconfig: $(STATEDIR)/kernel-@package@.extract
> +kernel-@package@_%config: $(STATEDIR)/kernel-@package@.extract
>  	@$(call world/kconfig, KERNEL_@PACKAGE@, $(subst kernel-@package@_,,$@))
>  
>  # vim: syntax=make

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] doc: ref parameter: document 'alldefconfig'

[Michael Olbrich]

Thanks, applied as cf999c06b26ab472ea8f0626dd089725b3cac632.

Michael

[sent from post-receive hook]

On Mon, 17 Aug 2020 08:18:22 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200807104425.30276-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
> index 3e6df6f83e55..1d54fa4b4428 100644
> --- a/doc/ref_parameter.rst
> +++ b/doc/ref_parameter.rst
> @@ -95,12 +95,13 @@ Setup and Project Actions
>    functionality as ``menuconfig``. It can be used instead of ``menuconfig``
>    for all the component described above.
>  
> -``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig [<component>]``, ``allnoconfig [<component>]``, ``randconfig [<component>]``
> +``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig [<component>]``, ``allnoconfig [<component>]``, ``alldefconfig [<component>]``, ``randconfig [<component>]``
>    this action will run the corresponding kconfig action for the specified
>    component. ``oldconfig`` will prompt for all new options.
> -  ``allmodconfig``, ``allyesconfig`` and ``allnoconfig`` will set all
> -  options to 'm', 'y' or 'n' respectively. ``randconfig`` will randomize
> -  the options. The ``KCONFIG_ALLCONFIG`` and ``KCONFIG_SEED`` environment
> +  ``allmodconfig``, ``allyesconfig``, ``allnoconfig`` or ``alldefconfig``
> +  will set all options to 'm', 'y', 'n', or their default values respectively.
> +  ``randconfig`` will randomize the options.
> +  The ``KCONFIG_ALLCONFIG`` and ``KCONFIG_SEED`` environment
>    variables can be used as described in the Linux kernel documentation.
>  
>  ``migrate``

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 1/4] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[Roland Hieber]

Until now this worked without setting the variable because
ptxd_make_world_init tries to autodetect the config tool, but we should
make this explicit.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>

---
 v2: tab-align where tabs already exist

 rules/barebox.make                              | 1 +
 rules/kernel.make                               | 1 +
 rules/templates/template-barebox-imx-habv4-make | 1 +
 rules/templates/template-barebox-make           | 1 +
 rules/templates/template-kernel-make            | 1 +
 5 files changed, 5 insertions(+)

diff --git a/rules/barebox.make b/rules/barebox.make
index 90e193c8ea9a..94534db39ebe 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH)
 BAREBOX_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_CONF_TOOL := kconfig
 BAREBOX_CONF_OPT := \
 	-C $(BAREBOX_DIR) \
 	O=$(BAREBOX_BUILD_DIR) \
diff --git a/rules/kernel.make b/rules/kernel.make
index 593e03dc4a3e..73c72da57473 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -81,6 +81,7 @@ KERNEL_SHARED_OPT += \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 endif
 
+KERNEL_CONF_TOOL := kconfig
 KERNEL_CONF_OPT := \
 	$(KERNEL_SHARED_OPT)
 
diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
index a7d287822547..cfe4c2de36eb 100644
--- a/rules/templates/template-barebox-imx-habv4-make
+++ b/rules/templates/template-barebox-imx-habv4-make
@@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index ae7e06038e23..6a9599240b64 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index 697c18145cec..c7448b2a8be4 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT	+= \
 	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 
+KERNEL_@PACKAGE@_CONF_TOOL	:= kconfig
 KERNEL_@PACKAGE@_CONF_OPT	:= \
 	$(KERNEL_@PACKAGE@_SHARED_OPT)
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 2/4] barebox, kernel: tab-align variables

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: new patch

 rules/barebox.make                             | 14 +++++++-------
 rules/kernel.make                              | 18 +++++++++---------
 .../templates/template-barebox-imx-habv4-make  | 14 +++++++-------
 rules/templates/template-barebox-make          |  8 ++++----
 rules/templates/template-kernel-make           |  4 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index 94534db39ebe..c2b40c13babf 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -35,20 +35,20 @@ BAREBOX_CONFIG		:= $(call ptx/in-platformconfigdir, \
 # ----------------------------------------------------------------------------
 
 # use host pkg-config for host tools
-BAREBOX_PATH := PATH=$(HOST_PATH)
+BAREBOX_PATH		:= PATH=$(HOST_PATH)
 
 BAREBOX_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-BAREBOX_CONF_TOOL := kconfig
-BAREBOX_CONF_OPT := \
+BAREBOX_CONF_TOOL	:= kconfig
+BAREBOX_CONF_OPT	:= \
 	-C $(BAREBOX_DIR) \
 	O=$(BAREBOX_BUILD_DIR) \
 	$(call barebox-opts, BAREBOX)
 
-BAREBOX_MAKE_OPT := $(BAREBOX_CONF_OPT)
+BAREBOX_MAKE_OPT	:= $(BAREBOX_CONF_OPT)
 
-BAREBOX_TAGS_OPT := TAGS tags cscope
+BAREBOX_TAGS_OPT	:= TAGS tags cscope
 
 ifdef PTXCONF_BAREBOX
 $(BAREBOX_CONFIG):
@@ -62,10 +62,10 @@ $(BAREBOX_CONFIG):
 endif
 
 ifneq ($(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)),)
-BAREBOX_EXTRA_ENV_PATH := $(foreach path, \
+BAREBOX_EXTRA_ENV_PATH	:= $(foreach path, \
 		$(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)), \
 		$(call ptx/in-platformconfigdir,$(path)))
-BAREBOX_EXTRA_ENV_DEPS := \
+BAREBOX_EXTRA_ENV_DEPS	:= \
 	$(BAREBOX_EXTRA_ENV_PATH) \
 	$(call ptx/force-sh, find $(BAREBOX_EXTRA_ENV_PATH) -print 2>/dev/null)
 $(STATEDIR)/barebox.prepare: $(BAREBOX_EXTRA_ENV_DEPS)
diff --git a/rules/kernel.make b/rules/kernel.make
index 73c72da57473..ec00a872ccc2 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -54,7 +54,7 @@ endef
 KERNEL_MAKEVARS = $(call kernel/deprecated, KERNEL_MAKEVARS)
 
 # like kernel-opts but with different CROSS_COMPILE=
-KERNEL_BASE_OPT := \
+KERNEL_BASE_OPT		:= \
 	V=$(PTXDIST_VERBOSE) \
 	HOSTCC=$(HOSTCC) \
 	ARCH=$(GENERIC_KERNEL_ARCH) \
@@ -66,38 +66,38 @@ KERNEL_BASE_OPT := \
 	$(call remove_quotes,$(PTXCONF_KERNEL_EXTRA_MAKEVARS))
 
 # Intermediate option. This will be used by kernel module packages.
-KERNEL_MODULE_OPT := \
+KERNEL_MODULE_OPT	:= \
 	-C $(KERNEL_DIR) \
 	O=$(KERNEL_BUILD_DIR) \
 	$(KERNEL_BASE_OPT)
 
-KERNEL_SHARED_OPT := \
+KERNEL_SHARED_OPT	:= \
 	$(KERNEL_MODULE_OPT)
 
 ifndef PTXCONF_KERNEL_GCC_PLUGINS
 # no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_SHARED_OPT += \
+KERNEL_SHARED_OPT	+= \
 	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 endif
 
-KERNEL_CONF_TOOL := kconfig
-KERNEL_CONF_OPT := \
+KERNEL_CONF_TOOL	:= kconfig
+KERNEL_CONF_OPT		:= \
 	$(KERNEL_SHARED_OPT)
 
 ifdef PTXCONF_KERNEL_CONFIG_BASE_VERSION
 # force using KERNEL_VERSION in the kernelconfig
-KERNEL_CONF_OPT += \
+KERNEL_CONF_OPT		+= \
 	KERNELVERSION=$(KERNEL_VERSION)
 endif
 
 #
 # support the different kernel image formats
 #
-KERNEL_IMAGE := $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
+KERNEL_IMAGE		:= $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
 
 # these are sane default
-KERNEL_IMAGE_PATH_y := $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
+KERNEL_IMAGE_PATH_y	:= $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
 
 # vmlinux and vmlinuz are special
 KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUX) := $(KERNEL_BUILD_DIR)/vmlinux
diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
index cfe4c2de36eb..fe0853b0d962 100644
--- a/rules/templates/template-barebox-imx-habv4-make
+++ b/rules/templates/template-barebox-imx-habv4-make
@@ -32,19 +32,19 @@ BAREBOX_@PACKAGE@_BUILD_OOT	:= KEEP
 # ----------------------------------------------------------------------------
 
 # use host pkg-config for host tools
-BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
+BAREBOX_@PACKAGE@_PATH		:= PATH=$(HOST_PATH)
 
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
-BAREBOX_@PACKAGE@_CONF_OPT := \
+BAREBOX_@PACKAGE@_CONF_TOOL	:= kconfig
+BAREBOX_@PACKAGE@_CONF_OPT	:= \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
 	$(call barebox-opts, BAREBOX_@PACKAGE@)
 
-BAREBOX_@PACKAGE@_IMAGES := @image@
-BAREBOX_@PACKAGE@_IMAGES := $(addprefix $(BAREBOX_@PACKAGE@_BUILD_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
+BAREBOX_@PACKAGE@_IMAGES	:= @image@
+BAREBOX_@PACKAGE@_IMAGES	:= $(addprefix $(BAREBOX_@PACKAGE@_BUILD_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
 
 ifdef PTXCONF_BAREBOX_@PACKAGE@
 $(BAREBOX_@PACKAGE@_CONFIG):
@@ -61,13 +61,13 @@ endif
 # Compile
 # ----------------------------------------------------------------------------
 
-BAREBOX_@PACKAGE@_MAKE_ENV = \
+BAREBOX_@PACKAGE@_MAKE_ENV	= \
 	$(CODE_SIGNING_ENV) \
 	CSF="$(shell cs_get_uri imx-habv4-csf1)" \
 	IMG="$(shell cs_get_uri imx-habv4-img1)" \
 	FIT_KEY="$(shell cs_get_uri image-kernel-fit)"
 
-BAREBOX_@PACKAGE@_MAKE_OPT := $(BAREBOX_@PACKAGE@_CONF_OPT)
+BAREBOX_@PACKAGE@_MAKE_OPT	:= $(BAREBOX_@PACKAGE@_CONF_OPT)
 
 $(STATEDIR)/barebox-@package@.compile:
 	@$(call targetinfo)
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index 6a9599240b64..535317d316b9 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -32,18 +32,18 @@ BAREBOX_@PACKAGE@_BUILD_OOT	:= KEEP
 # ----------------------------------------------------------------------------
 
 # use host pkg-config for host tools
-BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
+BAREBOX_@PACKAGE@_PATH		:= PATH=$(HOST_PATH)
 
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
-BAREBOX_@PACKAGE@_CONF_OPT := \
+BAREBOX_@PACKAGE@_CONF_TOOL	:= kconfig
+BAREBOX_@PACKAGE@_CONF_OPT	:= \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
 	$(call barebox-opts, BAREBOX_@PACKAGE@)
 
-BAREBOX_@PACKAGE@_MAKE_OPT := $(BAREBOX_@PACKAGE@_CONF_OPT)
+BAREBOX_@PACKAGE@_MAKE_OPT	:= $(BAREBOX_@PACKAGE@_CONF_OPT)
 
 BAREBOX_@PACKAGE@_IMAGES := @image@
 BAREBOX_@PACKAGE@_IMAGES := $(addprefix $(BAREBOX_@PACKAGE@_BUILD_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index c7448b2a8be4..e9d2df825824 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -72,7 +72,7 @@ endif
 # Compile
 # ----------------------------------------------------------------------------
 
-KERNEL_@PACKAGE@_MAKE_OPT := \
+KERNEL_@PACKAGE@_MAKE_OPT	:= \
 	$(KERNEL_@PACKAGE@_SHARED_OPT) \
 	@image@ modules
 
@@ -80,7 +80,7 @@ KERNEL_@PACKAGE@_MAKE_OPT := \
 # Install
 # ----------------------------------------------------------------------------
 
-KERNEL_@PACKAGE@_INSTALL_OPT := \
+KERNEL_@PACKAGE@_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_@PACKAGE@) \
 	modules_install
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 3/4] platforms/kernel: re-align KERNEL_IMAGE defaults

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: new patch

 platforms/kernel.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/platforms/kernel.in b/platforms/kernel.in
index 6f3e3c8cd81c..34d05c825929 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -141,15 +141,15 @@ endif
 
 config KERNEL_IMAGE
 	string
-	default "bzImage" if KERNEL_IMAGE_BZ
-	default "Image.gz"  if KERNEL_IMAGE_Z && ARCH_ARM64
-	default "zImage"  if KERNEL_IMAGE_Z
-	default "xipImage" if KERNEL_IMAGE_XIP
-	default "uImage"  if KERNEL_IMAGE_U
-	default "vmImage" if KERNEL_IMAGE_VM
-	default "vmlinux" if KERNEL_IMAGE_VMLINUX
-	default "vmlinuz" if KERNEL_IMAGE_VMLINUZ
-	default "Image"   if KERNEL_IMAGE_RAW
+	default "bzImage"	if KERNEL_IMAGE_BZ
+	default "Image.gz"	if KERNEL_IMAGE_Z && ARCH_ARM64
+	default "zImage"	if KERNEL_IMAGE_Z
+	default "xipImage"	if KERNEL_IMAGE_XIP
+	default "uImage"	if KERNEL_IMAGE_U
+	default "vmImage"	if KERNEL_IMAGE_VM
+	default "vmlinux"	if KERNEL_IMAGE_VMLINUX
+	default "vmlinuz"	if KERNEL_IMAGE_VMLINUZ
+	default "Image"		if KERNEL_IMAGE_RAW
 	default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if KERNEL_IMAGE_SIMPLE
 
 config KERNEL_ZSTD
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 4/4] kernel: fix some typos in comments

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: new patch

 rules/kernel.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/kernel.make b/rules/kernel.make
index ec00a872ccc2..6a764ce2fe1a 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -96,7 +96,7 @@ endif
 #
 KERNEL_IMAGE		:= $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
 
-# these are sane default
+# these are sane defaults
 KERNEL_IMAGE_PATH_y	:= $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
 
 # vmlinux and vmlinuz are special
@@ -143,7 +143,7 @@ endif
 	@$(call world/prepare, KERNEL)
 
 #
-# Use a existing dummy INITRAMFS_SOURCE for the fist 'make' call. The
+# Use an existing dummy INITRAMFS_SOURCE for the first 'make' call. The
 # kernel image will be rebuilt in the image-kernel package with the real
 # initramfs.
 #
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] barebox, kernel: tab-align variables

[Michael Olbrich]

Thanks, applied as 5af76a1c7d631cd69e673e4ac77783ba059b109d.

Michael

[sent from post-receive hook]

On Fri, 04 Sep 2020 19:01:26 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200819112703.11988-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/barebox.make b/rules/barebox.make
> index 94534db39ebe..c2b40c13babf 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -35,20 +35,20 @@ BAREBOX_CONFIG		:= $(call ptx/in-platformconfigdir, \
>  # ----------------------------------------------------------------------------
>  
>  # use host pkg-config for host tools
> -BAREBOX_PATH := PATH=$(HOST_PATH)
> +BAREBOX_PATH		:= PATH=$(HOST_PATH)
>  
>  BAREBOX_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> -BAREBOX_CONF_TOOL := kconfig
> -BAREBOX_CONF_OPT := \
> +BAREBOX_CONF_TOOL	:= kconfig
> +BAREBOX_CONF_OPT	:= \
>  	-C $(BAREBOX_DIR) \
>  	O=$(BAREBOX_BUILD_DIR) \
>  	$(call barebox-opts, BAREBOX)
>  
> -BAREBOX_MAKE_OPT := $(BAREBOX_CONF_OPT)
> +BAREBOX_MAKE_OPT	:= $(BAREBOX_CONF_OPT)
>  
> -BAREBOX_TAGS_OPT := TAGS tags cscope
> +BAREBOX_TAGS_OPT	:= TAGS tags cscope
>  
>  ifdef PTXCONF_BAREBOX
>  $(BAREBOX_CONFIG):
> @@ -62,10 +62,10 @@ $(BAREBOX_CONFIG):
>  endif
>  
>  ifneq ($(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)),)
> -BAREBOX_EXTRA_ENV_PATH := $(foreach path, \
> +BAREBOX_EXTRA_ENV_PATH	:= $(foreach path, \
>  		$(call remove_quotes,$(PTXCONF_BAREBOX_EXTRA_ENV_PATH)), \
>  		$(call ptx/in-platformconfigdir,$(path)))
> -BAREBOX_EXTRA_ENV_DEPS := \
> +BAREBOX_EXTRA_ENV_DEPS	:= \
>  	$(BAREBOX_EXTRA_ENV_PATH) \
>  	$(call ptx/force-sh, find $(BAREBOX_EXTRA_ENV_PATH) -print 2>/dev/null)
>  $(STATEDIR)/barebox.prepare: $(BAREBOX_EXTRA_ENV_DEPS)
> diff --git a/rules/kernel.make b/rules/kernel.make
> index 73c72da57473..ec00a872ccc2 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -54,7 +54,7 @@ endef
>  KERNEL_MAKEVARS = $(call kernel/deprecated, KERNEL_MAKEVARS)
>  
>  # like kernel-opts but with different CROSS_COMPILE=
> -KERNEL_BASE_OPT := \
> +KERNEL_BASE_OPT		:= \
>  	V=$(PTXDIST_VERBOSE) \
>  	HOSTCC=$(HOSTCC) \
>  	ARCH=$(GENERIC_KERNEL_ARCH) \
> @@ -66,38 +66,38 @@ KERNEL_BASE_OPT := \
>  	$(call remove_quotes,$(PTXCONF_KERNEL_EXTRA_MAKEVARS))
>  
>  # Intermediate option. This will be used by kernel module packages.
> -KERNEL_MODULE_OPT := \
> +KERNEL_MODULE_OPT	:= \
>  	-C $(KERNEL_DIR) \
>  	O=$(KERNEL_BUILD_DIR) \
>  	$(KERNEL_BASE_OPT)
>  
> -KERNEL_SHARED_OPT := \
> +KERNEL_SHARED_OPT	:= \
>  	$(KERNEL_MODULE_OPT)
>  
>  ifndef PTXCONF_KERNEL_GCC_PLUGINS
>  # no gcc plugins; avoid config changes depending on the host compiler
> -KERNEL_SHARED_OPT += \
> +KERNEL_SHARED_OPT	+= \
>  	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  endif
>  
> -KERNEL_CONF_TOOL := kconfig
> -KERNEL_CONF_OPT := \
> +KERNEL_CONF_TOOL	:= kconfig
> +KERNEL_CONF_OPT		:= \
>  	$(KERNEL_SHARED_OPT)
>  
>  ifdef PTXCONF_KERNEL_CONFIG_BASE_VERSION
>  # force using KERNEL_VERSION in the kernelconfig
> -KERNEL_CONF_OPT += \
> +KERNEL_CONF_OPT		+= \
>  	KERNELVERSION=$(KERNEL_VERSION)
>  endif
>  
>  #
>  # support the different kernel image formats
>  #
> -KERNEL_IMAGE := $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
> +KERNEL_IMAGE		:= $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
>  
>  # these are sane default
> -KERNEL_IMAGE_PATH_y := $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
> +KERNEL_IMAGE_PATH_y	:= $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
>  
>  # vmlinux and vmlinuz are special
>  KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUX) := $(KERNEL_BUILD_DIR)/vmlinux
> diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
> index cfe4c2de36eb..fe0853b0d962 100644
> --- a/rules/templates/template-barebox-imx-habv4-make
> +++ b/rules/templates/template-barebox-imx-habv4-make
> @@ -32,19 +32,19 @@ BAREBOX_@PACKAGE@_BUILD_OOT	:= KEEP
>  # ----------------------------------------------------------------------------
>  
>  # use host pkg-config for host tools
> -BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
> +BAREBOX_@PACKAGE@_PATH		:= PATH=$(HOST_PATH)
>  
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> -BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
> -BAREBOX_@PACKAGE@_CONF_OPT := \
> +BAREBOX_@PACKAGE@_CONF_TOOL	:= kconfig
> +BAREBOX_@PACKAGE@_CONF_OPT	:= \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
>  	$(call barebox-opts, BAREBOX_@PACKAGE@)
>  
> -BAREBOX_@PACKAGE@_IMAGES := @image@
> -BAREBOX_@PACKAGE@_IMAGES := $(addprefix $(BAREBOX_@PACKAGE@_BUILD_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
> +BAREBOX_@PACKAGE@_IMAGES	:= @image@
> +BAREBOX_@PACKAGE@_IMAGES	:= $(addprefix $(BAREBOX_@PACKAGE@_BUILD_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
>  
>  ifdef PTXCONF_BAREBOX_@PACKAGE@
>  $(BAREBOX_@PACKAGE@_CONFIG):
> @@ -61,13 +61,13 @@ endif
>  # Compile
>  # ----------------------------------------------------------------------------
>  
> -BAREBOX_@PACKAGE@_MAKE_ENV = \
> +BAREBOX_@PACKAGE@_MAKE_ENV	= \
>  	$(CODE_SIGNING_ENV) \
>  	CSF="$(shell cs_get_uri imx-habv4-csf1)" \
>  	IMG="$(shell cs_get_uri imx-habv4-img1)" \
>  	FIT_KEY="$(shell cs_get_uri image-kernel-fit)"
>  
> -BAREBOX_@PACKAGE@_MAKE_OPT := $(BAREBOX_@PACKAGE@_CONF_OPT)
> +BAREBOX_@PACKAGE@_MAKE_OPT	:= $(BAREBOX_@PACKAGE@_CONF_OPT)
>  
>  $(STATEDIR)/barebox-@package@.compile:
>  	@$(call targetinfo)
> diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
> index 6a9599240b64..535317d316b9 100644
> --- a/rules/templates/template-barebox-make
> +++ b/rules/templates/template-barebox-make
> @@ -32,18 +32,18 @@ BAREBOX_@PACKAGE@_BUILD_OOT	:= KEEP
>  # ----------------------------------------------------------------------------
>  
>  # use host pkg-config for host tools
> -BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
> +BAREBOX_@PACKAGE@_PATH		:= PATH=$(HOST_PATH)
>  
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> -BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
> -BAREBOX_@PACKAGE@_CONF_OPT := \
> +BAREBOX_@PACKAGE@_CONF_TOOL	:= kconfig
> +BAREBOX_@PACKAGE@_CONF_OPT	:= \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
>  	$(call barebox-opts, BAREBOX_@PACKAGE@)
>  
> -BAREBOX_@PACKAGE@_MAKE_OPT := $(BAREBOX_@PACKAGE@_CONF_OPT)
> +BAREBOX_@PACKAGE@_MAKE_OPT	:= $(BAREBOX_@PACKAGE@_CONF_OPT)
>  
>  BAREBOX_@PACKAGE@_IMAGES := @image@
>  BAREBOX_@PACKAGE@_IMAGES := $(addprefix $(BAREBOX_@PACKAGE@_BUILD_DIR)/,$(BAREBOX_@PACKAGE@_IMAGES))
> diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
> index c7448b2a8be4..e9d2df825824 100644
> --- a/rules/templates/template-kernel-make
> +++ b/rules/templates/template-kernel-make
> @@ -72,7 +72,7 @@ endif
>  # Compile
>  # ----------------------------------------------------------------------------
>  
> -KERNEL_@PACKAGE@_MAKE_OPT := \
> +KERNEL_@PACKAGE@_MAKE_OPT	:= \
>  	$(KERNEL_@PACKAGE@_SHARED_OPT) \
>  	@image@ modules
>  
> @@ -80,7 +80,7 @@ KERNEL_@PACKAGE@_MAKE_OPT := \
>  # Install
>  # ----------------------------------------------------------------------------
>  
> -KERNEL_@PACKAGE@_INSTALL_OPT := \
> +KERNEL_@PACKAGE@_INSTALL_OPT	:= \
>  	$(call kernel-opts, KERNEL_@PACKAGE@) \
>  	modules_install
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[Michael Olbrich]

Thanks, applied as 682d95986b7acfcabb31a25c58f0074e69c9005d.

Michael

[sent from post-receive hook]

On Fri, 04 Sep 2020 19:01:26 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Until now this worked without setting the variable because
> ptxd_make_world_init tries to autodetect the config tool, but we should
> make this explicit.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> 
> Message-Id: <20200819112703.11988-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/barebox.make b/rules/barebox.make
> index 90e193c8ea9a..94534db39ebe 100644
> --- a/rules/barebox.make
> +++ b/rules/barebox.make
> @@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH)
>  BAREBOX_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_CONF_TOOL := kconfig
>  BAREBOX_CONF_OPT := \
>  	-C $(BAREBOX_DIR) \
>  	O=$(BAREBOX_BUILD_DIR) \
> diff --git a/rules/kernel.make b/rules/kernel.make
> index 593e03dc4a3e..73c72da57473 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -81,6 +81,7 @@ KERNEL_SHARED_OPT += \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  endif
>  
> +KERNEL_CONF_TOOL := kconfig
>  KERNEL_CONF_OPT := \
>  	$(KERNEL_SHARED_OPT)
>  
> diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
> index a7d287822547..cfe4c2de36eb 100644
> --- a/rules/templates/template-barebox-imx-habv4-make
> +++ b/rules/templates/template-barebox-imx-habv4-make
> @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
>  BAREBOX_@PACKAGE@_CONF_OPT := \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
> diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
> index ae7e06038e23..6a9599240b64 100644
> --- a/rules/templates/template-barebox-make
> +++ b/rules/templates/template-barebox-make
> @@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
>  BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
>  BAREBOX_@PACKAGE@_CONF_OPT := \
>  	-C $(BAREBOX_@PACKAGE@_DIR) \
>  	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
> diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
> index 697c18145cec..c7448b2a8be4 100644
> --- a/rules/templates/template-kernel-make
> +++ b/rules/templates/template-kernel-make
> @@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT	+= \
>  	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
>  	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
>  
> +KERNEL_@PACKAGE@_CONF_TOOL	:= kconfig
>  KERNEL_@PACKAGE@_CONF_OPT	:= \
>  	$(KERNEL_@PACKAGE@_SHARED_OPT)
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] platforms/kernel: re-align KERNEL_IMAGE defaults

[Michael Olbrich]

Thanks, applied as 5cd66b58e42846ef241e5e49dbebf9d34b07c15e.

Michael

[sent from post-receive hook]

On Fri, 04 Sep 2020 19:01:27 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200819112703.11988-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/kernel.in b/platforms/kernel.in
> index 6f3e3c8cd81c..34d05c825929 100644
> --- a/platforms/kernel.in
> +++ b/platforms/kernel.in
> @@ -141,15 +141,15 @@ endif
>  
>  config KERNEL_IMAGE
>  	string
> -	default "bzImage" if KERNEL_IMAGE_BZ
> -	default "Image.gz"  if KERNEL_IMAGE_Z && ARCH_ARM64
> -	default "zImage"  if KERNEL_IMAGE_Z
> -	default "xipImage" if KERNEL_IMAGE_XIP
> -	default "uImage"  if KERNEL_IMAGE_U
> -	default "vmImage" if KERNEL_IMAGE_VM
> -	default "vmlinux" if KERNEL_IMAGE_VMLINUX
> -	default "vmlinuz" if KERNEL_IMAGE_VMLINUZ
> -	default "Image"   if KERNEL_IMAGE_RAW
> +	default "bzImage"	if KERNEL_IMAGE_BZ
> +	default "Image.gz"	if KERNEL_IMAGE_Z && ARCH_ARM64
> +	default "zImage"	if KERNEL_IMAGE_Z
> +	default "xipImage"	if KERNEL_IMAGE_XIP
> +	default "uImage"	if KERNEL_IMAGE_U
> +	default "vmImage"	if KERNEL_IMAGE_VM
> +	default "vmlinux"	if KERNEL_IMAGE_VMLINUX
> +	default "vmlinuz"	if KERNEL_IMAGE_VMLINUZ
> +	default "Image"		if KERNEL_IMAGE_RAW
>  	default "simpleImage.${PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET}.elf" if KERNEL_IMAGE_SIMPLE
>  
>  config KERNEL_ZSTD

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] kernel: fix some typos in comments

[Michael Olbrich]

Thanks, applied as 25b9081eb3279525f31a782065ceff61307acd61.

Michael

[sent from post-receive hook]

On Fri, 04 Sep 2020 19:01:28 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200819112703.11988-4-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/kernel.make b/rules/kernel.make
> index ec00a872ccc2..6a764ce2fe1a 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -96,7 +96,7 @@ endif
>  #
>  KERNEL_IMAGE		:= $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
>  
> -# these are sane default
> +# these are sane defaults
>  KERNEL_IMAGE_PATH_y	:= $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
>  
>  # vmlinux and vmlinuz are special
> @@ -143,7 +143,7 @@ endif
>  	@$(call world/prepare, KERNEL)
>  
>  #
> -# Use a existing dummy INITRAMFS_SOURCE for the fist 'make' call. The
> +# Use an existing dummy INITRAMFS_SOURCE for the first 'make' call. The
>  # kernel image will be rebuilt in the image-kernel package with the real
>  # initramfs.
>  #

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de