Update from 2013.01 to 2013.07

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

diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile
index 256811afd4b7fa2ff329b7866068cd84202ce5a8..8165963ee8dec37ae469f5ec82807ee90c224a82 100644 (file)
--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -2,20 +2,7 @@
 # Copyright (c) 2007
 # Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 #
-# 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
@@ -33,7 +20,7 @@ GLSOBJS       += lshrdi3.o
 GLSOBJS        += movmem.o
 
 COBJS-y        += board.o
-COBJS-y        += bootm.o
+COBJS-$(CONFIG_CMD_BOOTM) += bootm.o
 ifeq ($(CONFIG_SH2),y)
 COBJS-y        += time_sh2.o
 else