summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-29 22:03:00 +0200
committerWolfgang Denk <wd@denx.de>2010-10-29 22:03:00 +0200
commit0c0892be0d93a5a892b93739c5eb3bf692fed4ff (patch)
treea046b11024bdf0a41082647c95df23a10cb206fc /include
parentd75c2a3d7f34ff1eb9920ad72483cff7cb6d358f (diff)
parent28e57108a61bd0e554d9847170b8ad9dad093e07 (diff)
downloadu-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.zip
u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.gz
u-boot-imx-0c0892be0d93a5a892b93739c5eb3bf692fed4ff.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-marvell
Conflicts: include/configs/km_arm.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/guruplug.h4
-rw-r--r--include/configs/keymile-common.h16
-rw-r--r--include/configs/km_arm.h6
-rw-r--r--include/configs/mv-common.h17
4 files changed, 39 insertions, 4 deletions
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index 2c2682c..f449da9 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -72,8 +72,8 @@
* it has to be rounded to sector size
*/
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
-#define CONFIG_ENV_ADDR 0x40000
-#define CONFIG_ENV_OFFSET 0x40000 /* env starts here */
+#define CONFIG_ENV_ADDR 0x60000
+#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */
/*
* Default environment variables
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 62d21f6..ccc71c9 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -30,6 +30,22 @@
#define CONFIG_BOOTCOUNT_LIMIT
/*
+ * By default kwbimage.cfg from board specific folder is used
+ * If for some board, different configuration file need to be used,
+ * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
+ */
+#ifndef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg
+#endif /* CONFIG_SYS_KWD_CONFIG */
+
+/*
+ * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed
+ */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE 0x00400000
+#endif /* CONFIG_SYS_TEXT_BASE */
+
+/*
* Command line configuration.
*/
#include <config_cmd_default.h>
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index 986c46e..bf77cc0 100644
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -181,6 +181,8 @@ int get_scl (void);
/* additions for new relocation code, must be added to all boards */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
-#define CONFIG_SYS_INIT_SP_ADDR (0x00000000 + 0x1000 - /* Fix this */ \
- GENERATED_GBL_DATA_SIZE)
+/* Kirkwood has 2k of Security SRAM, use it for SP */
+#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000
+/* Do early setups now in board_init_f() */
+#define CONFIG_BOARD_EARLY_INIT_F
#endif /* _CONFIG_KM_ARM_H */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index bc81f2d..de0121e 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -45,6 +45,22 @@
#define CONFIG_KIRKWOOD_RGMII_PAD_1V8 /* Set RGMII Pad voltage to 1.8V */
#define CONFIG_KIRKWOOD_PCIE_INIT /* Enable PCIE Port0 for kernel */
+/*
+ * By default kwbimage.cfg from board specific folder is used
+ * If for some board, different configuration file need to be used,
+ * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
+ */
+#ifndef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg
+#endif /* CONFIG_SYS_KWD_CONFIG */
+
+/*
+ * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed
+ */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE 0x00600000
+#endif /* CONFIG_SYS_TEXT_BASE */
+
#define CONFIG_I2C_MVTWSI_BASE KW_TWSI_BASE
#define MV_UART0_BASE KW_UART0_BASE
#define MV_SATA_BASE KW_SATA_BASE
@@ -141,6 +157,7 @@
#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
+#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
#define CONFIG_NR_DRAM_BANKS 4
#define CONFIG_STACKSIZE 0x00100000 /* regular stack- 1M */