summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2011-01-17 20:50:26 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2011-02-02 16:18:44 +0900
commit913c8910bd848b56de77fa61c35fabb9daabdbbd (patch)
tree1a0d7aeebf582ed6ac19e0f31274f4bb2c7ecdd2
parent653f985b89cecc90b4f577c1fa99d7af89a18433 (diff)
downloadtalos-obmc-uboot-913c8910bd848b56de77fa61c35fabb9daabdbbd.tar.gz
talos-obmc-uboot-913c8910bd848b56de77fa61c35fabb9daabdbbd.zip
sh: Remove config.mk for r7780mp 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>
-rw-r--r--board/renesas/r7780mp/config.mk27
-rw-r--r--include/configs/r7780mp.h1
2 files changed, 1 insertions, 27 deletions
diff --git a/board/renesas/r7780mp/config.mk b/board/renesas/r7780mp/config.mk
deleted file mode 100644
index 70ee3fd254..0000000000
--- a/board/renesas/r7780mp/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2007,2008 Nobuhiro Iwamatsu
-#
-# board/r77870mp/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 = 0x0FFC0000
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 802416f3e0..e1febf36bb 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -60,6 +60,7 @@
/* check for keypress on bootdelay==0 */
/*#define CONFIG_ZERO_BOOTDELAY_CHECK*/
+#define CONFIG_SYS_TEXT_BASE 0x0FFC0000
#define CONFIG_SYS_SDRAM_BASE (0x08000000)
#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024)
OpenPOWER on IntegriCloud