leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: mxs: move spl data

Browse Source 
With full SPL enabled, the loaded image overwrites the mxs_spl_data
location.  Moving it a slightly lower address fixes this.

Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2018-04-21 16:11:09 +01:00 committed by Stefano Babic
parent 68f835557c
commit 33ea119382
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/cpu/arm926ejs/mxs/mxs.c
View File

@ -178,8 +178,7 @@ const char *get_imx_type(u32 imxtype)
int print_cpuinfo(void) int print_cpuinfo(void)
{ {
u32 cpurev; u32 cpurev;
struct mxs_spl_data *data = (struct mxs_spl_data *) struct mxs_spl_data *data = MXS_SPL_DATA;
((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
cpurev = get_cpu_rev(); cpurev = get_cpu_rev();
printf("CPU: Freescale i.MX%s rev%d.%d at %d MHz\n", printf("CPU: Freescale i.MX%s rev%d.%d at %d MHz\n",
@ -277,8 +276,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
int mxs_dram_init(void) int mxs_dram_init(void)
{ {
struct mxs_spl_data *data = (struct mxs_spl_data *) struct mxs_spl_data *data = MXS_SPL_DATA;
((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
if (data->mem_dram_size == 0) { if (data->mem_dram_size == 0) {
printf("MXS:\n" printf("MXS:\n"

3
arch/arm/cpu/arm926ejs/mxs/spl_boot.c
View File

@ -120,8 +120,7 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
const iomux_cfg_t *iomux_setup, const iomux_cfg_t *iomux_setup,
const unsigned int iomux_size) const unsigned int iomux_size)
{ {
struct mxs_spl_data *data = (struct mxs_spl_data *) struct mxs_spl_data *data = MXS_SPL_DATA;
((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
uint8_t bootmode = mxs_get_bootmode_index(); uint8_t bootmode = mxs_get_bootmode_index();
gd = &gdata; gd = &gdata;

2
arch/arm/include/asm/arch-mxs/sys_proto.h
View File

@ -85,6 +85,8 @@ static const struct mxs_pair mxs_boot_modes[] = {
#define MXS_BM_SDMMC1_3V3 0x0a #define MXS_BM_SDMMC1_3V3 0x0a
#define MXS_BM_SDMMC1_1V8 0x1a #define MXS_BM_SDMMC1_1V8 0x1a
#define MXS_SPL_DATA ((struct mxs_spl_data *)(CONFIG_SYS_TEXT_BASE - 0x200))
struct mxs_spl_data { struct mxs_spl_data {
uint8_t boot_mode_idx; uint8_t boot_mode_idx;
uint32_t mem_dram_size; uint32_t mem_dram_size;