From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Mon, 17 Jan 2011 12:13:49 +0000 (+0900)
Subject: sh: Remove config.mk for mpr2 board
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=b825696251419a61376f3074a96c40f5d4a2a7c7

sh: Remove config.mk for mpr2 board

Move CONFIG_SYS_TEXT_BASE to the board's config file, and remove the
unnecessary config.mk file.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---

diff --git a/board/mpr2/config.mk b/board/mpr2/config.mk
deleted file mode 100644
index 4a4bca17d3..0000000000
--- a/board/mpr2/config.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (C) 2007
-# Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
-#
-# Copyright (C) 2007
-# Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
-#
-# Copyright (C) 2007
-# Kenati Technologies, Inc.
-#
-# Copyright (C) 2008
-# Mark Jonas <mark.jonas@de.bosch.com>
-#
-# board/mpr2/config.mk
-#
-# 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
-
-#
-# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.
-#
-# NOTE: Must match value used in u-boot.lds (in this directory).
-#
-
-CONFIG_SYS_TEXT_BASE = 0x8FFC0000
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 311f524024..f32899f47d 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -58,6 +58,8 @@
 #define CONFIG_SYS_MONITOR_LEN		(128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN		(256 * 1024)
 
+#define CONFIG_SYS_TEXT_BASE	0x8FFC0000
+
 /* Memory */
 #define CONFIG_SYS_SDRAM_BASE		0x8C000000
 #define CONFIG_SYS_SDRAM_SIZE		(64 * 1024 * 1024)