diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-18 20:02:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-20 18:31:24 -0500 |
| commit | dbcb4dae36cf345bb937fe14af07bbf44ba394b5 (patch) | |
| tree | f7be2921cc2b4db9d06b12f90c58592c0165140a /board | |
| parent | a8992e788aba46f6f129af3111682be86236074f (diff) | |
fsl: layerscape: guard *env_sf_get_env_addr() on CONFIG_ENV_IS_IN_SPI_FLASH
These functions can only be built and used when we have
ENV_IS_IN_SPI_FLASH, use that as a guard.
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/ls1043aqds/ls1043aqds.c | 2 | ||||
| -rw-r--r-- | board/freescale/ls1046aqds/ls1046aqds.c | 2 | ||||
| -rw-r--r-- | board/freescale/ls1088a/ls1088a.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index 45f006dab72..8c96b962b78 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -525,7 +525,7 @@ u16 flash_read16(void *addr) return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); } -#ifdef CONFIG_TFABOOT +#if defined(CONFIG_TFABOOT) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) void *env_sf_get_env_addr(void) { return (void *)(CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET); diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index 6a51dcd6491..aac5d9aa848 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -482,7 +482,7 @@ u16 flash_read16(void *addr) return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); } -#ifdef CONFIG_TFABOOT +#if defined(CONFIG_TFABOOT) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) void *env_sf_get_env_addr(void) { return (void *)(CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET); diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index f1592982a34..4ecf6dce685 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1008,8 +1008,10 @@ int is_flash_available(void) } #endif +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH void *env_sf_get_env_addr(void) { return (void *)(CONFIG_SYS_FSL_QSPI_BASE + CONFIG_ENV_OFFSET); } #endif +#endif |