summaryrefslogtreecommitdiffstats
path: root/include/configs/km
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-14 16:39:32 -0500
committerTom Rini <trini@ti.com>2014-11-14 16:39:32 -0500
commit2086e388d56cbb0e3737a6276f04f00f74bf6723 (patch)
tree280fe51e714f5124839d81e3e3a0a6967c9f81d3 /include/configs/km
parent6393c43c18a1aadcdcdd8551826eef15f50353d5 (diff)
parent94b383e7d843efe2618535f01776921751dd756b (diff)
downloadtalos-obmc-uboot-2086e388d56cbb0e3737a6276f04f00f74bf6723.tar.gz
talos-obmc-uboot-2086e388d56cbb0e3737a6276f04f00f74bf6723.zip
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/configs/km')
-rw-r--r--include/configs/km/km83xx-common.h3
-rw-r--r--include/configs/km/kmp204x-common.h7
2 files changed, 8 insertions, 2 deletions
diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index ae6b6dcf24..940000ea71 100644
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -8,6 +8,9 @@
#ifndef __CONFIG_KM83XX_H
#define __CONFIG_KM83XX_H
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/* include common defines/options for all Keymile boards */
#include "keymile-common.h"
#include "km-powerpc.h"
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index a0f9d293ca..864e5f12ad 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -11,7 +11,7 @@
#define CONFIG_PHYS_64BIT
#define CONFIG_PPC_P2041
-#define CONFIG_SYS_TEXT_BASE 0xfff80000
+#define CONFIG_SYS_TEXT_BASE 0xfff40000
#define CONFIG_KM_DEF_NETDEV "netdev=eth0\0"
@@ -21,6 +21,9 @@
#define CONFIG_NAND_ECC_BCH
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
/* common KM defines */
#include "keymile-common.h"
@@ -235,7 +238,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MONITOR_LEN (512 * 1024)
+#define CONFIG_SYS_MONITOR_LEN (768 * 1024)
#define CONFIG_SYS_MALLOC_LEN (1024 * 1024)
/* Serial Port - controlled on board with jumper J8
OpenPOWER on IntegriCloud