diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-03-10 20:28:15 +0900 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-11 16:11:39 +0100 |
| commit | 4d0575449add551a9f48a8913a7f9f9815faefd2 (patch) | |
| tree | 4d0387775a259820d6ad7f741cf0ca6a39c46356 /Makefile | |
| parent | 739a49a9738280736698f0e15169e0be14cac77a (diff) | |
| download | barebox-4d0575449add551a9f48a8913a7f9f9815faefd2.tar.gz barebox-4d0575449add551a9f48a8913a7f9f9815faefd2.tar.xz | |
kbuild: rename barebox-{common, lds} to BAREBOX_{OBJS, LDS}
The previous commit renamed barebox-pbl-common because you cannot
export a variable that contain hyphens.
These variables are not exported for now. I am just renaming them for
consistency.
barebox-common -> BAREBOX_OBJS
barebox-lds -> BAREBOX_LDS
If barebox moves the link rules into scripts/link-barebox.sh like
Linux did, these two must be exported anyway.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -583,18 +583,18 @@ export DEFAULT_COMPRESSION_SUFFIX # # System.map is generated to document addresses of all kernel symbols -barebox-common := $(common-y) +BAREBOX_OBJS := $(common-y) export BAREBOX_PBL_OBJS := $(pbl-common-y) -barebox-all := $(barebox-common) -barebox-lds := $(lds-y) +barebox-all := $(BAREBOX_OBJS) +BAREBOX_LDS := $(lds-y) # Rule to link barebox # May be overridden by arch/$(ARCH)/Makefile quiet_cmd_barebox__ ?= LD $@ cmd_barebox__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_barebox) -o $@ \ - -T $(barebox-lds) \ - --start-group $(barebox-common) --end-group \ - $(filter-out $(barebox-lds) $(barebox-common) FORCE ,$^) + -T $(BAREBOX_LDS) \ + --start-group $(BAREBOX_OBJS) --end-group \ + $(filter-out $(BAREBOX_LDS) $(BAREBOX_OBJS) FORCE ,$^) # Generate new barebox version quiet_cmd_barebox_version = GEN .version @@ -691,13 +691,13 @@ quiet_cmd_kallsyms = KSYM $@ $(call cmd,kallsyms) # .tmp_barebox1 must be complete except kallsyms, so update barebox version -.tmp_barebox1: $(barebox-lds) $(barebox-all) FORCE +.tmp_barebox1: $(BAREBOX_LDS) $(barebox-all) FORCE $(call if_changed_rule,ksym_ld) -.tmp_barebox2: $(barebox-lds) $(barebox-all) .tmp_kallsyms1.o FORCE +.tmp_barebox2: $(BAREBOX_LDS) $(barebox-all) .tmp_kallsyms1.o FORCE $(call if_changed,barebox__) -.tmp_barebox3: $(barebox-lds) $(barebox-all) .tmp_kallsyms2.o FORCE +.tmp_barebox3: $(BAREBOX_LDS) $(barebox-all) .tmp_kallsyms2.o FORCE $(call if_changed,barebox__) # Needs to visit scripts/ before $(KALLSYMS) can be used. @@ -767,7 +767,7 @@ barebox.S barebox.s: barebox FORCE endif # barebox image -barebox: $(barebox-lds) $(barebox-common) $(kallsyms.o) FORCE +barebox: $(BAREBOX_LDS) $(BAREBOX_OBJS) $(kallsyms.o) FORCE $(call if_changed_rule,barebox__) $(Q)rm -f .old_version @@ -776,7 +776,7 @@ barebox.srec: barebox # The actual objects are generated when descending, # make sure no implicit rule kicks in -$(sort $(barebox-common) ) $(barebox-lds) $(BAREBOX_PBL_OBJS): $(barebox-dirs) ; +$(sort $(BAREBOX_OBJS)) $(BAREBOX_LDS) $(BAREBOX_PBL_OBJS): $(barebox-dirs) ; # Handle descending into subdirectories listed in $(barebox-dirs) # Preset locale variables to speed up the build process. Limit locale |