kbuild: remove all dummy assignments to obj-
Now kbuild core scripts create empty built-in.o where necessary. Remove "obj- := dummy.o" tricks. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
f7adc3124d
commit
bf070bb0e6
|
@ -1 +0,0 @@
|
||||||
obj- += dummy.o
|
|
|
@ -35,6 +35,3 @@ dtb-$(CONFIG_DT_NONE) += \
|
||||||
bcm97435svmb.dtb
|
bcm97435svmb.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -2,6 +2,3 @@
|
||||||
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
|
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -3,6 +3,3 @@ dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += boston.dtb
|
||||||
|
|
||||||
dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
|
dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
|
||||||
obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
|
obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -3,6 +3,3 @@ dtb-$(CONFIG_JZ4740_QI_LB60) += qi_lb60.dtb
|
||||||
dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb
|
dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -2,6 +2,3 @@
|
||||||
dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb
|
dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -3,6 +3,3 @@ dtb-$(CONFIG_MIPS_MALTA) += malta.dtb
|
||||||
dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb
|
dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -6,6 +6,3 @@ dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb
|
||||||
dtb-$(CONFIG_DT_XLP_RVP) += xlp_rvp.dtb
|
dtb-$(CONFIG_DT_XLP_RVP) += xlp_rvp.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -1,4 +1 @@
|
||||||
dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb
|
dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -5,6 +5,3 @@ dtb-$(CONFIG_DTB_PIC32_NONE) += \
|
||||||
pic32mzda_sk.dtb
|
pic32mzda_sk.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -5,6 +5,3 @@ dtb-$(CONFIG_ATH79) += ar9331_dpt_module.dtb
|
||||||
dtb-$(CONFIG_ATH79) += ar9331_dragino_ms14.dtb
|
dtb-$(CONFIG_ATH79) += ar9331_dragino_ms14.dtb
|
||||||
dtb-$(CONFIG_ATH79) += ar9331_omega.dtb
|
dtb-$(CONFIG_ATH79) += ar9331_omega.dtb
|
||||||
dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb
|
dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -7,6 +7,3 @@ dtb-$(CONFIG_DTB_OMEGA2P) += omega2p.dtb
|
||||||
dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb
|
dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -2,6 +2,3 @@
|
||||||
dtb-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += nexys4ddr.dtb
|
dtb-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += nexys4ddr.dtb
|
||||||
|
|
||||||
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
|
||||||
|
|
||||||
# Force kbuild to make empty built-in.o if necessary
|
|
||||||
obj- += dummy.o
|
|
||||||
|
|
|
@ -59,6 +59,3 @@ endif
|
||||||
|
|
||||||
targets := $(patsubst $(obj)/%,%, \
|
targets := $(patsubst $(obj)/%,%, \
|
||||||
$(shell find $(obj) -name \*.gen.S 2>/dev/null))
|
$(shell find $(obj) -name \*.gen.S 2>/dev/null))
|
||||||
# Without this, built-in.o won't be created when it's empty, and the
|
|
||||||
# final vmlinux link will fail.
|
|
||||||
obj- := dummy
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
||||||
obj- := dummy.o
|
|
||||||
|
|
||||||
# List of programs to build
|
# List of programs to build
|
||||||
hostprogs-y := test_lru_dist
|
hostprogs-y := test_lru_dist
|
||||||
hostprogs-y += sock_example
|
hostprogs-y += sock_example
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
||||||
obj- := dummy.o
|
|
||||||
|
|
||||||
# List of programs to build
|
# List of programs to build
|
||||||
hostprogs-y := hid-example
|
hostprogs-y := hid-example
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0
|
# SPDX-License-Identifier: GPL-2.0
|
||||||
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
||||||
obj- := dummy.o
|
|
||||||
|
|
||||||
hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct
|
hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct
|
||||||
|
|
||||||
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
|
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
||||||
obj- := dummy.o
|
|
||||||
|
|
||||||
# List of programs to build
|
# List of programs to build
|
||||||
hostprogs-y := sockmap
|
hostprogs-y := sockmap
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
||||||
obj- := dummy.o
|
|
||||||
|
|
||||||
# List of programs to build
|
# List of programs to build
|
||||||
hostprogs-$(CONFIG_SAMPLE_STATX) := test-statx
|
hostprogs-$(CONFIG_SAMPLE_STATX) := test-statx
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
# kbuild trick to avoid linker error. Can be omitted if a module is built.
|
|
||||||
obj- := dummy.o
|
|
||||||
|
|
||||||
# List of programs to build
|
# List of programs to build
|
||||||
hostprogs-y := uhid-example
|
hostprogs-y := uhid-example
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue