diff options
author | Paul Kocialkowski <contact@paulk.fr> | 2015-07-15 16:02:19 +0200 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-07-27 15:02:03 -0400 |
commit | 60c7c30aa084588ef974663be3d22a1de7f66cbb (patch) | |
tree | ff1557b8d5f00469e5ce537466870247b6cf9e68 /arch/arm/include/asm/ti-common | |
parent | a350c6a60223f7a60228ed563d2e7b02fb7944ab (diff) | |
download | u-boot-imx-60c7c30aa084588ef974663be3d22a1de7f66cbb.zip u-boot-imx-60c7c30aa084588ef974663be3d22a1de7f66cbb.tar.gz u-boot-imx-60c7c30aa084588ef974663be3d22a1de7f66cbb.tar.bz2 |
omap-common: Common boot code OMAP3 support and cleanup
This introduces OMAP3 support for the common omap boot code, as well as a
major cleanup of the common omap boot code.
First, the omap_boot_parameters structure becomes platform-specific, since its
definition differs a bit across omap platforms. The offsets are removed as well
since it is U-Boot's coding style to use structures for mapping such kind of
data (in the sense that it is similar to registers). It is correct to assume
that romcode structure encoding is the same as U-Boot, given the description
of these structures in the TRMs.
The original address provided by the bootrom is passed to the U-Boot binary
instead of a duplicate of the structure stored in global data. This allows to
have only the relevant (boot device and mode) information stored in global data.
It is also expected that the address where the bootrom stores that information
is not overridden by the U-Boot SPL or U-Boot.
The save_omap_boot_params is expected to handle all special cases where the data
provided by the bootrom cannot be used as-is, so that spl_boot_device and
spl_boot_mode only return the data from global data.
All of this is only relevant when the U-Boot SPL is used. In cases it is not,
save_boot_params should fallback to its weak (or board-specific) definition.
save_omap_boot_params should not be called in that context either.
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Diffstat (limited to 'arch/arm/include/asm/ti-common')
-rw-r--r-- | arch/arm/include/asm/ti-common/sys_proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/ti-common/sys_proto.h b/arch/arm/include/asm/ti-common/sys_proto.h index d3ab75f..2bdb71c 100644 --- a/arch/arm/include/asm/ti-common/sys_proto.h +++ b/arch/arm/include/asm/ti-common/sys_proto.h @@ -36,7 +36,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 ((gd->arch.omap_boot_params.ch_flags) & (CH_FLAGS_CHSETTINGS)) + if (gd->arch.omap_ch_flags & CH_FLAGS_CHSETTINGS) return 0; else return running_from_sdram(); |