diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-07-25 13:44:13 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-21 17:03:28 +0200 |
| commit | 2b1419baaaefaac24fabfe094aaa21c9f0c553fa (patch) | |
| tree | 3390926b92f624e7a3f3dec07aa78b6a8f185a9a /rules/barebox.make | |
| parent | 55e98764db54ec3944aface4d2f5c19fe346d2d9 (diff) | |
| download | ptxdist-2b1419baaaefaac24fabfe094aaa21c9f0c553fa.tar.gz ptxdist-2b1419baaaefaac24fabfe094aaa21c9f0c553fa.tar.xz | |
barebox: use layer aware kconfig helper
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/barebox.make')
| -rw-r--r-- | rules/barebox.make | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/rules/barebox.make b/rules/barebox.make index 5ee469a52..be0a764fc 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -78,11 +78,9 @@ endif $(STATEDIR)/barebox.prepare: $(BAREBOX_CONFIG) @$(call targetinfo) - @echo "Using barebox config file: $(<)" - @install -m 644 "$(<)" "$(BAREBOX_DIR)/.config" - + @$(call world/kconfig-setup, BAREBOX) @$(call ptx/oldconfig, BAREBOX) - @diff -q -I "# [^C]" "$(BAREBOX_DIR)/.config" "$(<)" > /dev/null || cp "$(BAREBOX_DIR)/.config" "$(<)" + @$(call world/kconfig-sync, BAREBOX) ifdef PTXCONF_BAREBOX_EXTRA_ENV @rm -rf $(BAREBOX_DIR)/.ptxdist-defaultenv @@ -210,15 +208,11 @@ $(STATEDIR)/barebox.clean: # ---------------------------------------------------------------------------- barebox_oldconfig barebox_menuconfig barebox_nconfig: $(STATEDIR)/barebox.extract - @if test -e $(BAREBOX_CONFIG); then \ - cp $(BAREBOX_CONFIG) $(BAREBOX_DIR)/.config; \ - fi + @$(call world/kconfig-setup, BAREBOX) + @cd $(BAREBOX_DIR) && \ $(BAREBOX_PATH) $(BAREBOX_ENV) $(MAKE) $(BAREBOX_MAKEVARS) $(subst barebox_,,$@) - @if cmp -s $(BAREBOX_DIR)/.config $(BAREBOX_CONFIG); then \ - echo "barebox configuration unchanged"; \ - else \ - cp $(BAREBOX_DIR)/.config $(BAREBOX_CONFIG); \ - fi + + @$(call world/kconfig-sync, BAREBOX) # vim: syntax=make |