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

MLK-21103 imx8: Fix build break on ARM2 SPL 

Meet the build error below with ARM2 SPL defconfig
arch/arm/mach-imx/imx8/image.c: In function ‘spl_nor_get_uboot_base’:
arch/arm/mach-imx/imx8/image.c:224:13: error: ‘CONFIG_SYS_UBOOT_BASE’
undeclared (first use in this function)
if (end <= CONFIG_SYS_UBOOT_BASE)

The root cause is we did not add SPL NOR support for ARM2 SPL, but
the codes still use the CONFIG_SYS_UBOOT_BASE.

Fix the issue by adding SPL device support config for each device
relevant function.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit a96fd317601db7f21402e5f74fe24653e2af8ae7)
This commit is contained in:
Ye Li 2019-03-11 19:19:54 -07:00
parent e0343ea466
commit c20b7761db
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-imx/imx8/image.c
View File

@ -175,6 +175,7 @@ static int get_imageset_end(void *dev, int dev_type)
return value_container[1] + offset2;
}
#ifdef CONFIG_SPL_SPI_LOAD
unsigned long spl_spi_get_uboot_raw_sector(struct spi_flash *flash)
{
int end;
@ -186,7 +187,9 @@ unsigned long spl_spi_get_uboot_raw_sector(struct spi_flash *flash)
return end;
}
#endif
#ifdef CONFIG_SPL_MMC_SUPPORT
unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc)
{
int end;
@ -198,7 +201,9 @@ unsigned long spl_mmc_get_uboot_raw_sector(struct mmc *mmc)
return end/mmc->read_bl_len;
}
#endif
#ifdef CONFIG_SPL_NAND_SUPPORT
uint32_t spl_nand_get_uboot_raw_page(void)
{
int end;
@ -210,7 +215,9 @@ uint32_t spl_nand_get_uboot_raw_page(void)
return end;
}
#endif
#ifdef CONFIG_SPL_NOR_SUPPORT
unsigned long spl_nor_get_uboot_base(void)
{
int end;
@ -230,3 +237,4 @@ unsigned long spl_nor_get_uboot_base(void)
return end;
}
#endif