diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-07 11:31:47 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-17 21:46:06 -0500 |
commit | bf070bb0e6c62ba3075db0a666763ba52c677102 (patch) | |
tree | 0e85b6a300e4a8848173f9a1b051e22bb6096fae /arch/mips/boot | |
parent | f7adc3124da019878186f1ebe98a13a1af041afd (diff) |
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>
Diffstat (limited to 'arch/mips/boot')
-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 |
12 files changed, 0 insertions, 36 deletions
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 | ||