Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / arm / lib / Makefile

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 9479d30e4b70075a3815c33e8f52b34f2045e37e..a68adf97ab3ce2f9ef9df88b5e79ba02ace7f7a2 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -2,23 +2,7 @@
 # (C) Copyright 2002-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.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 as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
+# SPDX-License-Identifier:     GPL-2.0+
 #
 
 include $(TOPDIR)/config.mk
@@ -37,8 +21,14 @@ GLSOBJS      += _umodsi3.o
 GLCOBJS        += div0.o
 
 ifndef CONFIG_SPL_BUILD
+SOBJS-y += relocate.o
+ifndef CONFIG_SYS_GENERIC_BOARD
 COBJS-y        += board.o
-COBJS-y        += bootm.o
+endif
+COBJS-y += sections.o
+
+COBJS-$(CONFIG_OF_LIBFDT) += bootm-fdt.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
 COBJS-$(CONFIG_SYS_L2_PL310) += cache-pl310.o
 SOBJS-y += crt0.o
 SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o