[PATCH-next] include: configs: at91/sam: remove stray #ifdef/#else
With the commit that moves the BOOTCOMMAND to Kconfig:
970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
some stray ifdefs have been left in the header files which are now useless. Clean up the include files to remove these lines.
Fixes: 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig") Signed-off-by: Eugen Hristev eugen.hristev@microchip.com --- include/configs/at91-sama5_common.h | 11 ----------- include/configs/at91sam9260ek.h | 12 ------------ include/configs/at91sam9261ek.h | 13 ------------- include/configs/at91sam9263ek.h | 9 --------- include/configs/at91sam9m10g45ek.h | 6 ------ include/configs/at91sam9n12ek.h | 9 --------- include/configs/at91sam9rlek.h | 14 -------------- include/configs/at91sam9x5ek.h | 8 -------- include/configs/sam9x60ek.h | 10 ---------- include/configs/sama5d27_som1_ek.h | 4 ---- include/configs/sama5d2_xplained.h | 12 ------------ 11 files changed, 108 deletions(-)
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 669a8ec7c7..4631acfd66 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -15,15 +15,4 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-#ifdef CONFIG_SD_BOOT -#else - -#ifdef CONFIG_NAND_BOOT -/* u-boot env in nand flash */ -#elif CONFIG_SPI_BOOT -/* u-boot env in serial flash, by default is bus 0 and cs 0 */ -#endif - -#endif - #endif diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 4252a8ce37..f5cc0b2b91 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -67,16 +67,4 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#ifdef CONFIG_SYS_USE_DATAFLASH_CS0 - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#elif defined(CONFIG_SYS_USE_NANDFLASH) - -/* bootstrap + u-boot + env + linux in nandflash */ - -#else /* CONFIG_SYS_USE_MMC */ -/* bootstrap + u-boot + env + linux in mmc */ -/* For FAT system, most cases it should be in the reserved sector */ -#endif - #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index fefdb83709..f5da8a096e 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -73,17 +73,4 @@ #endif #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#ifdef CONFIG_SYS_USE_DATAFLASH_CS0 - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif CONFIG_SYS_USE_DATAFLASH_CS3 - -/* bootstrap + u-boot + env + linux in dataflash on CS3 */ - -#else /* CONFIG_SYS_USE_NANDFLASH */ - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif - #endif diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b084f96afd..e759ce4124 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -197,13 +197,4 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#ifdef CONFIG_SYS_USE_DATAFLASH - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif CONFIG_SYS_USE_NANDFLASH - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif - #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0f5d991022..92f0549485 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -50,12 +50,6 @@ #define CONFIG_RESET_PHY_R #define CONFIG_AT91_WANTS_COMMON_PHY
-#ifdef CONFIG_NAND_BOOT -/* bootstrap + u-boot + env in nandflash */ -#elif CONFIG_SD_BOOT -/* bootstrap + u-boot + env + linux in mmc */ -#endif - /* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE 0x010000 #define CONFIG_SPL_STACK 0x310000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 1771defa16..a1ed1c4fc2 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -63,15 +63,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #endif
-#ifdef CONFIG_SPI_BOOT - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif defined(CONFIG_NAND_BOOT) - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 89cfcbd951..2e81c36d1b 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -52,18 +52,4 @@
#endif
-/* Ethernet - not present */ - -#ifdef CONFIG_SYS_USE_DATAFLASH - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif CONFIG_SYS_USE_NANDFLASH - -/* bootstrap + u-boot + env + linux in nandflash */ - -#else /* CONFIG_SYS_USE_MMC */ - -/* bootstrap + u-boot + env + linux in mmc */ -#endif #endif diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index c813136dbe..013c7cfc59 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -54,14 +54,6 @@ #endif #endif
-#ifdef CONFIG_NAND_BOOT -/* bootstrap + u-boot + env + linux in nandflash */ -#elif defined(CONFIG_SPI_BOOT) -/* bootstrap + u-boot + env + linux in spi flash */ -#elif defined(CONFIG_SYS_USE_DATAFLASH) -/* bootstrap + u-boot + env + linux in data flash */ -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 772805d624..c965fcb4e8 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -40,14 +40,4 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 #endif
-#ifdef CONFIG_SD_BOOT -/* bootstrap + u-boot + env + linux in sd card */ - -#elif defined(CONFIG_NAND_BOOT) -/* bootstrap + u-boot + env + linux in nandflash */ - -#elif defined(CONFIG_QSPI_BOOT) -/* bootstrap + u-boot + env + linux in SPI NOR flash */ -#endif - #endif diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index f7d8fb6352..b9144584e3 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -21,10 +21,6 @@ (0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif
-#ifdef CONFIG_SD_BOOT -/* bootstrap + u-boot + env in sd card */ -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 11c13c65d8..cab6ae5069 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -18,18 +18,6 @@ (0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif
-/* SerialFlash */ - -#ifdef CONFIG_SD_BOOT - -/* bootstrap + u-boot + env in sd card */ - -#elif CONFIG_SPI_BOOT - -/* bootstrap + u-boot + env in sd card, but kernel + dtb in eMMC */ - -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000
On Thu, Mar 24, 2022 at 01:08:48PM +0200, Eugen Hristev wrote:
With the commit that moves the BOOTCOMMAND to Kconfig:
970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
some stray ifdefs have been left in the header files which are now useless. Clean up the include files to remove these lines.
Fixes: 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig") Signed-off-by: Eugen Hristev eugen.hristev@microchip.com
I thought I had a patch doing that already but I guess not, thanks.
Reviewed-by: Tom Rini trini@konsulko.com
On Thu, Mar 24, 2022 at 12:01:19PM -0400, Tom Rini wrote:
On Thu, Mar 24, 2022 at 01:08:48PM +0200, Eugen Hristev wrote:
With the commit that moves the BOOTCOMMAND to Kconfig:
970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
some stray ifdefs have been left in the header files which are now useless. Clean up the include files to remove these lines.
Fixes: 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig") Signed-off-by: Eugen Hristev eugen.hristev@microchip.com
I thought I had a patch doing that already but I guess not, thanks.
Ah, I was thinking of: https://patchwork.ozlabs.org/project/uboot/patch/20220323212009.1066483-17-t... but I think you cover more cases here than I did.
Oh. I missed your patch (wasn't CCed on it ). Your patch does a bit more than mine. Since you already worked on it and you were first, let's have your patch applied and I will rebase mine on top and see if there is something left to do, and I will resubmit.
Thanks !
On 3/24/22 10:13 PM, Tom Rini wrote:
participants (3)
-
Eugen Hristev -
Eugen.Hristev＠microchip.com
-
Tom Rini