diff options
author | Guo Ren <ren_guo@c-sky.com> | 2018-10-30 06:42:32 -0400 |
---|---|---|
committer | Guo Ren <ren_guo@c-sky.com> | 2018-10-31 22:52:26 -0400 |
commit | c4c14c3bd177ea769fee938674f73a8ec0cdd47a (patch) | |
tree | 8d335395d4c68b2e2c9c041a81214ca3a1a5e7dc | |
parent | ac435075892e3e651c667b4a9f2267cf3ef1d5a2 (diff) |
csky: remove builtin-dtb Kbuild
Remove the builtin-dtb implementation in arch/csky.
Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/csky/Kconfig.debug | 10 | ||||
-rw-r--r-- | arch/csky/Makefile | 2 | ||||
-rw-r--r-- | arch/csky/boot/dts/Makefile | 7 |
3 files changed, 1 insertions, 18 deletions
diff --git a/arch/csky/Kconfig.debug b/arch/csky/Kconfig.debug index 48cf6ff9df4a..22a162cd99e8 100644 --- a/arch/csky/Kconfig.debug +++ b/arch/csky/Kconfig.debug | |||
@@ -1,9 +1 @@ | |||
1 | menu "C-SKY Debug Options" | # dummy file, do not delete | |
2 | config CSKY_BUILTIN_DTB | ||
3 | string "Use kernel builtin dtb" | ||
4 | help | ||
5 | User could define the dtb instead of the one which is passed from | ||
6 | bootloader. | ||
7 | Sometimes for debug, we want to use a built-in dtb and then we needn't | ||
8 | modify bootloader at all. | ||
9 | endmenu | ||
diff --git a/arch/csky/Makefile b/arch/csky/Makefile index 67a4ae1fba2b..91f72224f4b9 100644 --- a/arch/csky/Makefile +++ b/arch/csky/Makefile | |||
@@ -65,9 +65,7 @@ libs-y += arch/csky/lib/ \ | |||
65 | $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) | 65 | $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name) |
66 | 66 | ||
67 | boot := arch/csky/boot | 67 | boot := arch/csky/boot |
68 | ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""' | ||
69 | core-y += $(boot)/dts/ | 68 | core-y += $(boot)/dts/ |
70 | endif | ||
71 | 69 | ||
72 | all: zImage | 70 | all: zImage |
73 | 71 | ||
diff --git a/arch/csky/boot/dts/Makefile b/arch/csky/boot/dts/Makefile index 305e81a5e91e..19a7f028ee20 100644 --- a/arch/csky/boot/dts/Makefile +++ b/arch/csky/boot/dts/Makefile | |||
@@ -1,13 +1,6 @@ | |||
1 | dtstree := $(srctree)/$(src) | 1 | dtstree := $(srctree)/$(src) |
2 | 2 | ||
3 | ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""' | ||
4 | builtindtb-y := $(patsubst "%",%,$(CONFIG_CSKY_BUILTIN_DTB)) | ||
5 | dtb-y += $(builtindtb-y).dtb | ||
6 | obj-y += $(builtindtb-y).dtb.o | ||
7 | .SECONDARY: $(obj)/$(builtindtb-y).dtb.S | ||
8 | else | ||
9 | dtb-y := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) | 3 | dtb-y := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) |
10 | endif | ||
11 | 4 | ||
12 | always += $(dtb-y) | 5 | always += $(dtb-y) |
13 | clean-files += *.dtb *.dtb.S | 6 | clean-files += *.dtb *.dtb.S |