diff options
-rw-r--r-- | arch/mips/boot/dts/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/boot/dts/danube.dtsi (renamed from arch/mips/lantiq/dts/danube.dtsi) | 0 | ||||
-rw-r--r-- | arch/mips/boot/dts/easy50712.dts (renamed from arch/mips/lantiq/dts/easy50712.dts) | 0 | ||||
-rw-r--r-- | arch/mips/lantiq/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/lantiq/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/lantiq/dts/Makefile | 1 |
6 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile index 51acad699ed0..4f265ec447eb 100644 --- a/arch/mips/boot/dts/Makefile +++ b/arch/mips/boot/dts/Makefile | |||
@@ -1,4 +1,5 @@ | |||
1 | dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb | 1 | dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb |
2 | dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb | ||
2 | 3 | ||
3 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) | 4 | obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y)) |
4 | 5 | ||
diff --git a/arch/mips/lantiq/dts/danube.dtsi b/arch/mips/boot/dts/danube.dtsi index d4c59e003708..d4c59e003708 100644 --- a/arch/mips/lantiq/dts/danube.dtsi +++ b/arch/mips/boot/dts/danube.dtsi | |||
diff --git a/arch/mips/lantiq/dts/easy50712.dts b/arch/mips/boot/dts/easy50712.dts index 143b8a37b5e4..143b8a37b5e4 100644 --- a/arch/mips/lantiq/dts/easy50712.dts +++ b/arch/mips/boot/dts/easy50712.dts | |||
diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig index c0021912131e..e10d33342b30 100644 --- a/arch/mips/lantiq/Kconfig +++ b/arch/mips/lantiq/Kconfig | |||
@@ -30,6 +30,7 @@ choice | |||
30 | config DT_EASY50712 | 30 | config DT_EASY50712 |
31 | bool "Easy50712" | 31 | bool "Easy50712" |
32 | depends on SOC_XWAY | 32 | depends on SOC_XWAY |
33 | select BUILTIN_DTB | ||
33 | endchoice | 34 | endchoice |
34 | 35 | ||
35 | config PCI_LANTIQ | 36 | config PCI_LANTIQ |
diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile index d6bdc579419f..690257ab86d6 100644 --- a/arch/mips/lantiq/Makefile +++ b/arch/mips/lantiq/Makefile | |||
@@ -6,8 +6,6 @@ | |||
6 | 6 | ||
7 | obj-y := irq.o clk.o prom.o | 7 | obj-y := irq.o clk.o prom.o |
8 | 8 | ||
9 | obj-y += dts/ | ||
10 | |||
11 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 9 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
12 | 10 | ||
13 | obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ | 11 | obj-$(CONFIG_SOC_TYPE_XWAY) += xway/ |
diff --git a/arch/mips/lantiq/dts/Makefile b/arch/mips/lantiq/dts/Makefile deleted file mode 100644 index 6fa72dd641b2..000000000000 --- a/arch/mips/lantiq/dts/Makefile +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | obj-$(CONFIG_DT_EASY50712) := easy50712.dtb.o | ||