Update from 2013.01 to 2013.07

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

diff --git a/arch/avr32/lib/Makefile b/arch/avr32/lib/Makefile
index ee6d0672aa6f44dec64d47ff1952baca60abdbf6..d5245d32f63b086c65f1bb386437375d9f5d44a4 100644 (file)
--- a/arch/avr32/lib/Makefile
+++ b/arch/avr32/lib/Makefile
@@ -4,23 +4,7 @@
 #
 # (C) Copyright 2004-2006 Atmel Corporation
 #
-# 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
@@ -30,7 +14,7 @@ LIB   = $(obj)lib$(ARCH).o
 SOBJS-y        += memset.o
 
 COBJS-y        += board.o
-COBJS-y        += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
 COBJS-y        += interrupts.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)