aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSRICHARAN R2013-04-23 19:41:21 -0500
committerTom Rini2013-05-10 07:25:56 -0500
commit76db5b8f59d0c9c9eb73f1595f8fbc557e7a16eb (patch)
treefdaa212c6930c355c86ee3793dc1989f72210b7c
parent30bba0175122150c330ff95132e048a39bf978eb (diff)
downloadu-boot-76db5b8f59d0c9c9eb73f1595f8fbc557e7a16eb.tar.gz
u-boot-76db5b8f59d0c9c9eb73f1595f8fbc557e7a16eb.tar.xz
u-boot-76db5b8f59d0c9c9eb73f1595f8fbc557e7a16eb.zip
ARM: OMAP: Make omap_boot_parameters common across socs
omap_boot_parameters is same and defined for each soc. So move this to a common place to reuse it across socs. Signed-off-by: Sricharan R <r.sricharan@ti.com>
-rw-r--r--arch/arm/include/asm/arch-am33xx/omap.h25
-rw-r--r--arch/arm/include/asm/arch-omap4/omap.h24
-rw-r--r--arch/arm/include/asm/arch-omap5/omap.h23
-rw-r--r--arch/arm/include/asm/omap_boot.h49
4 files changed, 49 insertions, 72 deletions
diff --git a/arch/arm/include/asm/arch-am33xx/omap.h b/arch/arm/include/asm/arch-am33xx/omap.h
index d28f9a83ff..7e3bb9c994 100644
--- a/arch/arm/include/asm/arch-am33xx/omap.h
+++ b/arch/arm/include/asm/arch-am33xx/omap.h
@@ -35,29 +35,4 @@
35#define NON_SECURE_SRAM_START 0x40300000 35#define NON_SECURE_SRAM_START 0x40300000
36#define NON_SECURE_SRAM_END 0x40320000 36#define NON_SECURE_SRAM_END 0x40320000
37#endif 37#endif
38
39/* ROM code defines */
40/* Boot device */
41#define BOOT_DEVICE_MASK 0xFF
42#define BOOT_DEVICE_OFFSET 0x8
43#define DEV_DESC_PTR_OFFSET 0x4
44#define DEV_DATA_PTR_OFFSET 0x18
45#define BOOT_MODE_OFFSET 0x8
46#define RESET_REASON_OFFSET 0x9
47#define CH_FLAGS_OFFSET 0xA
48
49#define CH_FLAGS_CHSETTINGS (0x1 << 0)
50#define CH_FLAGS_CHRAM (0x1 << 1)
51#define CH_FLAGS_CHFLASH (0x1 << 2)
52#define CH_FLAGS_CHMMCSD (0x1 << 3)
53
54#ifndef __ASSEMBLY__
55struct omap_boot_parameters {
56 char *boot_message;
57 unsigned int mem_boot_descriptor;
58 unsigned char omap_bootdevice;
59 unsigned char reset_reason;
60 unsigned char ch_flags;
61};
62#endif
63#endif 38#endif
diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h
index ad984da0b4..9ad1e821ec 100644
--- a/arch/arm/include/asm/arch-omap4/omap.h
+++ b/arch/arm/include/asm/arch-omap4/omap.h
@@ -155,28 +155,4 @@ struct s32ktimer {
155#define OMAP4_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20) 155#define OMAP4_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20)
156#define OMAP4_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24) 156#define OMAP4_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24)
157 157
158/* ROM code defines */
159/* Boot device */
160#define BOOT_DEVICE_MASK 0xFF
161#define BOOT_DEVICE_OFFSET 0x8
162#define DEV_DESC_PTR_OFFSET 0x4
163#define DEV_DATA_PTR_OFFSET 0x18
164#define BOOT_MODE_OFFSET 0x8
165#define RESET_REASON_OFFSET 0x9
166#define CH_FLAGS_OFFSET 0xA
167
168#define CH_FLAGS_CHSETTINGS (0x1 << 0)
169#define CH_FLAGS_CHRAM (0x1 << 1)
170#define CH_FLAGS_CHFLASH (0x1 << 2)
171#define CH_FLAGS_CHMMCSD (0x1 << 3)
172
173#ifndef __ASSEMBLY__
174struct omap_boot_parameters {
175 char *boot_message;
176 unsigned int mem_boot_descriptor;
177 unsigned char omap_bootdevice;
178 unsigned char reset_reason;
179 unsigned char ch_flags;
180};
181#endif
182#endif 158#endif
diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h
index 887fcaa5ff..3bf5afae1a 100644
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -214,21 +214,6 @@ struct s32ktimer {
214#define OMAP4460_ES1_0 0x44600100 214#define OMAP4460_ES1_0 0x44600100
215#define OMAP4460_ES1_1 0x44600110 215#define OMAP4460_ES1_1 0x44600110
216 216
217/* ROM code defines */
218/* Boot device */
219#define BOOT_DEVICE_MASK 0xFF
220#define BOOT_DEVICE_OFFSET 0x8
221#define DEV_DESC_PTR_OFFSET 0x4
222#define DEV_DATA_PTR_OFFSET 0x18
223#define BOOT_MODE_OFFSET 0x8
224#define RESET_REASON_OFFSET 0x9
225#define CH_FLAGS_OFFSET 0xA
226
227#define CH_FLAGS_CHSETTINGS (0x1 << 0)
228#define CH_FLAGS_CHRAM (0x1 << 1)
229#define CH_FLAGS_CHFLASH (0x1 << 2)
230#define CH_FLAGS_CHMMCSD (0x1 << 3)
231
232/* CONTROL_SRCOMP_XXX_SIDE */ 217/* CONTROL_SRCOMP_XXX_SIDE */
233#define OVERRIDE_XS_SHIFT 30 218#define OVERRIDE_XS_SHIFT 30
234#define OVERRIDE_XS_MASK (1 << 30) 219#define OVERRIDE_XS_MASK (1 << 30)
@@ -249,14 +234,6 @@ struct srcomp_params {
249 s8 multiply_factor; 234 s8 multiply_factor;
250}; 235};
251 236
252struct omap_boot_parameters {
253 char *boot_message;
254 unsigned int mem_boot_descriptor;
255 unsigned char omap_bootdevice;
256 unsigned char reset_reason;
257 unsigned char ch_flags;
258};
259
260struct ctrl_ioregs { 237struct ctrl_ioregs {
261 u32 ctrl_ddrch; 238 u32 ctrl_ddrch;
262 u32 ctrl_lpddr2ch; 239 u32 ctrl_lpddr2ch;
diff --git a/arch/arm/include/asm/omap_boot.h b/arch/arm/include/asm/omap_boot.h
new file mode 100644
index 0000000000..87a95302fa
--- /dev/null
+++ b/arch/arm/include/asm/omap_boot.h
@@ -0,0 +1,49 @@
1/*
2 * (C) Copyright 2013
3 * Texas Instruments, <www.ti.com>
4 *
5 * Sricharan R <r.sricharan@ti.com>
6 *
7 * See file CREDITS for list of people who contributed to this
8 * project.
9 *
10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details.
19 *
20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
23 * MA 02111-1307 USA
24 */
25
26/* ROM code defines */
27/* Boot device */
28#define BOOT_DEVICE_MASK 0xFF
29#define BOOT_DEVICE_OFFSET 0x8
30#define DEV_DESC_PTR_OFFSET 0x4
31#define DEV_DATA_PTR_OFFSET 0x18
32#define BOOT_MODE_OFFSET 0x8
33#define RESET_REASON_OFFSET 0x9
34#define CH_FLAGS_OFFSET 0xA
35
36#define CH_FLAGS_CHSETTINGS (0x1 << 0)
37#define CH_FLAGS_CHRAM (0x1 << 1)
38#define CH_FLAGS_CHFLASH (0x1 << 2)
39#define CH_FLAGS_CHMMCSD (0x1 << 3)
40
41#ifndef __ASSEMBLY__
42struct omap_boot_parameters {
43 char *boot_message;
44 unsigned int mem_boot_descriptor;
45 unsigned char omap_bootdevice;
46 unsigned char reset_reason;
47 unsigned char ch_flags;
48};
49#endif