diff options
| author | SRICHARAN R <r.sricharan@ti.com> | 2013-04-24 00:41:25 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-10 08:25:56 -0400 |
| commit | 47c6ea076eb51e624f8744d93db5cd70b97dc25d (patch) | |
| tree | a9be7392d700598960e4da68199d1c726e246ba0 | |
| parent | 4a0eb75752167bef51993307a10677295cef315b (diff) | |
| download | u-boot-imx-47c6ea076eb51e624f8744d93db5cd70b97dc25d.zip u-boot-imx-47c6ea076eb51e624f8744d93db5cd70b97dc25d.tar.gz u-boot-imx-47c6ea076eb51e624f8744d93db5cd70b97dc25d.tar.bz2 | |
ARM: OMAP: Add arch_cpu_init function
The boot parameters passed from SPL to UBOOT
must be saved as a part of uboot's gd data
as early as possible, before we will inadvertently
overwrite it. So adding a arch_cpu_init for the required
Socs to save it.
Signed-off-by: Sricharan R <r.sricharan@ti.com>
[trini: Add igep0033 hunk]
Signed-off-by: Tom Rini <trini@ti.com>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/hwinit-common.c | 11 | ||||
| -rw-r--r-- | include/configs/am335x_evm.h | 3 | ||||
| -rw-r--r-- | include/configs/igep0033.h | 3 | ||||
| -rw-r--r-- | include/configs/omap4_common.h | 4 | ||||
| -rw-r--r-- | include/configs/omap5_common.h | 3 | ||||
| -rw-r--r-- | include/configs/pcm051.h | 3 | ||||
| -rw-r--r-- | include/configs/ti814x_evm.h | 3 |
7 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index c710784..1645120 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -147,6 +147,17 @@ static void save_omap_boot_params(void) } } +#ifdef CONFIG_ARCH_CPU_INIT +/* + * SOC specific cpu init + */ +int arch_cpu_init(void) +{ + save_omap_boot_params(); + return 0; +} +#endif /* CONFIG_ARCH_CPU_INIT */ + /* * Routine: s_init * Description: Does early system init of watchdog, muxing, andclocks diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 941054d..f019134 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -294,6 +294,9 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_SYS_CONSOLE_INFO_QUIET diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h index 14063a8..1912d7d 100644 --- a/include/configs/igep0033.h +++ b/include/configs/igep0033.h @@ -157,6 +157,9 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + #define CONFIG_ENV_OVERWRITE 1 #define CONFIG_SYS_CONSOLE_INFO_QUIET diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h index 68faeca..d6448b0 100644 --- a/include/configs/omap4_common.h +++ b/include/configs/omap4_common.h @@ -87,6 +87,10 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} + +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + /* I2C */ #define CONFIG_HARD_I2C 1 #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index 7528f4c..deb5e9f 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -86,6 +86,9 @@ #define CONFIG_BAUDRATE 115200 +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + /* I2C */ #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index cc8d317..478f805 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -193,6 +193,9 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ 4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CONSOLE_INFO_QUIET diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 6c423df..eac5ad0 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -163,6 +163,9 @@ #define CONFIG_BAUDRATE 115200 +/* CPU */ +#define CONFIG_ARCH_CPU_INIT + #define CONFIG_ENV_OVERWRITE #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_CONSOLE_INFO_QUIET |