karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / board / karo / common / Makefile

diff --git a/board/karo/common/Makefile b/board/karo/common/Makefile
index 8e22489c3dd40abd87c07fbede8548fda55c9dd9..05c1d343a03e49d17812cd623e7efbaca1e1bd0f 100644 (file)
--- a/board/karo/common/Makefile
+++ b/board/karo/common/Makefile
@@ -1,50 +1,13 @@
 #
-# (C) Copyright 2012 Lothar Waßmann <LW@KARO-electronics.de>
+# (C) Copyright 2012-2015 Lothar Waßmann <LW@KARO-electronics.de>
 #
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# 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
-
 ifeq ($(CONFIG_SPL_BUILD),)
-       COBJS-$(CONFIG_OF_BOARD_SETUP)  += fdt.o
-       COBJS-$(CONFIG_SPLASH_SCREEN)   += splashimage.o
+       obj-$(CONFIG_OF_LIBFDT)         += fdt.o
+       obj-$(CONFIG_SPLASH_SCREEN)     += splashimage.o
 endif
-COBJS-$(CONFIG_CMD_NAND)               += nand.o
-COBJS-$(CONFIG_ENV_IS_IN_MMC)          += mmc.o
-COBJS-y                                += env.o
-COBJS   := $(COBJS-y)
-SOBJS  := 
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))
-
-$(LIB):        $(obj).depend $(OBJS) $(SOBJS)
-       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-all:   $(LIB)
-
-#########################################################################
-
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-$(CONFIG_CMD_NAND)                 += nand.o
+obj-$(CONFIG_ENV_IS_IN_MMC)            += mmc.o
+obj-y                                  += env.o