Signed-off-by: Roland Hieber <[email protected]>
---
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-@[email protected]:
@$(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
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
