summaryrefslogtreecommitdiffstats
path: root/board/nvidia
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-10-21 11:53:41 +0900
committerTom Rini <trini@ti.com>2013-11-01 11:42:13 -0400
commit3bddafaab42af50f2a6ae080c425e157906d9387 (patch)
tree615fafa513a9ad2785760a69b54309e9862f9b95 /board/nvidia
parentbcfe8fdf321e5e6d9931502c903348fe81252dd0 (diff)
downloadblackbird-obmc-uboot-3bddafaab42af50f2a6ae080c425e157906d9387.tar.gz
blackbird-obmc-uboot-3bddafaab42af50f2a6ae080c425e157906d9387.zip
Makefile: convert makefiles to Kbuild style and delete grep switch
We have converted all makefiles needed to build $(LIBS). Until this commit we used to grep switch so that U-Boot style and Kbuild style makefiles coexist. But we do not need any more. Goint forward, use always Kbuild style Makefile when adding a new Makefile Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'board/nvidia')
-rw-r--r--board/nvidia/common/Makefile26
-rw-r--r--board/nvidia/common/common.mk4
2 files changed, 2 insertions, 28 deletions
diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile
index 6215cafe25..e3fcf2bdff 100644
--- a/board/nvidia/common/Makefile
+++ b/board/nvidia/common/Makefile
@@ -1,30 +1,4 @@
# Copyright (c) 2011 The Chromium OS Authors.
# SPDX-License-Identifier: GPL-2.0+
-include $(TOPDIR)/config.mk
-
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)board/$(VENDOR)/common)
-endif
-
-LIB = $(obj)lib$(VENDOR).o
-
include common.mk
-
-COBJS := $(COBJS-y)
-SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS))
-SOBJS := $(addprefix $(obj),$(SOBJS))
-
-all: $(LIB)
-
-$(LIB): $(obj).depend $(OBJS) $(SOBJS)
- $(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-#########################################################################
-# This is for $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
diff --git a/board/nvidia/common/common.mk b/board/nvidia/common/common.mk
index d9bcb85401..9a9b5298c7 100644
--- a/board/nvidia/common/common.mk
+++ b/board/nvidia/common/common.mk
@@ -1,3 +1,3 @@
# common options for all tegra boards
-COBJS-y += ../../nvidia/common/board.o
-COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o
+obj-y += ../../nvidia/common/board.o
+obj-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o
OpenPOWER on IntegriCloud