diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-11 07:35:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-11 07:35:38 +0200 |
| commit | c3da5e9e8c2456989102079e29ed8e98855baba4 (patch) | |
| tree | dfd6ac934dfb8cd43246961be9c5ff8c3ff753c6 /arch/kvx | |
| parent | f97124673fbedd3500c1d9ea99a7f88825b0a6ff (diff) | |
| parent | 006fa56bb1a06a59ae13f349602af13faaeb89d5 (diff) | |
| download | barebox-c3da5e9e8c2456989102079e29ed8e98855baba4.tar.gz barebox-c3da5e9e8c2456989102079e29ed8e98855baba4.tar.xz | |
Merge branch 'for-next/kbuild'
Diffstat (limited to 'arch/kvx')
| -rw-r--r-- | arch/kvx/Makefile | 2 | ||||
| -rw-r--r-- | arch/kvx/dts/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/kvx/Makefile b/arch/kvx/Makefile index c97cff3456..643ef28553 100644 --- a/arch/kvx/Makefile +++ b/arch/kvx/Makefile @@ -32,6 +32,6 @@ lds-y += arch/kvx/cpu/barebox.lds cmd_barebox__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_barebox) -o $@ \ -T $(BAREBOX_LDS) \ - --start-group $(BAREBOX_OBJS) --end-group \ + --whole-archive $(BAREBOX_OBJS) --no-while-archive \ -L$(LIBGCC_PATH) -lgcc \ $(filter-out $(BAREBOX_LDS) $(BAREBOX_OBJS) FORCE ,$^) diff --git a/arch/kvx/dts/Makefile b/arch/kvx/dts/Makefile index 9d5e94ae10..391783c1ea 100644 --- a/arch/kvx/dts/Makefile +++ b/arch/kvx/dts/Makefile @@ -4,10 +4,10 @@ obj- += dummy.o BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME)) ifneq ($(BUILTIN_DTB),) -obj-dtb-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o +obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o endif -obj-dtb-$(CONFIG_BOARD_K200) += k200.dtb.o +obj-$(CONFIG_BOARD_K200) += k200.dtb.o always := $(dtb-y) clean-files := *.dtb *.dtb.S .*.dtc .*.pre .*.dts |