diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-26 21:57:30 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-10 08:50:47 +0100 |
| commit | 2093fa4993c68ad23226ea38b7ea99bf925c02a2 (patch) | |
| tree | 83a5124035565acd05403885f2e662b9c442a132 /rules/barebox.make | |
| parent | 16d3facf9626143a3ddb1c8083b1fde612f68691 (diff) | |
| download | ptxdist-2093fa4993c68ad23226ea38b7ea99bf925c02a2.tar.gz ptxdist-2093fa4993c68ad23226ea38b7ea99bf925c02a2.tar.xz | |
barebox: cleanup rule to use more default stages
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index a6ec3c394..4018dd697 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -34,6 +34,9 @@ BAREBOX_CONFIG := $(call ptx/in-platformconfigdir, \ # Prepare # ---------------------------------------------------------------------------- +# use host pkg-config for host tools +BAREBOX_PATH := PATH=$(HOST_PATH) + BAREBOX_WRAPPER_BLACKLIST := \ TARGET_HARDEN_RELRO \ TARGET_HARDEN_BINDNOW \ @@ -41,16 +44,8 @@ BAREBOX_WRAPPER_BLACKLIST := \ TARGET_DEBUG \ TARGET_BUILD_ID -BAREBOX_ENV := \ - KCONFIG_NOTIMESTAMP=1 \ - pkg_wrapper_blacklist="$(BAREBOX_WRAPPER_BLACKLIST)" - -BAREBOX_MAKEVARS := \ - V=$(PTXDIST_VERBOSE) \ - HOSTCC=$(HOSTCC) \ - ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ - CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ - $(PARALLELMFLAGS) +BAREBOX_CONF_OPT := $(call barebox-opts, BAREBOX) +BAREBOX_MAKE_OPT := $(BAREBOX_CONF_OPT) BAREBOX_TAGS_OPT := TAGS tags cscope @@ -77,10 +72,7 @@ endif $(STATEDIR)/barebox.prepare: @$(call targetinfo) - - @$(call world/kconfig-setup, BAREBOX) - @$(call ptx/oldconfig, BAREBOX) - @$(call world/kconfig-sync, BAREBOX) + @$(call world/prepare, BAREBOX) ifdef PTXCONF_BAREBOX_EXTRA_ENV @rm -rf $(BAREBOX_DIR)/.ptxdist-defaultenv @@ -111,9 +103,7 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV $(BAREBOX_DIR)/.config; \ fi endif - - @+cd $(BAREBOX_DIR) && $(BAREBOX_PATH) $(BAREBOX_ENV) \ - $(MAKE) $(BAREBOX_MAKEVARS) + @$(call world/compile, BAREBOX) @$(call touch) # ---------------------------------------------------------------------------- @@ -200,19 +190,14 @@ $(STATEDIR)/barebox.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX) @$(foreach prog, $(BAREBOX_PROGS_HOST), \ - rm -rf $(PTXCONF_SYSROOT_HOST)/bin/$(notdir $(prog));) - rm -rf $(IMAGEDIR)/barebox-image $(IMAGEDIR)/barebox-default-environment + rm -vf $(PTXCONF_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) + @rm -vf $(IMAGEDIR)/barebox-image $(IMAGEDIR)/barebox-default-environment # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- barebox_oldconfig barebox_menuconfig barebox_nconfig: $(STATEDIR)/barebox.extract - @$(call world/kconfig-setup, BAREBOX) - - @cd $(BAREBOX_DIR) && \ - $(BAREBOX_PATH) $(BAREBOX_ENV) $(MAKE) $(BAREBOX_MAKEVARS) $(subst barebox_,,$@) - - @$(call world/kconfig-sync, BAREBOX) + @$(call world/kconfig, BAREBOX, $(subst barebox_,,$@)) # vim: syntax=make |