From bcfe8fdf321e5e6d9931502c903348fe81252dd0 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 21 Oct 2013 11:53:40 +0900 Subject: [PATCH] dts, api, test: convert makefiles to Kbuild style Signed-off-by: Masahiro Yamada --- Makefile | 2 +- api/Makefile | 18 +----------------- dts/Makefile | 24 +----------------------- test/Makefile | 26 ++------------------------ 4 files changed, 5 insertions(+), 65 deletions(-) diff --git a/Makefile b/Makefile index 03389dd3ad..7b05b53cdc 100644 --- a/Makefile +++ b/Makefile @@ -383,7 +383,7 @@ build := -f $(TOPDIR)/scripts/Makefile.build -C all: $(ALL-y) $(SUBDIR_EXAMPLES) $(obj)u-boot.dtb: checkdtc $(obj)u-boot - $(MAKE) -C dts binary + $(MAKE) $(build) dts binary mv $(obj)dts/dt.dtb $@ $(obj)u-boot-dtb.bin: $(obj)u-boot.bin $(obj)u-boot.dtb diff --git a/api/Makefile b/api/Makefile index 87b8eb2bb8..fb130ffe8b 100644 --- a/api/Makefile +++ b/api/Makefile @@ -4,21 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk - -LIB = $(obj)libapi.o - -COBJS-$(CONFIG_API) += api.o api_display.o api_net.o api_storage.o \ +obj-$(CONFIG_API) += api.o api_display.o api_net.o api_storage.o \ api_platform-$(ARCH).o - -COBJS := $(COBJS-y) -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend diff --git a/dts/Makefile b/dts/Makefile index 3cf991eaf2..140c8bc5e7 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -7,10 +7,6 @@ # This Makefile builds the internal U-Boot fdt if CONFIG_OF_CONTROL is # enabled. See doc/README.fdt-control for more details. -include $(TOPDIR)/config.mk - -LIB = $(obj)libdts.o - ifeq ($(DEVICE_TREE),) $(if $(CONFIG_DEFAULT_DEVICE_TREE),,\ $(error Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file)) @@ -27,8 +23,6 @@ DTS_CPPFLAGS := -x assembler-with-cpp -undef -D__DTS__ \ DTC_FLAGS := -R 4 -p 0x1000 \ $(addprefix -i ,$(DTS_INCDIRS)) -all: $(obj).depend $(LIB) - # Use a constant name for this so we can access it from C code. # objcopy doesn't seem to allow us to set the symbol name independently of # the filename. @@ -71,22 +65,6 @@ $(obj)dt.o: $(DT_BIN) $(notdir ${DT_BIN}) $@ rm $(DT_BIN) -OBJS-$(CONFIG_OF_EMBED) := dt.o - -COBJS := $(OBJS-y) - -OBJS := $(addprefix $(obj),$(COBJS)) +obj-$(CONFIG_OF_EMBED) := dt.o binary: $(DT_BIN) - -$(LIB): $(OBJS) $(DTB) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/test/Makefile b/test/Makefile index a68613df72..9c95805c44 100644 --- a/test/Makefile +++ b/test/Makefile @@ -4,27 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -include $(TOPDIR)/config.mk - -LIB = $(obj)libtest.o - -COBJS-$(CONFIG_SANDBOX) += command_ut.o -COBJS-$(CONFIG_SANDBOX) += compression.o - -COBJS := $(sort $(COBJS-y)) -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -all: $(LIB) $(XOBJS) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### +obj-$(CONFIG_SANDBOX) += command_ut.o +obj-$(CONFIG_SANDBOX) += compression.o -- 2.25.1