diff options
| -rw-r--r-- | arch/arm/mach-uniphier/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/cavium-octeon/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/img/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/ingenic/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/lantiq/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/mti/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/netlogic/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/ni/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/pic32/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/qca/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/ralink/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/boot/dts/xilfpga/Makefile | 3 | ||||
| -rw-r--r-- | firmware/Makefile | 3 | ||||
| -rw-r--r-- | samples/bpf/Makefile | 3 | ||||
| -rw-r--r-- | samples/hidraw/Makefile | 3 | ||||
| -rw-r--r-- | samples/seccomp/Makefile | 3 | ||||
| -rw-r--r-- | samples/sockmap/Makefile | 3 | ||||
| -rw-r--r-- | samples/statx/Makefile | 3 | ||||
| -rw-r--r-- | samples/uhid/Makefile | 3 |
20 files changed, 0 insertions, 58 deletions
diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile index 6bea3d3a2dd7..e69de29bb2d1 100644 --- a/arch/arm/mach-uniphier/Makefile +++ b/arch/arm/mach-uniphier/Makefile | |||
| @@ -1 +0,0 @@ | |||
| 1 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/brcm/Makefile b/arch/mips/boot/dts/brcm/Makefile index 09ba7e894bad..d8787c9a499e 100644 --- a/arch/mips/boot/dts/brcm/Makefile +++ b/arch/mips/boot/dts/brcm/Makefile | |||
| @@ -35,6 +35,3 @@ dtb-$(CONFIG_DT_NONE) += \ | |||
| 35 | bcm97435svmb.dtb | 35 | bcm97435svmb.dtb |
| 36 | 36 | ||
| 37 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 37 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 38 | |||
| 39 | # Force kbuild to make empty built-in.o if necessary | ||
| 40 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/cavium-octeon/Makefile b/arch/mips/boot/dts/cavium-octeon/Makefile index f5d01b31df50..24a8efcd7b03 100644 --- a/arch/mips/boot/dts/cavium-octeon/Makefile +++ b/arch/mips/boot/dts/cavium-octeon/Makefile | |||
| @@ -2,6 +2,3 @@ | |||
| 2 | dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb | 2 | dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb |
| 3 | 3 | ||
| 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 5 | |||
| 6 | # Force kbuild to make empty built-in.o if necessary | ||
| 7 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/img/Makefile b/arch/mips/boot/dts/img/Makefile index 3eb2597a4d6c..441a3c16efb0 100644 --- a/arch/mips/boot/dts/img/Makefile +++ b/arch/mips/boot/dts/img/Makefile | |||
| @@ -3,6 +3,3 @@ dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += boston.dtb | |||
| 3 | 3 | ||
| 4 | dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb | 4 | dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb |
| 5 | obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o | 5 | obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o |
| 6 | |||
| 7 | # Force kbuild to make empty built-in.o if necessary | ||
| 8 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/ingenic/Makefile b/arch/mips/boot/dts/ingenic/Makefile index 035769269cbc..6a31759839b4 100644 --- a/arch/mips/boot/dts/ingenic/Makefile +++ b/arch/mips/boot/dts/ingenic/Makefile | |||
| @@ -3,6 +3,3 @@ dtb-$(CONFIG_JZ4740_QI_LB60) += qi_lb60.dtb | |||
| 3 | dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb | 3 | dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb |
| 4 | 4 | ||
| 5 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 5 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 6 | |||
| 7 | # Force kbuild to make empty built-in.o if necessary | ||
| 8 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/lantiq/Makefile b/arch/mips/boot/dts/lantiq/Makefile index 00e2e540ed3f..51ab9c1dff42 100644 --- a/arch/mips/boot/dts/lantiq/Makefile +++ b/arch/mips/boot/dts/lantiq/Makefile | |||
| @@ -2,6 +2,3 @@ | |||
| 2 | dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb | 2 | dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb |
| 3 | 3 | ||
| 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 5 | |||
| 6 | # Force kbuild to make empty built-in.o if necessary | ||
| 7 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/mti/Makefile b/arch/mips/boot/dts/mti/Makefile index 480af498a9dd..3508720cb6d9 100644 --- a/arch/mips/boot/dts/mti/Makefile +++ b/arch/mips/boot/dts/mti/Makefile | |||
| @@ -3,6 +3,3 @@ dtb-$(CONFIG_MIPS_MALTA) += malta.dtb | |||
| 3 | dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb | 3 | dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb |
| 4 | 4 | ||
| 5 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 5 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 6 | |||
| 7 | # Force kbuild to make empty built-in.o if necessary | ||
| 8 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/netlogic/Makefile b/arch/mips/boot/dts/netlogic/Makefile index 2b99450d7433..d630b27950f0 100644 --- a/arch/mips/boot/dts/netlogic/Makefile +++ b/arch/mips/boot/dts/netlogic/Makefile | |||
| @@ -6,6 +6,3 @@ dtb-$(CONFIG_DT_XLP_GVP) += xlp_gvp.dtb | |||
| 6 | dtb-$(CONFIG_DT_XLP_RVP) += xlp_rvp.dtb | 6 | dtb-$(CONFIG_DT_XLP_RVP) += xlp_rvp.dtb |
| 7 | 7 | ||
| 8 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 8 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 9 | |||
| 10 | # Force kbuild to make empty built-in.o if necessary | ||
| 11 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/ni/Makefile b/arch/mips/boot/dts/ni/Makefile index 6cd9c606f025..9e2c9faede47 100644 --- a/arch/mips/boot/dts/ni/Makefile +++ b/arch/mips/boot/dts/ni/Makefile | |||
| @@ -1,4 +1 @@ | |||
| 1 | dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb | dtb-$(CONFIG_FIT_IMAGE_FDT_NI169445) += 169445.dtb | |
| 2 | |||
| 3 | # Force kbuild to make empty built-in.o if necessary | ||
| 4 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/pic32/Makefile b/arch/mips/boot/dts/pic32/Makefile index a139a0fbd7b7..ba9bcef8fde9 100644 --- a/arch/mips/boot/dts/pic32/Makefile +++ b/arch/mips/boot/dts/pic32/Makefile | |||
| @@ -5,6 +5,3 @@ dtb-$(CONFIG_DTB_PIC32_NONE) += \ | |||
| 5 | pic32mzda_sk.dtb | 5 | pic32mzda_sk.dtb |
| 6 | 6 | ||
| 7 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 7 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 8 | |||
| 9 | # Force kbuild to make empty built-in.o if necessary | ||
| 10 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/qca/Makefile b/arch/mips/boot/dts/qca/Makefile index 639adeac90af..4451cf45b0ad 100644 --- a/arch/mips/boot/dts/qca/Makefile +++ b/arch/mips/boot/dts/qca/Makefile | |||
| @@ -5,6 +5,3 @@ dtb-$(CONFIG_ATH79) += ar9331_dpt_module.dtb | |||
| 5 | dtb-$(CONFIG_ATH79) += ar9331_dragino_ms14.dtb | 5 | dtb-$(CONFIG_ATH79) += ar9331_dragino_ms14.dtb |
| 6 | dtb-$(CONFIG_ATH79) += ar9331_omega.dtb | 6 | dtb-$(CONFIG_ATH79) += ar9331_omega.dtb |
| 7 | dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb | 7 | dtb-$(CONFIG_ATH79) += ar9331_tl_mr3020.dtb |
| 8 | |||
| 9 | # Force kbuild to make empty built-in.o if necessary | ||
| 10 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/ralink/Makefile b/arch/mips/boot/dts/ralink/Makefile index 323c8bcfb602..94bee5b38b53 100644 --- a/arch/mips/boot/dts/ralink/Makefile +++ b/arch/mips/boot/dts/ralink/Makefile | |||
| @@ -7,6 +7,3 @@ dtb-$(CONFIG_DTB_OMEGA2P) += omega2p.dtb | |||
| 7 | dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb | 7 | dtb-$(CONFIG_DTB_VOCORE2) += vocore2.dtb |
| 8 | 8 | ||
| 9 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 9 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 10 | |||
| 11 | # Force kbuild to make empty built-in.o if necessary | ||
| 12 | obj- += dummy.o | ||
diff --git a/arch/mips/boot/dts/xilfpga/Makefile b/arch/mips/boot/dts/xilfpga/Makefile index 616322405ade..9987e0e378c5 100644 --- a/arch/mips/boot/dts/xilfpga/Makefile +++ b/arch/mips/boot/dts/xilfpga/Makefile | |||
| @@ -2,6 +2,3 @@ | |||
| 2 | dtb-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += nexys4ddr.dtb | 2 | dtb-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += nexys4ddr.dtb |
| 3 | 3 | ||
| 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
| 5 | |||
| 6 | # Force kbuild to make empty built-in.o if necessary | ||
| 7 | obj- += dummy.o | ||
diff --git a/firmware/Makefile b/firmware/Makefile index 168094a3fae7..29641383e136 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -59,6 +59,3 @@ endif | |||
| 59 | 59 | ||
| 60 | targets := $(patsubst $(obj)/%,%, \ | 60 | targets := $(patsubst $(obj)/%,%, \ |
| 61 | $(shell find $(obj) -name \*.gen.S 2>/dev/null)) | 61 | $(shell find $(obj) -name \*.gen.S 2>/dev/null)) |
| 62 | # Without this, built-in.o won't be created when it's empty, and the | ||
| 63 | # final vmlinux link will fail. | ||
| 64 | obj- := dummy | ||
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 3b4945c1eab0..adeaa1302f34 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 3 | obj- := dummy.o | ||
| 4 | |||
| 5 | # List of programs to build | 2 | # List of programs to build |
| 6 | hostprogs-y := test_lru_dist | 3 | hostprogs-y := test_lru_dist |
| 7 | hostprogs-y += sock_example | 4 | hostprogs-y += sock_example |
diff --git a/samples/hidraw/Makefile b/samples/hidraw/Makefile index f5c3012ffa79..dec1b22adf54 100644 --- a/samples/hidraw/Makefile +++ b/samples/hidraw/Makefile | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 3 | obj- := dummy.o | ||
| 4 | |||
| 5 | # List of programs to build | 2 | # List of programs to build |
| 6 | hostprogs-y := hid-example | 3 | hostprogs-y := hid-example |
| 7 | 4 | ||
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index 19a870eed82b..0e349b80686e 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 3 | obj- := dummy.o | ||
| 4 | |||
| 5 | hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct | 2 | hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct |
| 6 | 3 | ||
| 7 | HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include | 4 | HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include |
diff --git a/samples/sockmap/Makefile b/samples/sockmap/Makefile index 9291ab8e0f8c..73f1da4d116c 100644 --- a/samples/sockmap/Makefile +++ b/samples/sockmap/Makefile | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | 1 | # List of programs to build |
| 5 | hostprogs-y := sockmap | 2 | hostprogs-y := sockmap |
| 6 | 3 | ||
diff --git a/samples/statx/Makefile b/samples/statx/Makefile index 1f80a3d8cf45..59df7c25a9d1 100644 --- a/samples/statx/Makefile +++ b/samples/statx/Makefile | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | 1 | # List of programs to build |
| 5 | hostprogs-$(CONFIG_SAMPLE_STATX) := test-statx | 2 | hostprogs-$(CONFIG_SAMPLE_STATX) := test-statx |
| 6 | 3 | ||
diff --git a/samples/uhid/Makefile b/samples/uhid/Makefile index c95a696560a7..8d7fd6190ac4 100644 --- a/samples/uhid/Makefile +++ b/samples/uhid/Makefile | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | # kbuild trick to avoid linker error. Can be omitted if a module is built. | ||
| 2 | obj- := dummy.o | ||
| 3 | |||
| 4 | # List of programs to build | 1 | # List of programs to build |
| 5 | hostprogs-y := uhid-example | 2 | hostprogs-y := uhid-example |
| 6 | 3 | ||
