From abf9e5d0f2cd123951dfae0d5605b54394721b97 Mon Sep 17 00:00:00 2001 From: Hannes Schmelzer Date: Thu, 22 Aug 2019 15:41:43 +0200 Subject: moveconfig: prepare moving CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig step 2 some boards have common headers for several individual build-targets where CONFIG_SYS_SPI_U_BOOT_OFFS is defined even it is not needed (only needed if CONFIG_SPL_SPI_LOAD is defined also). Take this define here under '#ifdef CONFIG_SPL_SPI_LOAD' for having a clean run of moveconfig.py Signed-off-by: Hannes Schmelzer --- include/configs/sama5d3xek.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/sama5d3xek.h') diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index db840e927e..c5a2e54e08 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -84,7 +84,7 @@ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_SPI_BOOT +#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 #elif CONFIG_NAND_BOOT -- cgit From 1ee774d20914fb89ad1b236aedb4178912f77c77 Mon Sep 17 00:00:00 2001 From: Hannes Schmelzer Date: Thu, 22 Aug 2019 15:41:46 +0200 Subject: Convert CONFIG_SYS_SPI_U_BOOT_OFFS to Kconfig This converts the following to Kconfig: CONFIG_SYS_SPI_U_BOOT_OFFS Signed-off-by: Hannes Schmelzer [trini: Expose this for SPL_SPI_SUNXI for now] Signed-off-by: Tom Rini --- include/configs/sama5d3xek.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs/sama5d3xek.h') diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index c5a2e54e08..3a712b51bd 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -83,10 +83,6 @@ #ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -#elif CONFIG_SPI_BOOT && CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - #elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE -- cgit