From 653f985b89cecc90b4f577c1fa99d7af89a18433 Mon Sep 17 00:00:00 2001
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Mon, 17 Jan 2011 20:48:39 +0900
Subject: [PATCH] sh: Remove config.mk for r2dplus 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>
---
 board/renesas/r2dplus/config.mk | 23 -----------------------
 include/configs/r2dplus.h       |  1 +
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 board/renesas/r2dplus/config.mk

diff --git a/board/renesas/r2dplus/config.mk b/board/renesas/r2dplus/config.mk
deleted file mode 100644
index 55163b925b..0000000000
--- a/board/renesas/r2dplus/config.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2007,2008
-# 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
-#
-#
-# NOTE: Must match value used in u-boot.lds (in this directory).
-#
-CONFIG_SYS_TEXT_BASE = 0x0FFC0000
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 8689513fb7..5534b4992c 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -40,6 +40,7 @@
 #define CONFIG_SYS_SDRAM_BASE		(0x8C000000)
 #define CONFIG_SYS_SDRAM_SIZE		(0x04000000)
 
+#define CONFIG_SYS_TEXT_BASE	0x0FFC0000
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"=> "
 #define CONFIG_SYS_CBSIZE		256
-- 
2.39.5