[U-Boot] board: atmel: sama5d27_wlsom1_ek: fix SPL OFFS on SPI
diff mbox series

Message ID 1568206609-18408-1-git-send-email-eugen.hristev@microchip.com
State Awaiting Upstream
Delegated to: Eugen Hristev
Headers show
Series
  • [U-Boot] board: atmel: sama5d27_wlsom1_ek: fix SPL OFFS on SPI
Related show

Commit Message

Eugen Hristev Sept. 11, 2019, 1:02 p.m. UTC
From: Eugen Hristev <eugen.hristev@microchip.com>

Fixes redefinition of CONFIG_SYS_SPI_U_BOOT_OFFS
This is now a Kconfig

Fixes: 3e541a6e8fba ("board: atmel: sama5d2_wlsom1_ek: add qspi support and qspi boot config")
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
---

From the initial submission of the board add patch until it was accepted,
SPI_U_BOOT_OFFS was converted to Kconfig. Fixed with this patch.


 configs/sama5d27_wlsom1_ek_qspiflash_defconfig | 3 ++-
 include/configs/sama5d27_wlsom1_ek.h           | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

Comments

Eugen Hristev Sept. 16, 2019, 6:52 a.m. UTC | #1
On 11.09.2019 16:02, Eugen Hristev - M18282 wrote:
> From: Eugen Hristev <eugen.hristev@microchip.com>
> 
> Fixes redefinition of CONFIG_SYS_SPI_U_BOOT_OFFS
> This is now a Kconfig
> 
> Fixes: 3e541a6e8fba ("board: atmel: sama5d2_wlsom1_ek: add qspi support and qspi boot config")
> Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
> ---
> 

Applied to u-boot-atmel/next

Patch
diff mbox series

diff --git a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
index ec05af1..82568e2 100644
--- a/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
+++ b/configs/sama5d27_wlsom1_ek_qspiflash_defconfig
@@ -16,6 +16,7 @@  CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEBUG_UART=y
+CONFIG_SPL_TEXT_BASE=0x200000
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
@@ -26,12 +27,12 @@  CONFIG_USE_BOOTARGS=y
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_SPL_TEXT_BASE=0x200000
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DISPLAY_PRINT=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SPL_AT91_MCK_BYPASS=y
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
diff --git a/include/configs/sama5d27_wlsom1_ek.h b/include/configs/sama5d27_wlsom1_ek.h
index 250eb73..6bcbc06 100644
--- a/include/configs/sama5d27_wlsom1_ek.h
+++ b/include/configs/sama5d27_wlsom1_ek.h
@@ -43,8 +43,4 @@ 
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.img"
 #endif
 
-#ifdef CONFIG_QSPI_BOOT
-#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x40000
-#endif
-
 #endif