Patchwork [U-Boot,07/13] sh: Remove config.mk for sh7785lcr board

login
register
mail settings
Submitter Nobuhiro Iwamatsu
Date Jan. 17, 2011, 12:50 p.m.
Message ID <1295268663-11004-7-git-send-email-iwamatsu@nigauri.org>
Download mbox | patch
Permalink /patch/79147/
State Accepted
Commit 59272c6bfcb3065c22e404df04ea9bd5d12531aa
Headers show

Comments

Nobuhiro Iwamatsu - Jan. 17, 2011, 12:50 p.m.
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/sh7785lcr/config.mk |   31 -------------------------------
 include/configs/sh7785lcr.h       |    2 ++
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 board/renesas/sh7785lcr/config.mk

Patch

diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk
deleted file mode 100644
index 6853d2b..0000000
--- a/board/renesas/sh7785lcr/config.mk
+++ /dev/null
@@ -1,31 +0,0 @@ 
-#
-# 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
-
-#
-# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.
-#
-# NOTE: Must match value used in u-boot.lds (in this directory).
-#
-sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-
-ifdef CONFIG_SH_32BIT
-CONFIG_SYS_TEXT_BASE = 0x8FF80000
-else
-CONFIG_SYS_TEXT_BASE = 0x0ff80000
-endif
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index a95a759..8eb9a12 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -63,6 +63,7 @@ 
 
 /* MEMORY */
 #if defined(CONFIG_SH_32BIT)
+#define CONFIG_SYS_TEXT_BASE		0x8FF80000
 /* 0x40000000 - 0x47FFFFFF does not use */
 #define CONFIG_SH_SDRAM_OFFSET		(0x8000000)
 #define SH7785LCR_SDRAM_PHYS_BASE	(0x40000000 + CONFIG_SH_SDRAM_OFFSET)
@@ -72,6 +73,7 @@ 
 #define SH7785LCR_FLASH_BANK_SIZE	(64 * 1024 * 1024)
 #define SH7785LCR_USB_BASE		(0xa6000000)
 #else
+#define CONFIG_SYS_TEXT_BASE		0x0FF80000
 #define SH7785LCR_SDRAM_BASE		(0x08000000)
 #define SH7785LCR_SDRAM_SIZE		(128 * 1024 * 1024)
 #define SH7785LCR_FLASH_BASE_1		(0xa0000000)