summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-12-11 12:22:29 +0900
committerTom Rini <trini@konsulko.com>2016-01-20 10:19:36 -0500
commit5ba0b4885fb5f3bf7557f23f735ac1b776dca013 (patch)
tree3cfa19864a1aff6ea448757c60bffc1c0edaaba9
parent9a893d245f0ca68e47960627e6602fdda86f021b (diff)
downloadblackbird-obmc-uboot-5ba0b4885fb5f3bf7557f23f735ac1b776dca013.tar.gz
blackbird-obmc-uboot-5ba0b4885fb5f3bf7557f23f735ac1b776dca013.zip
mips: pb1x00: move CONFIG_SYS_TEXT_BASE away from config.mk
We can delete board/pb1x00/config.mk by moving the define of CONFIG_SYS_TEXT_BASE to somewhere else. Other MIPS boards are still defining it in include/config/${BOARD}.h, so I am following that way here. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
-rw-r--r--board/pb1x00/config.mk16
-rw-r--r--include/configs/pb1x00.h5
2 files changed, 5 insertions, 16 deletions
diff --git a/board/pb1x00/config.mk b/board/pb1x00/config.mk
deleted file mode 100644
index 8f13301159..0000000000
--- a/board/pb1x00/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# (C) Copyright 2003
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-#
-# AMD development board AMD Alchemy Pb1x00, MIPS32 core
-#
-
-# ROM version
-#CONFIG_SYS_TEXT_BASE = 0xbfc00000
-
-# SDRAM version
-CONFIG_SYS_TEXT_BASE = 0x83800000
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 41b7393c0e..f490e7911d 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -81,6 +81,11 @@
#define PHYS_FLASH_2 0xbfc00000 /* Flash Bank #2 */
/* The following #defines are needed to get flash environment right */
+/* ROM version */
+/* #define CONFIG_SYS_TEXT_BASE 0xbfc00000 */
+/* SDRAM version */
+#define CONFIG_SYS_TEXT_BASE 0x83800000
+
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MONITOR_LEN (192 << 10)
OpenPOWER on IntegriCloud