diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:17 +0100 |
| commit | 8c02f14d1db16068a005b9674da42f14f344ab89 (patch) | |
| tree | b57b9d55789ab59e63436ff70f569db06c228f50 /arch/mips | |
| parent | 52ef5245746cb13d1eaf9d520d9e7a36d2a70d4b (diff) | |
| parent | 544bd2f460da25de41094aceadb799ca31474d97 (diff) | |
| download | barebox-8c02f14d1db16068a005b9674da42f14f344ab89.tar.gz barebox-8c02f14d1db16068a005b9674da42f14f344ab89.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/Makefile | 6 | ||||
| -rw-r--r-- | arch/mips/pbl/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 486dfd8253..ee3364d27a 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -118,9 +118,9 @@ CFLAGS += $(cflags-y) lds-$(CONFIG_GENERIC_LINKER_SCRIPT) := arch/mips/lib/barebox.lds 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 ,$^); \ $(objtree)/scripts/mips-relocs $@ diff --git a/arch/mips/pbl/Makefile b/arch/mips/pbl/Makefile index 44ce3d1c92..8f9e9fe593 100644 --- a/arch/mips/pbl/Makefile +++ b/arch/mips/pbl/Makefile @@ -25,7 +25,7 @@ $(obj)/zbarebox.S: $(obj)/zbarebox FORCE PBL_CPPFLAGS += -fdata-sections -ffunction-sections LDFLAGS_zbarebox := -Map $(obj)/zbarebox.map LDFLAGS_zbarebox += -static --gc-sections -zbarebox-common := $(barebox-pbl-common) $(obj)/$(piggy_o) +zbarebox-common := $(BAREBOX_PBL_OBJS) $(obj)/$(piggy_o) zbarebox-lds := $(obj)/zbarebox.lds quiet_cmd_zbarebox__ ?= LD $@ |