Skip to content

Commit

Permalink
csky: remove builtin-dtb Kbuild
Browse files Browse the repository at this point in the history
Remove the builtin-dtb implementation in arch/csky.

Signed-off-by: Guo Ren <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Reviewed-by: Arnd Bergmann <[email protected]>
  • Loading branch information
guoren83 committed Nov 1, 2018
1 parent ac43507 commit c4c14c3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 18 deletions.
10 changes: 1 addition & 9 deletions arch/csky/Kconfig.debug
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
menu "C-SKY Debug Options"
config CSKY_BUILTIN_DTB
string "Use kernel builtin dtb"
help
User could define the dtb instead of the one which is passed from
bootloader.
Sometimes for debug, we want to use a built-in dtb and then we needn't
modify bootloader at all.
endmenu
# dummy file, do not delete
2 changes: 0 additions & 2 deletions arch/csky/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ libs-y += arch/csky/lib/ \
$(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)

boot := arch/csky/boot
ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""'
core-y += $(boot)/dts/
endif

all: zImage

Expand Down
7 changes: 0 additions & 7 deletions arch/csky/boot/dts/Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
dtstree := $(srctree)/$(src)

ifneq '$(CONFIG_CSKY_BUILTIN_DTB)' '""'
builtindtb-y := $(patsubst "%",%,$(CONFIG_CSKY_BUILTIN_DTB))
dtb-y += $(builtindtb-y).dtb
obj-y += $(builtindtb-y).dtb.o
.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
else
dtb-y := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
endif

always += $(dtb-y)
clean-files += *.dtb *.dtb.S

0 comments on commit c4c14c3

Please sign in to comment.