ARM: OMAP: Cleanup save_boot_params function
Subsystems (2)
cover ARM: OMAP: Cleanup save_boot_params function
The save_boot_params function does not store the data in a always writable area. So the code is broken for a 'XIP' boot. This series corrects this by storing it in 'gd' and also adds a 'C' equivalent function for the same. The essential cleanups for the same are added in this.
Tested this on omap5 uevm board with SD boot.
omap4/5 boards does not have a XIP flash.
So yet to test XIP with this series.
Also verfied a MAKEALL for armv7.
Sricharan R (5):
ARM: OMAP: Make omap_boot_parameters common across socs
ARM: OMAP4/5: Make OMAPx_SRAM_SCRATCH_ defines common
ARM: OMAP: Correct save_boot_params and replace with 'C' function
ARM: OMAP: Cleanup boot parameters usage
ARM: OMAP: Add arch_cpu_init function
arch/arm/cpu/armv7/lowlevel_init.S | 8 +++- arch/arm/cpu/armv7/omap-common/boot-common.c | 20 ++------ arch/arm/cpu/armv7/omap-common/hwinit-common.c | 61 +++++++++++++++++++++--- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 46 +----------------- arch/arm/cpu/armv7/omap4/emif.c | 6 +-- arch/arm/cpu/armv7/omap4/hw_data.c | 2 +- arch/arm/cpu/armv7/omap4/hwinit.c | 3 +- arch/arm/cpu/armv7/omap5/emif.c | 6 +-- arch/arm/cpu/armv7/omap5/hw_data.c | 2 +- arch/arm/cpu/armv7/omap5/hwinit.c | 3 +- arch/arm/include/asm/arch-am33xx/omap.h | 25 ---------- arch/arm/include/asm/arch-omap4/omap.h | 37 -------------- arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++--- arch/arm/include/asm/arch-omap5/omap.h | 37 -------------- arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++--- arch/arm/include/asm/global_data.h | 8 ++++ arch/arm/include/asm/omap_boot.h | 50 +++++++++++++++++++ arch/arm/include/asm/omap_common.h | 19 ++++++++ common/spl/spl.c | 12 +++-- include/configs/am335x_evm.h | 1 + include/configs/omap4_common.h | 4 ++ include/configs/omap5_common.h | 4 ++ include/configs/pcm051.h | 1 + include/configs/ti814x_evm.h | 1 + include/spl.h | 1 - 25 files changed, 181 insertions(+), 199 deletions(-) create mode 100644 arch/arm/include/asm/omap_boot.h
Signature · 1 line
1.7.9.5
PATCH 1/5 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.
--- arch/arm/include/asm/arch-am33xx/omap.h | 25 ---------------- arch/arm/include/asm/arch-omap4/omap.h | 24 --------------- arch/arm/include/asm/arch-omap5/omap.h | 23 --------------- arch/arm/include/asm/omap_boot.h | 49 +++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 72 deletions(-) create mode 100644 arch/arm/include/asm/omap_boot.h
arch/arm/include/asm/arch-am33xx/omap.h +0 -25
@@ -35,29 +35,4 @@#define NON_SECURE_SRAM_START 0x40300000#define NON_SECURE_SRAM_END 0x40320000#endif - -/* ROM code defines */ -/* Boot device */ -#define BOOT_DEVICE_MASK 0xFF -#define BOOT_DEVICE_OFFSET 0x8 -#define DEV_DESC_PTR_OFFSET 0x4 -#define DEV_DATA_PTR_OFFSET 0x18 -#define BOOT_MODE_OFFSET 0x8 -#define RESET_REASON_OFFSET 0x9 -#define CH_FLAGS_OFFSET 0xA - -#define CH_FLAGS_CHSETTINGS (0x1 << 0) -#define CH_FLAGS_CHRAM (0x1 << 1) -#define CH_FLAGS_CHFLASH (0x1 << 2) -#define CH_FLAGS_CHMMCSD (0x1 << 3) - -#ifndef __ASSEMBLY__ -struct omap_boot_parameters { -char *boot_message; -unsigned int mem_boot_descriptor; -unsigned char omap_bootdevice; -unsigned char reset_reason; -unsigned char ch_flags; -}; -#endif #endif
arch/arm/include/asm/arch-omap4/omap.h +0 -24
@@ -156,28 +156,4 @@ struct s32ktimer {#define OMAP4_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20)#define OMAP4_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24) -/* ROM code defines */ -/* Boot device */ -#define BOOT_DEVICE_MASK 0xFF -#define BOOT_DEVICE_OFFSET 0x8 -#define DEV_DESC_PTR_OFFSET 0x4 -#define DEV_DATA_PTR_OFFSET 0x18 -#define BOOT_MODE_OFFSET 0x8 -#define RESET_REASON_OFFSET 0x9 -#define CH_FLAGS_OFFSET 0xA - -#define CH_FLAGS_CHSETTINGS (0x1 << 0) -#define CH_FLAGS_CHRAM (0x1 << 1) -#define CH_FLAGS_CHFLASH (0x1 << 2) -#define CH_FLAGS_CHMMCSD (0x1 << 3) - -#ifndef __ASSEMBLY__ -struct omap_boot_parameters { -char *boot_message; -unsigned int mem_boot_descriptor; -unsigned char omap_bootdevice; -unsigned char reset_reason; -unsigned char ch_flags; -}; -#endif #endif
arch/arm/include/asm/arch-omap5/omap.h +0 -23
@@ -215,21 +215,6 @@ struct s32ktimer {#define OMAP4460_ES1_0 0x44600100#define OMAP4460_ES1_1 0x44600110 -/* ROM code defines */ -/* Boot device */ -#define BOOT_DEVICE_MASK 0xFF -#define BOOT_DEVICE_OFFSET 0x8 -#define DEV_DESC_PTR_OFFSET 0x4 -#define DEV_DATA_PTR_OFFSET 0x18 -#define BOOT_MODE_OFFSET 0x8 -#define RESET_REASON_OFFSET 0x9 -#define CH_FLAGS_OFFSET 0xA - -#define CH_FLAGS_CHSETTINGS (0x1 << 0) -#define CH_FLAGS_CHRAM (0x1 << 1) -#define CH_FLAGS_CHFLASH (0x1 << 2) -#define CH_FLAGS_CHMMCSD (0x1 << 3) -/* CONTROL_SRCOMP_XXX_SIDE */ #define OVERRIDE_XS_SHIFT 30#define OVERRIDE_XS_MASK (1 << 30)
@@ -250,14 +235,6 @@ struct srcomp_params {s8 multiply_factor; }; -struct omap_boot_parameters { -char *boot_message; -unsigned int mem_boot_descriptor; -unsigned char omap_bootdevice; -unsigned char reset_reason; -unsigned char ch_flags; -}; -struct ctrl_ioregs {u32 ctrl_ddrch;u32 ctrl_lpddr2ch;
arch/arm/include/asm/omap_boot.h new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/5 ARM: OMAP4/5: Make OMAPx_SRAM_SCRATCH_ defines common
In reply to Sricharan RThese defines are same across OMAP4/5. So move them to omap_common.h. This is required for the patches that follow.
--- arch/arm/cpu/armv7/omap4/emif.c | 6 +++--- arch/arm/cpu/armv7/omap4/hw_data.c | 2 +- arch/arm/cpu/armv7/omap4/hwinit.c | 3 ++- arch/arm/cpu/armv7/omap5/emif.c | 6 +++--- arch/arm/cpu/armv7/omap5/hw_data.c | 2 +- arch/arm/cpu/armv7/omap5/hwinit.c | 3 ++- arch/arm/include/asm/arch-omap4/omap.h | 13 ------------- arch/arm/include/asm/arch-omap5/omap.h | 14 -------------- arch/arm/include/asm/omap_common.h | 14 ++++++++++++++ 9 files changed, 26 insertions(+), 37 deletions(-)
arch/arm/cpu/armv7/omap4/emif.c +3 -3
@@ -31,9 +31,9 @@#include <asm/utils.h> #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS -u32 *const T_num = (u32 *)OMAP4_SRAM_SCRATCH_EMIF_T_NUM ; -u32 *const T_den = (u32 *)OMAP4_SRAM_SCRATCH_EMIF_T_DEN ; -u32 *const emif_sizes = (u32 *)OMAP4_SRAM_SCRATCH_EMIF_SIZE ; +u32 *const T_num = (u32 *)OMAP_SRAM_SCRATCH_EMIF_T_NUM ; +u32 *const T_den = (u32 *)OMAP_SRAM_SCRATCH_EMIF_T_DEN ; +u32 *const emif_sizes = (u32 *)OMAP_SRAM_SCRATCH_EMIF_SIZE ;#endif #ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
arch/arm/cpu/armv7/omap4/hw_data.c +1 -1
@@ -40,7 +40,7 @@ struct dplls const **dplls_data =struct vcores_data const **omap_vcores = (struct vcores_data const **)OMAP_SRAM_SCRATCH_VCORES_PTR ;struct omap_sys_ctrl_regs const **ctrl = - (struct omap_sys_ctrl_regs const **)OMAP4_SRAM_SCRATCH_SYS_CTRL ; + (struct omap_sys_ctrl_regs const **)OMAP_SRAM_SCRATCH_SYS_CTRL ;/* * The M & N values in the following tables are created using the
arch/arm/cpu/armv7/omap4/hwinit.c +2 -1
@@ -34,10 +34,11 @@#include <asm/sizes.h> #include <asm/emif.h> #include <asm/arch/gpio.h> +#include <asm/omap_common.h> DECLARE_GLOBAL_DATA_PTR ; -u32 *const omap_si_rev = (u32 *)OMAP4_SRAM_SCRATCH_OMAP4_REV ; +u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV ;static const struct gpio_bank gpio_bank_44xx[6 ] = { { (void *)OMAP44XX_GPIO1_BASE ,METHOD_GPIO_24XX },
arch/arm/cpu/armv7/omap5/emif.c +3 -3
@@ -32,9 +32,9 @@#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS #define print_timing_reg (reg) debug(#reg" - 0x%08x\n", (reg)) -static u32 *const T_num = (u32 *)OMAP5_SRAM_SCRATCH_EMIF_T_NUM ; -static u32 *const T_den = (u32 *)OMAP5_SRAM_SCRATCH_EMIF_T_DEN ; -static u32 *const emif_sizes = (u32 *)OMAP5_SRAM_SCRATCH_EMIF_SIZE ; +static u32 *const T_num = (u32 *)OMAP_SRAM_SCRATCH_EMIF_T_NUM ; +static u32 *const T_den = (u32 *)OMAP_SRAM_SCRATCH_EMIF_T_DEN ; +static u32 *const emif_sizes = (u32 *)OMAP_SRAM_SCRATCH_EMIF_SIZE ;#endif #ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
arch/arm/cpu/armv7/omap5/hw_data.c +1 -1
@@ -41,7 +41,7 @@ struct dplls const **dplls_data =struct vcores_data const **omap_vcores = (struct vcores_data const **)OMAP_SRAM_SCRATCH_VCORES_PTR ;struct omap_sys_ctrl_regs const **ctrl = - (struct omap_sys_ctrl_regs const **)OMAP5_SRAM_SCRATCH_SYS_CTRL ; + (struct omap_sys_ctrl_regs const **)OMAP_SRAM_SCRATCH_SYS_CTRL ;/* OPP HIGH FREQUENCY for ES2.0 */ static const struct dpll_params mpu_dpll_params_1_5ghz[NUM_SYS_CLKS ] = {
arch/arm/cpu/armv7/omap5/hwinit.c +2 -1
@@ -37,10 +37,11 @@#include <asm/utils.h> #include <asm/arch/gpio.h> #include <asm/emif.h> +#include <asm/omap_common.h> DECLARE_GLOBAL_DATA_PTR ; -u32 *const omap_si_rev = (u32 *)OMAP5_SRAM_SCRATCH_OMAP5_REV ; +u32 *const omap_si_rev = (u32 *)OMAP_SRAM_SCRATCH_OMAP_REV ;static struct gpio_bank gpio_bank_54xx[6 ] = { { (void *)OMAP54XX_GPIO1_BASE ,METHOD_GPIO_24XX },
arch/arm/include/asm/arch-omap4/omap.h +0 -13
@@ -143,17 +143,4 @@ struct s32ktimer {#define NON_SECURE_SRAM_END 0x4030E000/* Not inclusive */ /* base address for indirect vectors (internal boot mode) */ #define SRAM_ROM_VECT_BASE 0x4030D000 -/* Temporary SRAM stack used while low level init is done */ -#define SRAM_SCRATCH_SPACE_ADDR NON_SECURE_SRAM_START -/* SRAM scratch space entries */ -#define OMAP4_SRAM_SCRATCH_OMAP4_REV SRAM_SCRATCH_SPACE_ADDR -#define OMAP4_SRAM_SCRATCH_EMIF_SIZE (SRAM_SCRATCH_SPACE_ADDR + 0x4) -#define OMAP4_SRAM_SCRATCH_EMIF_T_NUM (SRAM_SCRATCH_SPACE_ADDR + 0xC) -#define OMAP4_SRAM_SCRATCH_EMIF_T_DEN (SRAM_SCRATCH_SPACE_ADDR + 0x10) -#define OMAP_SRAM_SCRATCH_PRCM_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x14) -#define OMAP_SRAM_SCRATCH_DPLLS_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x18) -#define OMAP_SRAM_SCRATCH_VCORES_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x1C) -#define OMAP4_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20) -#define OMAP4_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24) -#endif
arch/arm/include/asm/arch-omap5/omap.h +0 -14
@@ -191,20 +191,6 @@ struct s32ktimer {/* base address for indirect vectors (internal boot mode) */ #define SRAM_ROM_VECT_BASE 0x4031F000 -#define SRAM_SCRATCH_SPACE_ADDR NON_SECURE_SRAM_START -/* -* SRAM scratch space entries -*/ -#define OMAP5_SRAM_SCRATCH_OMAP5_REV SRAM_SCRATCH_SPACE_ADDR -#define OMAP5_SRAM_SCRATCH_EMIF_SIZE (SRAM_SCRATCH_SPACE_ADDR + 0x4) -#define OMAP5_SRAM_SCRATCH_EMIF_T_NUM (SRAM_SCRATCH_SPACE_ADDR + 0xC) -#define OMAP5_SRAM_SCRATCH_EMIF_T_DEN (SRAM_SCRATCH_SPACE_ADDR + 0x10) -#define OMAP_SRAM_SCRATCH_PRCM_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x14) -#define OMAP_SRAM_SCRATCH_DPLLS_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x18) -#define OMAP_SRAM_SCRATCH_VCORES_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x1C) -#define OMAP5_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20) -#define OMAP5_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24) -/* Silicon revisions */ #define OMAP4430_SILICON_ID_INVALID 0xFFFFFFFF#define OMAP4430_ES1_0 0x44300100
arch/arm/include/asm/omap_common.h +14 -0
@@ -583,4 +583,18 @@ static inline u32 omap_revision(void)/* DRA7XX */ #define DRA752_ES1_0 0x07520100 + +/* +* SRAM scratch space entries +*/ +#define SRAM_SCRATCH_SPACE_ADDR NON_SECURE_SRAM_START +#define OMAP_SRAM_SCRATCH_OMAP_REV SRAM_SCRATCH_SPACE_ADDR +#define OMAP_SRAM_SCRATCH_EMIF_SIZE (SRAM_SCRATCH_SPACE_ADDR + 0x4) +#define OMAP_SRAM_SCRATCH_EMIF_T_NUM (SRAM_SCRATCH_SPACE_ADDR + 0xC) +#define OMAP_SRAM_SCRATCH_EMIF_T_DEN (SRAM_SCRATCH_SPACE_ADDR + 0x10) +#define OMAP_SRAM_SCRATCH_PRCM_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x14) +#define OMAP_SRAM_SCRATCH_DPLLS_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x18) +#define OMAP_SRAM_SCRATCH_VCORES_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x1C) +#define OMAP_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20) +#define OMAP_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24)#endif /* _OMAP_COMMON_H_ */
Signature · 1 line
1.7.9.5
PATCH 3/5 ARM: OMAP: Correct save_boot_params and replace with 'C' function
In reply to Sricharan RCurrently save_boot_params saves the boot parameters passed from romcode. But this is not stored in a writable location consistently. So the current code would not work for a 'XIP' boot. Change this by saving the boot parameters in 'gd' which is always writable. Also add a 'C' function instead of an assembly code that is more readable.
---
There is a checkpatch warning because of multiple assignments. The code looks readable this way.
arch/arm/cpu/armv7/omap-common/hwinit-common.c | 50 +++++++++++++++++++++--- arch/arm/include/asm/global_data.h | 8 ++++ arch/arm/include/asm/omap_boot.h | 1 + arch/arm/include/asm/omap_common.h | 4 +- 4 files changed, 56 insertions(+), 7 deletions(-)
arch/arm/cpu/armv7/omap-common/hwinit-common.c +44 -6
@@ -101,11 +101,6 @@ void omap_rev_string(void) }#ifdef CONFIG_SPL_BUILD -static void init_boot_params (void ) -{ - boot_params_ptr = (u32 *) &boot_params; -} -void spl_display_print (void ) {omap_rev_string ();
@@ -116,6 +111,42 @@ void __weak srcomp_enable(void) { } +static void save_omap_boot_params (void ) +{ +u32 rom_params = *((u32 *)OMAP_SRAM_SCRATCH_BOOT_PARAMS ); +u8 boot_device; +u32 dev_desc, dev_data; + +if ((rom_params <NON_SECURE_SRAM_START ) || + (rom_params >NON_SECURE_SRAM_END )) +return ; + +/* +* rom_params can be type casted to omap_boot_parameters and +* used. But it not correct to assume that romcode structure +* encoding would be same as u-boot. So use the defined offsets. +*/ + gd->arch.omap_boot_params.omap_bootdevice = boot_device = + *((u8 *)(rom_params +BOOT_DEVICE_OFFSET )); + + gd->arch.omap_boot_params.ch_flags = + *((u8 *)(rom_params +CH_FLAGS_OFFSET )); + +if ((boot_device >=BOOT_DEVICE_XIP ) && + (boot_device <=BOOT_DEVICE_MMC2 )) { +if (!(omap_hw_init_context () == +OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL )) { + dev_desc = *((u32 *)(rom_params +DEV_DESC_PTR_OFFSET )); + dev_data = *((u32 *)(dev_desc +DEV_DATA_PTR_OFFSET )); + gd->arch.omap_boot_params.omap_bootmode = + *((u32 *)(dev_data +BOOT_MODE_OFFSET )); + }else { + gd->arch.omap_boot_params.omap_bootmode = + *((u8 *)(rom_params +BOOT_MODE_OFFSET )); + } + } +} +/* * Routine: s_init * Description: Does early system init of watchdog, muxing, andclocks
@@ -132,6 +163,14 @@ void __weak srcomp_enable(void)*/ void s_init (void ) { +/* +* Save the boot parameters passed from romcode. +* We cannot delay the saving further than this, +* to prevent overwrites. +*/ +#ifdef CONFIG_SPL_BUILD +save_omap_boot_params (); +#endif init_omap_revision ();hw_data_init ();
@@ -156,7 +195,6 @@ void s_init(void)/* For regular u-boot sdram_init() is called from dram_init() */ sdram_init (); -init_boot_params ();#endif }
arch/arm/include/asm/global_data.h +8 -0
@@ -24,6 +24,10 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#ifdef CONFIG_OMAP +#include <asm/omap_boot.h> +#endif + /* Architecture-specific global data */ struct arch_global_data { #if defined(CONFIG_FSL_ESDHC)
@@ -51,6 +55,10 @@ struct arch_global_data {unsigned long tlb_addr;unsigned long tlb_size;#endif + +#ifdef CONFIG_OMAP +struct omap_boot_parameters omap_boot_params; +#endif };#include <asm-generic/global_data.h>
arch/arm/include/asm/omap_boot.h +1 -0
@@ -45,5 +45,6 @@ struct omap_boot_parameters {unsigned char omap_bootdevice;unsigned char reset_reason;unsigned char ch_flags; + unsigned long omap_bootmode; };#endif
arch/arm/include/asm/omap_common.h +3 -1
@@ -596,5 +596,7 @@ static inline u32 omap_revision(void)#define OMAP_SRAM_SCRATCH_DPLLS_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x18)#define OMAP_SRAM_SCRATCH_VCORES_PTR (SRAM_SCRATCH_SPACE_ADDR + 0x1C)#define OMAP_SRAM_SCRATCH_SYS_CTRL (SRAM_SCRATCH_SPACE_ADDR + 0x20) -#define OMAP_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x24) +#define OMAP_SRAM_SCRATCH_BOOT_PARAMS (SRAM_SCRATCH_SPACE_ADDR + 0x24) +#define OMAP5_SRAM_SCRATCH_SPACE_END (SRAM_SCRATCH_SPACE_ADDR + 0x28) +#endif /* _OMAP_COMMON_H_ */
Signature · 1 line
1.7.9.5
PATCH 3/5 ARM: OMAP: Correct save_boot_params and replace with 'C' function
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 11 lines · Sricharan R
Currently
save_boot_paramssaves the boot parameters passed from romcode. But this is not stored in a writable location consistently. So the current code would not work for a 'XIP' boot. Change this by saving the boot parameters in 'gd' which is always writable. Also add a 'C' function instead of an assembly code that is more readable.Signed-off-by Sricharan R <[email protected]> --- There is acheckpatch warning because of multiple assignments. The code looks readable this way.
What/where?
[snip]
Quoted 2 lines
(quoted diff) +1
-0+ if ((boot_device >= BOOT_DEVICE_XIP) && + (boot_device <=
BOOT_DEVICE_MMC2)) {
This will need to be rebased to use MMC_BOOT_DEVICES_START/END and I know you didn't test from eMMC on omap5_uevm then.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRbByPAAoJENk4IS6UOR1W9tgQAIO3+Ejnxgy+oqo10SieOsw0 n4dgRvYwppNgpaR4RND5ldjHnYAdr7g3TPOZ8X0tPuw/VwgvpaSkMfAtxzKF3S8m QjVlPj2+XCTHI9fbg3Wz3kiHRTBYjlBnQ4o3fbnL+h7Sunci8a0HGrLzmfPfz6eA SR/jLFNtBCQNfh3p7ZikH4pnTCcf/kTfHWkGjIImt5/2Viv8XoQnbwFyTeJS9upZ s3BPlST+Az7p/D6qFTGR70fmq55H/cIF8iW6KxmD8I8Ezwa2S+hj6FIJ+NmRtEw8 6SOzGw61hGV4y60NelfbRA4KR8GqiFpbb6NtX+bBhX6Vu8DGJpsU/PE1jngA9xSt RCWqUVxP3LOGCxgI3brZe26kCgHkI8hGx/tDK2e9LF9MspkujL7TVxOTWMEARdZ/ XdJVGljTjovfbIVdWwt0NMASs9aY9gm3lbFtWfST9uZ8esEI1xRc9i19s1aGUf3k ND87nLgsf6xW1hbJbC+f5+UdUkBizu3+MSCAivNcsc8Haqubm/Ue1s+e7Bh3rkzA 3fo4HfYGqJnAcZiD6EtXhtObOSCEIl3tHOpHkl2kf29G5H8SbPTosXuEZvNESjzx PSNqyn9jSJHUPQLmPxRhi9ltfm4forZgYyBqQjHMUOBhhMZGdlrqaCSwTdxmwN2L z62KZtWwP9g5Ac64fWJ+
=8BS/
-----END PGP SIGNATURE-----
PATCH 3/5 ARM: OMAP: Correct save_boot_params and replace with 'C' function
Quoted 11 lines · Tom Rini
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 7 lines · Sricharan R
Currently
save_boot_paramssaves the boot parameters passed from romcode. But this is not stored in a writable location consistently. So the current code would not work for a 'XIP' boot. Change this by saving the boot parameters in 'gd' which is always writable. Also add a 'C' function instead of an assembly code that is more readable.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Sricharan R <[email protected]> --- There is acheckpatch warning because of multiple assignments. The code looks readable this way.
What/where?
In the below line pf the patch. gd->arch.omap_boot_params.omap_bootdevice = boot_device =
Quoted 7 lines
[snip]
Quoted 2 lines
(quoted diff) +1
-0+ if ((boot_device >= BOOT_DEVICE_XIP) && + (boot_device <=
BOOT_DEVICE_MMC2)) {This will need to be rebased to use MMC_BOOT_DEVICES_START/END and I know you didn't test from eMMC on
omap5_uevmthen.
Yes, i was aware of this. Infact i saw before this series that emmc was broken and your patch was fixing that. When i started this series, your patch was not merged then. I can rebase on V2.
Regards,
Sricharan
PATCH 3/5 ARM: OMAP: Correct save_boot_params and replace with 'C' function
In reply to Sricharan RHi Sricharan,
I very much like how you've structured this. A vast improvement!
I haven't yet tried to apply the whole series but have one quick comment. In the new function:
static void save_omap_boot_params(void)
{
...
if (!(omap_hw_init_context() ==
OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL)) {
...
} else {
...}
wouldn't it be clearer to drop the boolean negation "!" and exchange the if/else bodies?
Best regards,
-Michael Cashwell
PATCH 3/5 ARM: OMAP: Correct save_boot_params and replace with 'C' function
Quoted 10 lines · Michael Cashwell
Hi Sricharan,
I very much like how you've structured this. A vast improvement!
I haven't yet tried to apply the whole series but have one quick comment. In the new function:
static void
save_omap_boot_params(void)
{
...
if (!(omap_hw_init_context() ==
Quoted 8 lines
OMAP_INIT_CONTEXT_UBOOT_AFTER_SPL)) { ... } else { ...}
wouldn't it be clearer to drop the boolean negation "!" and exchange the if/else bodies?
hmm, will do and add a comment as well.
Regards,
Sricharan
PATCH 4/5 ARM: OMAP: Cleanup boot parameters usage
In reply to Sricharan RThe boot parameters are read from individual variables assigned for each of them. This been corrected and now they are stored as a part of the global data 'gd' structure. So read them from 'gd' instead.
--- arch/arm/cpu/armv7/lowlevel_init.S | 8 ++++- arch/arm/cpu/armv7/omap-common/boot-common.c | 20 ++--------- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 46 ++---------------------- arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++---- arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++----- arch/arm/include/asm/omap_common.h | 3 ++ common/spl/spl.c | 12 ++++--- include/configs/am335x_evm.h | 1 + include/configs/pcm051.h | 1 + include/configs/ti814x_evm.h | 1 + include/spl.h | 1 - 11 files changed, 32 insertions(+), 84 deletions(-)
arch/arm/cpu/armv7/lowlevel_init.S +7 -1
@@ -37,7 +37,13 @@ ENTRY(lowlevel_init) */ ldr sp, =CONFIG_SYS_INIT_SP_ADDR bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ - +#ifdef CONFIG_SPL_BUILD + ldr r8, =gdata +#else + sub sp, #GD_SIZE + bic sp, sp, #7 + mov r8, sp +#endif /* * Save the old lr(passed in ip) and the current lr to stack */
arch/arm/cpu/armv7/omap-common/boot-common.c +3 -17
@@ -23,31 +23,17 @@#include <asm/arch/mmc_host_def.h> #include <asm/arch/sys_proto.h> -/* -* This is used to verify if the configuration header -* was executed by rom code prior to control of transfer -* to the bootloader. SPL is responsible for saving and -* passing the boot_params pointer to the u-boot. -*/ -struct omap_boot_parameters boot_params __attribute__ ((section(".data"))); +DECLARE_GLOBAL_DATA_PTR ;#ifdef CONFIG_SPL_BUILD -/* -* We use static variables because global data is not ready yet. -* Initialized data is available in SPL right from the beginning. -* We would not typically need to save these parameters in regular -* U-Boot. This is needed only in SPL at the moment. -*/ -u32 omap_bootmode =MMCSD_MODE_FAT ; -u32 spl_boot_device (void ) { -return (u32) (boot_params.omap_bootdevice); +return (u32) (gd->arch.omap_boot_params.omap_bootdevice); }u32 spl_boot_mode (void ) { -return omap_bootmode; +return gd->arch.omap_boot_params.omap_bootmode; }void spl_board_init (void )
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +2 -44
57 lines not on this page · raw message
arch/arm/include/asm/arch-omap4/sys_proto.h +3 -8
@@ -27,6 +27,8 @@#include <asm/omap_common.h> #include <asm/arch/mux_omap4.h> +DECLARE_GLOBAL_DATA_PTR ; +struct omap_sysinfo {char *board_string; };
@@ -58,13 +60,6 @@ void omap_vc_init(u16 speed_khz);int omap_vc_bypass_send_value (u8 sa,u8 reg_addr,u8 reg_data);u32 warm_reset (void );void force_emif_self_refresh (void ); -/* -* This is used to verify if the configuration header -* was executed by Romcode prior to control of transfer -* to the bootloader. SPL is responsible for saving and -* passing this to the u-boot. -*/ -extern struct omap_boot_parameters boot_params;static inline u32 running_from_sdram (void ) {
@@ -84,7 +79,7 @@ static inline u8 uboot_loaded_by_spl(void)* variable by both SPL and u-boot.Check out for CHSETTINGS, which is a * mandatory section if CH is present. */ -if ((boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS )) +if ((gd->arch.omap_boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS ))return 0 ;else return running_from_sdram ();
arch/arm/include/asm/arch-omap5/sys_proto.h +3 -9
@@ -27,6 +27,8 @@#include <asm/omap_common.h> #include <asm/arch/clocks.h> +DECLARE_GLOBAL_DATA_PTR ; +struct pad_conf_entry {u32 offset;u32 val;
@@ -65,14 +67,6 @@ void force_emif_self_refresh(void);void get_ioregs (const struct ctrl_ioregs **regs);void srcomp_enable (void ); -/* -* This is used to verify if the configuration header -* was executed by Romcode prior to control of transfer -* to the bootloader. SPL is responsible for saving and -* passing this to the u-boot. -*/ -extern struct omap_boot_parameters boot_params; -static inline u32 running_from_sdram (void ) {u32 pc;
@@ -91,7 +85,7 @@ static inline u8 uboot_loaded_by_spl(void)* variable by both SPL and u-boot.Check out for CHSETTINGS, which is a * mandatory section if CH is present. */ -if ((boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS )) +if ((gd->arch.omap_boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS ))return 0 ;else return running_from_sdram ();
arch/arm/include/asm/omap_common.h +3 -0
@@ -25,6 +25,8 @@#ifndef _OMAP_COMMON_H_#define _OMAP_COMMON_H_ +#ifndef __ASSEMBLY__ +#include <common.h> #define NUM_SYS_CLKS 8
@@ -557,6 +559,7 @@ static inline u32 omap_revision(void)extern u32 *const omap_si_rev; return *omap_si_rev; } +#endif /* * silicon revisions.
common/spl/spl.c +8 -4
@@ -125,17 +125,21 @@ void spl_parse_image_header(const struct image_header *header)__weak void __noreturn jump_to_image_no_args (struct spl_image_info *spl_image) { +#ifdef CONFIG_OMAP typedef void __noreturn (*image_entry_noargs_t )(u32 *); +#else +typedef void __noreturn (*image_entry_noargs_t )(void ); +#endif image_entry_noargs_t image_entry = (image_entry_noargs_t ) spl_image->entry_point;debug ("image entry point: 0x%X\n" , spl_image->entry_point);/* Pass the saved boot_params from rom code */ -#if defined(CONFIG_VIRTIO ) || defined(CONFIG_ZEBU ) - image_entry = (image_entry_noargs_t )0x80100000 ; +#ifdef CONFIG_OMAP +image_entry ((u32 *)&gd->arch.omap_boot_params); +#else +image_entry ();#endif -u32 boot_params_ptr_addr = (u32)&boot_params_ptr; -image_entry ((u32 *)boot_params_ptr_addr); }#ifdef CONFIG_SPL_RAM_DEVICE
include/configs/am335x_evm.h +1 -0
@@ -17,6 +17,7 @@#define __CONFIG_AM335X_EVM_H#define CONFIG_AM33XX +#define CONFIG_OMAP #include <asm/arch/omap.h>
include/configs/pcm051.h +1 -0
@@ -20,6 +20,7 @@#define __CONFIG_PCM051_H#define CONFIG_AM33XX +#define CONFIG_OMAP #include <asm/arch/omap.h>
include/configs/ti814x_evm.h +1 -0
@@ -19,6 +19,7 @@#define CONFIG_TI81XX #define CONFIG_TI814X #define CONFIG_SYS_NO_FLASH +#define CONFIG_OMAP #include <asm/arch/omap.h>
include/spl.h +0 -1
@@ -44,7 +44,6 @@ struct spl_image_info {#define SPL_COPY_PAYLOAD_ONLY 1extern struct spl_image_info spl_image; -extern u32 *boot_params_ptr;/* SPL common functions */ void preloader_console_init (void );
Signature · 1 line
1.7.9.5
PATCH 4/5 ARM: OMAP: Cleanup boot parameters usage
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 18 lines · Sricharan R
The boot parameters are read from individual variables assigned for each of them. This been corrected and now they are stored as a part of the global data 'gd' structure. So read them from 'gd' instead.
Signed-off-by Sricharan R <[email protected]> ---arch/arm/cpu/armv7/lowlevel_init.S | 8 ++++- arch/arm/cpu/armv7/omap-common/boot-common.c | 20 ++--------- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 46 ++---------------------- arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++---- arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++----- arch/arm/include/asm/omap_common.h | 3 ++ common/spl/spl.c | 12 ++++--- include/configs/am335x_evm.h | 1 + include/configs/pcm051.h | 1 + include/configs/ti814x_evm.h | 1 + include/spl.h | 1 - 11 files
Quoted 1 line
changed, 32 insertions(+), 84 deletions(-)
I can live with adding CONFIG_OMAP to the am335/ti81* parts.
[snip]
Quoted 11 lines
common/spl/spl.c index renamed from common/spl/spl.c +0
-06715e0d..4a7ce42 100644 ---
a/common/spl/spl.c+++b/common/spl/spl.c@@ -125,17 +125,21 @@ voidspl_parse_image_header(const struct image_header *header)
__weakvoid__noreturnjump_to_image_no_args(struct spl_image_info *spl_image){ +#ifdefCONFIG_OMAPtypedef void__noreturn
(*image_entry_noargs_t)(u32 *); +#else + typedef void__noreturn
(*image_entry_noargs_t)(void); +#endifimage_entry_noargs_timage_entry= (image_entry_noargs_t)spl_image->entry_point;
Quoted 8 lines
debug("image entry point: 0x%X\n", spl_image->entry_point); /* Pass the savedboot_paramsfrom rom code */ -#ifdefined(CONFIG_VIRTIO)||defined(CONFIG_ZEBU)-image_entry=
(image_entry_noargs_t)0x80100000; +#ifdefCONFIG_OMAP+image_entry((u32 *)&gd->arch.omap_boot_params); +#else +image_entry(); #endif - u32boot_params_ptr_addr=
(u32)&boot_params_ptr; -image_entry((u32 *)boot_params_ptr_addr);
}
We must correct jump_to_image_no_args to really be, in the default case here just image_entry() and have omap-common override the weak function with one that passes along our params, and comment what's going on.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRbB4/AAoJENk4IS6UOR1WeWgP/3YpBeHa7RCjfc1ZfHjHSX4T RlULN42HhNG/pka7S/bTo83whcVLDYz3WXYLWDYO6YVCnpaU1dfV2SuXeKjJIA9M rfB/q2pIc6Wnjcfzrazdh7LS1A/0iV3qe4AUBgkaVJdQX+q5WwJoHVjzp1WH7aOH /iXUR9pnhPnv8Uc+DJwtoT9fnDH5TkeMeSkVKe2mJEYPbSiKhmPHfKDvwbX7VfPl IAD6ifda7rApH4QTWFyFj+9MsfW/XkdILmg4JaGQU5Gp6DwVC2cmNS47br5d9WeV dsY+vA8Fezw+/HT5Jq7HBAmhy+gu7x7gpnYs5IzOSlWS+32W6HWoPzo/CHcnCaGt 1ltB44KevYu5FCrBA4KlJsoMx9JR1yJukOv3ezEFe2G9PBPyylLwTJ0tkVJb0b2H fJO2fPCWbOHzvIy5nIFFY0sE9YsnKu8PAxqPFYaJGeUWQL87kRo9E0ep72HUv/Ia rrOD6KWgp6cHi1qrFqbnVctWbDKBjBCyd3kc1nhGSmZTSTUkd/9Z6ie3i+wOyYsO yBtG9S6riJDcECcE8nOxXRfW973aqxkH7ybNn5ekbYdP8iHq+UgFx8rfhf73gaen c07fmIZJxz7i0KXNTsjHGycDMq7UqsihrdX47C9kcrcFqxEWAcZc8kXBlM1Kura2 EX40u9fhgitYG8EG4GGo
=5qv1
-----END PGP SIGNATURE-----
PATCH 4/5 ARM: OMAP: Cleanup boot parameters usage
Quoted 24 lines · Tom Rini
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 18 lines · Sricharan R
The boot parameters are read from individual variables assigned for each of them. This been corrected and now they are stored as a part of the global data 'gd' structure. So read them from 'gd' instead.
Signed-off-by Sricharan R <[email protected]> ---arch/arm/cpu/armv7/lowlevel_init.S | 8 ++++- arch/arm/cpu/armv7/omap-common/boot-common.c | 20 ++--------- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 46 ++---------------------- arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++---- arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++----- arch/arm/include/asm/omap_common.h | 3 ++ common/spl/spl.c | 12 ++++--- include/configs/am335x_evm.h | 1 + include/configs/pcm051.h | 1 + include/configs/ti814x_evm.h | 1 + include/spl.h | 1 - 11 filesQuoted 1 line
changed, 32 insertions(+), 84 deletions(-)
Quoted 1 line
I can live with adding
CONFIG_OMAPto the am335/ti81* parts.
Thanks. I was suspicious about this.
BTW, does am335/ti81 devices get the bootparams from romcode in the same as OMAP ?
Also are there any am335 boards with XIP where i can test this ?
Quoted 13 lines
[snip]
Quoted 11 lines
common/spl/spl.c index renamed from common/spl/spl.c +0
-06715e0d..4a7ce42 100644 ---
a/common/spl/spl.c+++b/common/spl/spl.c@@ -125,17 +125,21 @@ voidspl_parse_image_header(const struct image_header *header)
__weakvoid__noreturnjump_to_image_no_args(struct spl_image_info *spl_image){ +#ifdefCONFIG_OMAPtypedef void__noreturn
(*image_entry_noargs_t)(u32 *); +#else + typedef void__noreturn
(*image_entry_noargs_t)(void); +#endifimage_entry_noargs_timage_entry= (image_entry_noargs_t)spl_image->entry_point;
Quoted 14 lines
Quoted 8 lines
debug("image entry point: 0x%X\n", spl_image->entry_point); /* Pass the savedboot_paramsfrom rom code */ -#ifdefined(CONFIG_VIRTIO)||defined(CONFIG_ZEBU)-image_entry=
(image_entry_noargs_t)0x80100000; +#ifdefCONFIG_OMAP+image_entry((u32 *)&gd->arch.omap_boot_params); +#else +image_entry(); #endif - u32boot_params_ptr_addr=
(u32)&boot_params_ptr; -image_entry((u32 *)boot_params_ptr_addr);
}We must correct
jump_to_image_no_argsto really be, in the default case here justimage_entry()and have omap-common override the weak function with one that passes along our params, and comment what's going on.
ok, that looks cleaner. This change in V2.
Regards,
Sricharan
PATCH 4/5 ARM: OMAP: Cleanup boot parameters usage
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 24 lines · Sricharan R
Quoted 23 lines · Tom Rini
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Quoted 19 lines · Sricharan R
The boot parameters are read from individual variables assigned for each of them. This been corrected and now they are stored as a part of the global data 'gd' structure. So read them from 'gd' instead.
Signed-off-by Sricharan R <[email protected]> ---
arch/arm/cpu/armv7/lowlevel_init.S| 8 ++++-arch/arm/cpu/armv7/omap-common/boot-common.c| 20
++---------arch/arm/cpu/armv7/omap-common/lowlevel_init.S| 46 ++----------------------arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++---- arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++----- arch/arm/include/asm/omap_common.h | 3 ++ common/spl/spl.c | 12 ++++--- include/configs/am335x_evm.h | 1 + include/configs/pcm051.h | 1 + include/configs/ti814x_evm.h | 1 + include/spl.h | 1 - 11files changed, 32 insertions(+), 84 deletions(-)
Quoted 5 lines
Quoted 1 line
I can live with adding
CONFIG_OMAPto the am335/ti81* parts.Thanks. I was suspicious about this.
BTW, does am335/ti81 devices get the bootparams from romcode in the same as OMAP ?
Yes, that's some common code we all share now.
Quoted 1 line
Also are there any am335 boards with XIP where i can test this ?
am335x can have NOR, and there is a NOR cape for beaglebone, but we don't have everything for that in mainline just yet. Once that gets closer I will check it out.
- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJRbCAxAAoJENk4IS6UOR1WYV8P/11BbdwmzsnP7kp1vfuBtPeW cU4A0unTnX6WiIOtEUsOW7i0Mk8QFDsm6KknkCvkOw51Vs+cYTiYeB0hjEmKH129 DEEGGWkhoaupmRtPmmNGzZaCDGbBsWOMexwzCS6L5ozsYWov+FIJtsLVMNR7EV83 8f1O5TA6EtTjmJ31AjvkFTOyTej0p+I167+edLsCzeMCQyuVj/aKWoH2HCHWhkhb fq/CYExXiW9uhxWKinvECuOk9Yjw9scQWfM21GQQL1GK9zMNv/hZ+SoLptX67twZ SiQboUdVAz/VhvHC/CvsNjW3lGOVrV1YwAFlhYHrjboA7aAm7H8zQRNbF55r95bc bjA6bBe8xIWqmeu6tWQRP9zej8V7NWKaGMhFHSqSIE9svCG/x7gUnFal2z3+0hCa xaxUiJgAAFGmEQNaw9HJ3sLogc18pOLABUSCVmtNlpRh7qTpK7a4qs2bx8gT+FIS H3GIQRya952wXFipjxnzdKzr4zPmTGtIwzR9PSYSiY0V5w5jsnZ2BBb0YAZNWy4E SmdwmYb27g3sVNTZzE5UIwv2NM/EY1IpJAca2vCR2n52ibJqraOTqPHMAdya4BX1 I5UD5HiCsX4jokfF+eBl3JllYgj/JoqSQCLS/zpFu+qll1tZHEMIYkhKNU4nDPjg Su8NIwR0hmJvuOEqtEsz
=U9OR
-----END PGP SIGNATURE-----
PATCH 4/5 ARM: OMAP: Cleanup boot parameters usage
Quoted 34 lines · Tom Rini
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 24 lines · Sricharan R
Quoted 23 lines · Tom Rini
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Quoted 19 lines · Sricharan R
The boot parameters are read from individual variables assigned for each of them. This been corrected and now they are stored as a part of the global data 'gd' structure. So read them from 'gd' instead.
Signed-off-by Sricharan R <[email protected]> ---
arch/arm/cpu/armv7/lowlevel_init.S| 8 ++++-arch/arm/cpu/armv7/omap-common/boot-common.c| 20
++---------arch/arm/cpu/armv7/omap-common/lowlevel_init.S| 46 ++----------------------arch/arm/include/asm/arch-omap4/sys_proto.h | 11 ++---- arch/arm/include/asm/arch-omap5/sys_proto.h | 12 ++----- arch/arm/include/asm/omap_common.h | 3 ++ common/spl/spl.c | 12 ++++--- include/configs/am335x_evm.h | 1 + include/configs/pcm051.h | 1 + include/configs/ti814x_evm.h | 1 + include/spl.h | 1 - 11files changed, 32 insertions(+), 84 deletions(-)
Quoted 5 lines
Quoted 1 line
I can live with adding
CONFIG_OMAPto the am335/ti81* parts.Thanks. I was suspicious about this.
BTW, does am335/ti81 devices get the bootparams from romcode in the same as OMAP ?
Quoted 8 lines
Yes, that's some common code we all share now.
Quoted 1 line
Also are there any am335 boards with XIP where i can test this ?
am335x can have NOR, and there is a NOR cape for beaglebone, but we don't have everything for that in mainline just yet. Once that gets closer I will check it out.
Ok, thanks for that.
Regards,
Sricharan
PATCH 5/5 ARM: OMAP: Add arch_cpu_init function
In reply to Sricharan RThe 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.
--- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 11 +++++++++++ include/configs/am335x_evm.h | 3 +++ include/configs/omap4_common.h | 4 ++++ include/configs/omap5_common.h | 4 ++++ include/configs/pcm051.h | 3 +++ include/configs/ti814x_evm.h | 3 +++ 6 files changed, 28 insertions(+)
arch/arm/cpu/armv7/omap-common/hwinit-common.c +11 -0
@@ -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
include/configs/am335x_evm.h +3 -0
@@ -256,6 +256,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
include/configs/omap4_common.h +4 -0
@@ -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
include/configs/omap5_common.h +4 -0
@@ -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 #define CONFIG_SYS_I2C_SPEED 100000
include/configs/pcm051.h +3 -0
@@ -195,6 +195,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
include/configs/ti814x_evm.h +3 -0
@@ -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
Signature · 1 line
1.7.9.5