aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSRICHARAN R2013-04-23 19:41:25 -0500
committerTom Rini2013-05-10 07:25:56 -0500
commit47c6ea076eb51e624f8744d93db5cd70b97dc25d (patch)
treea9be7392d700598960e4da68199d1c726e246ba0
parent4a0eb75752167bef51993307a10677295cef315b (diff)
downloadu-boot-47c6ea076eb51e624f8744d93db5cd70b97dc25d.tar.gz
u-boot-47c6ea076eb51e624f8744d93db5cd70b97dc25d.tar.xz
u-boot-47c6ea076eb51e624f8744d93db5cd70b97dc25d.zip
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.c11
-rw-r--r--include/configs/am335x_evm.h3
-rw-r--r--include/configs/igep0033.h3
-rw-r--r--include/configs/omap4_common.h4
-rw-r--r--include/configs/omap5_common.h3
-rw-r--r--include/configs/pcm051.h3
-rw-r--r--include/configs/ti814x_evm.h3
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 c7107847c4..1645120de7 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)
147 } 147 }
148} 148}
149 149
150#ifdef CONFIG_ARCH_CPU_INIT
151/*
152 * SOC specific cpu init
153 */
154int arch_cpu_init(void)
155{
156 save_omap_boot_params();
157 return 0;
158}
159#endif /* CONFIG_ARCH_CPU_INIT */
160
150/* 161/*
151 * Routine: s_init 162 * Routine: s_init
152 * Description: Does early system init of watchdog, muxing, andclocks 163 * Description: Does early system init of watchdog, muxing, andclocks
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 941054d70a..f019134216 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -294,6 +294,9 @@
294#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ 294#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \
2954800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } 2954800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
296 296
297/* CPU */
298#define CONFIG_ARCH_CPU_INIT
299
297#define CONFIG_ENV_OVERWRITE 1 300#define CONFIG_ENV_OVERWRITE 1
298#define CONFIG_SYS_CONSOLE_INFO_QUIET 301#define CONFIG_SYS_CONSOLE_INFO_QUIET
299 302
diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h
index 14063a83e6..1912d7df37 100644
--- a/include/configs/igep0033.h
+++ b/include/configs/igep0033.h
@@ -157,6 +157,9 @@
157#define CONFIG_CONS_INDEX 1 157#define CONFIG_CONS_INDEX 1
158#define CONFIG_BAUDRATE 115200 158#define CONFIG_BAUDRATE 115200
159 159
160/* CPU */
161#define CONFIG_ARCH_CPU_INIT
162
160#define CONFIG_ENV_OVERWRITE 1 163#define CONFIG_ENV_OVERWRITE 1
161#define CONFIG_SYS_CONSOLE_INFO_QUIET 164#define CONFIG_SYS_CONSOLE_INFO_QUIET
162 165
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 68faecacec..d6448b0529 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -87,6 +87,10 @@
87#define CONFIG_BAUDRATE 115200 87#define CONFIG_BAUDRATE 115200
88#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 88#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
89 115200} 89 115200}
90
91/* CPU */
92#define CONFIG_ARCH_CPU_INIT
93
90/* I2C */ 94/* I2C */
91#define CONFIG_HARD_I2C 1 95#define CONFIG_HARD_I2C 1
92#define CONFIG_SYS_I2C_SPEED 100000 96#define CONFIG_SYS_I2C_SPEED 100000
diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index 7528f4c0b1..deb5e9fd5e 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -86,6 +86,9 @@
86 86
87#define CONFIG_BAUDRATE 115200 87#define CONFIG_BAUDRATE 115200
88 88
89/* CPU */
90#define CONFIG_ARCH_CPU_INIT
91
89/* I2C */ 92/* I2C */
90#define CONFIG_HARD_I2C 93#define CONFIG_HARD_I2C
91#define CONFIG_SYS_I2C_SPEED 100000 94#define CONFIG_SYS_I2C_SPEED 100000
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index cc8d317199..478f805b7c 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -193,6 +193,9 @@
193#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \ 193#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \
1944800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 } 1944800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
195 195
196/* CPU */
197#define CONFIG_ARCH_CPU_INIT
198
196#define CONFIG_ENV_OVERWRITE 199#define CONFIG_ENV_OVERWRITE
197#define CONFIG_SYS_CONSOLE_INFO_QUIET 200#define CONFIG_SYS_CONSOLE_INFO_QUIET
198 201
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 6c423df372..eac5ad0243 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -163,6 +163,9 @@
163 163
164#define CONFIG_BAUDRATE 115200 164#define CONFIG_BAUDRATE 115200
165 165
166/* CPU */
167#define CONFIG_ARCH_CPU_INIT
168
166#define CONFIG_ENV_OVERWRITE 169#define CONFIG_ENV_OVERWRITE
167#define CONFIG_CONS_INDEX 1 170#define CONFIG_CONS_INDEX 1
168#define CONFIG_SYS_CONSOLE_INFO_QUIET 171#define CONFIG_SYS_CONSOLE_INFO_QUIET