U-Boot ENV in EXT4 support for Expressobin (revised)
cover U-Boot ENV in EXT4 support for Expressobin (revised)
Hi
Per comments of Stefan I have split the patch in two:
- one for env file changes
- one for espressobin related changes
Let me know if any other changes are needed.
Regards
Rogier
Rogier Stam (2):
Fix Espressobin build for configs where ENV is not in SPI Add SCSI scan for ENV in EXT4 or FAT
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ board/Marvell/mvebu_armada-37xx/board.c | 4 +++- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
PATCH 1/2 Fix Espressobin build for configs where ENV is not in SPI
When storing the UBoot Environment in for example EXT4, the U-Boot build is broken for several reasons:
1. armada-385-turris-omnia-u-boot.dtsi will not allow CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE to be undefined
2. armada-37xx/board.c ft_board_setup function does not exist if CONFIG_ENV_IS_IN_SPI_FLASH is not defined
This commit changes these files so that selecting a different location for the environment is possible.
--- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ board/Marvell/mvebu_armada-37xx/board.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +2 -0
@@ -38,6 +38,7 @@ }; }; +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH &spi0 { u-boot,dm-pre-reloc;
@@ -56,6 +57,7 @@ }; }; }; +#endif &uart0 { u-boot,dm-pre-reloc;
board/Marvell/mvebu_armada-37xx/board.c +3 -1
@@ -328,9 +328,10 @@ int board_network_enable(struct mii_dev *bus)return 0 ; } -#if defined(CONFIG_OF_BOARD_SETUP ) && defined(CONFIG_ENV_IS_IN_SPI_FLASH ) +#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup (void *blob,struct bd_info *bd) { +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH int ret;int spi_off;int parts_off;
@@ -424,6 +425,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)return 0 ; } +#endif return 0 ; }#endif
Signature · 1 line
2.7.4
Re: [PATCH 1/2] Fix Espressobin build for configs where ENV is not in SPI
+ Marek, Stefan
Quoted 11 lines · On Wednesday 09 February 2022 00:27:00 Rogier Stam wrote:
When storing the UBoot Environment in for example EXT4, the U-Boot build is broken for several reasons:
1.armada-385-turris-omnia-u-boot.dtsiwill not allowCONFIG_ENV_OFFSETandCONFIG_ENV_SIZEto be undefined
2.armada-37xx/board.cft_board_setupfunction does not exist ifCONFIG_ENV_IS_IN_SPI_FLASHis not definedThis commit changes these files so that selecting a different location for the environment is possible.
Signed-off-by Rogier Stam <[email protected]>
Quoted 52 lines
--- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ board/Marvell/mvebu_armada-37xx/board.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +2
-0@@ -38,6 +38,7 @@ }; }; +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH &spi0 { u-boot,dm-pre-reloc;@@ -56,6 +57,7 @@ }; }; }; +#endif &uart0 { u-boot,dm-pre-reloc;board/Marvell/mvebu_armada-37xx/board.c +3
-1@@ -328,9 +328,10 @@ int board_network_enable(struct mii_dev *bus)return 0 ; } -#if defined(CONFIG_OF_BOARD_SETUP ) && defined(CONFIG_ENV_IS_IN_SPI_FLASH ) +#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup (void *blob,struct bd_info *bd) { +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH int ret;int spi_off;int parts_off;@@ -424,6 +425,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)return 0 ; } +#endif return 0 ; }#endif Signature · 1 line
2.7.4
Re: [PATCH 1/2] Fix Espressobin build for configs where ENV is not in SPI
Quoted 10 lines · Pali Rohár
+ Marek, Stefan
Quoted 7 lines · On Wednesday 09 February 2022 00:27:00 Rogier Stam wrote:
When storing the UBoot Environment in for example EXT4, the U-Boot build is broken for several reasons:
1.armada-385-turris-omnia-u-boot.dtsiwill not allowCONFIG_ENV_OFFSETandCONFIG_ENV_SIZEto be undefined
2.armada-37xx/board.cft_board_setupfunction does not exist ifCONFIG_ENV_IS_IN_SPI_FLASHis not defined
Quoted 6 lines
Quoted 4 lines
This commit changes these files so that selecting a different location for the environment is possible.
Signed-off-by Rogier Stam <[email protected]>Reviewed-by Pali Rohár <[email protected]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 45 lines
Quoted 45 lines
--- arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ board/Marvell/mvebu_armada-37xx/board.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +2
-0@@ -38,6 +38,7 @@ }; }; +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH &spi0 { u-boot,dm-pre-reloc;@@ -56,6 +57,7 @@ }; }; }; +#endif &uart0 { u-boot,dm-pre-reloc;board/Marvell/mvebu_armada-37xx/board.c +2
-1@@ -328,9 +328,10 @@ int board_network_enable(struct mii_dev *bus)return 0 ; } -#if defined(CONFIG_OF_BOARD_SETUP ) && defined(CONFIG_ENV_IS_IN_SPI_FLASH ) +#ifdef CONFIG_OF_BOARD_SETUP int ft_board_setup (void *blob,struct bd_info *bd) { +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH int ret;int spi_off;int parts_off;@@ -424,6 +425,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)return 0 ; }
Quoted 7 lines
Quoted 7 lines
board/Marvell/mvebu_armada-37xx/board.c +1
-0+#endif return 0; }#endif Signature · 1 line
2.7.4
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
PATCH 2/2 Add SCSI scan for ENV in EXT4 or FAT
In reply to Rogier StamWhen having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to mmc_initialize.
--- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 2 files changed, 10 insertions(+)
env/ext4.c +5 -0
@@ -31,6 +31,7 @@#include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <scsi.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -146,6 +147,10 @@ static int env_ext4_load(void)if (!strcmp (ifname,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (ifname,"scsi" )) +scsi_scan (true); +#endif part =blk_get_device_part_str (ifname, dev_and_part, &dev_desc, &info,1 );
env/fat.c +5 -0
@@ -17,6 +17,7 @@#include <errno.h> #include <fat.h> #include <mmc.h> +#include <scsi.h> #include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h>
@@ -122,6 +123,10 @@ static int env_fat_load(void)if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"scsi" )) +scsi_scan (true); +#endif part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, env_fat_device_and_part(),
Signature · 1 line
2.7.4
Re: [PATCH 2/2] Add SCSI scan for ENV in EXT4 or FAT
+ Simon, could you review this change? It would be nice to have this fix in upcoming U-Boot release.
Quoted 8 lines · On Wednesday 09 February 2022 00:27:01 Rogier Stam wrote:
When having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to
mmc_initialize.Signed-off-by Rogier Stam <[email protected]>
Quoted 54 lines
--- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 2 files changed, 10 insertions(+)env/ext4.c +5
-0@@ -31,6 +31,7 @@#include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <scsi.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;@@ -146,6 +147,10 @@ static int env_ext4_load(void)if (!strcmp (ifname,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (ifname,"scsi" )) +scsi_scan (true); +#endif part =blk_get_device_part_str (ifname, dev_and_part, &dev_desc, &info,1 );env/fat.c +5
-0@@ -17,6 +17,7 @@#include <errno.h> #include <fat.h> #include <mmc.h> +#include <scsi.h> #include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h> @@ -122,6 +123,10 @@ static int env_fat_load(void)if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"scsi" )) +scsi_scan (true); +#endif part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, env_fat_device_and_part(),Signature · 1 line
2.7.4
Re: [PATCH 2/2] Add SCSI scan for ENV in EXT4 or FAT
Hi Rogier,
Quoted 10 lines · Pali Rohár
+ Simon, could you review this change? It would be nice to have this fix in upcoming U-Boot release.
Quoted 7 lines · On Wednesday 09 February 2022 00:27:01 Rogier Stam wrote:
When having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to
mmc_initialize.
Quoted 3 lines
Quoted 1 line
Signed-off-by Rogier Stam <[email protected]>Reviewed-by Pali Rohár <[email protected]>
While running some CI tests, this error occurs with this patch:
$ make dra7xx_hs_evm_usb_defconfig ... $ make -s -j20 ... /opt/kernel.org/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd: env/fat.o: in function `env_fat_load': /home/stefan/git/u-boot/u-boot-marvell/env/fat.c:134: undefined reference to `scsi_scan' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 make: *** [Makefile:2101: spl/u-boot-spl] Error 2
Could you please take a look? And send a fixed version which also passed a "world build" for all supported targets?
Thanks,
Stefan
Quoted 49 lines
Quoted 49 lines
--- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 2 files changed, 10 insertions(+)env/ext4.c +5
-0@@ -31,6 +31,7 @@#include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <scsi.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;@@ -146,6 +147,10 @@ static int env_ext4_load(void)if (!strcmp (ifname,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (ifname,"scsi" )) +scsi_scan (true); +#endif part =blk_get_device_part_str (ifname, dev_and_part, &dev_desc, &info,1 );env/fat.c +5
-0@@ -17,6 +17,7 @@#include <errno.h> #include <fat.h> #include <mmc.h> +#include <scsi.h> #include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h> @@ -122,6 +123,10 @@ static int env_fat_load(void)if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"scsi" )) +scsi_scan (true); +#endif
Quoted 5 lines
Quoted 5 lines
env/fat.c +0
-0part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, env_fat_device_and_part(),Signature · 1 line
2.7.4
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 2/2] Add SCSI scan for ENV in EXT4 or FAT
Quoted 19 lines · On Thursday 21 April 2022 12:34:30 Stefan Roese wrote:
Hi Rogier,
Quoted 10 lines · Pali Rohár
+ Simon, could you review this change? It would be nice to have this fix in upcoming U-Boot release.
Quoted 7 lines · On Wednesday 09 February 2022 00:27:01 Rogier Stam wrote:
When having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to
mmc_initialize.Quoted 3 lines
Quoted 1 line
Signed-off-by Rogier Stam <[email protected]>Reviewed-by Pali Rohár <[email protected]>While running some CI tests, this error occurs with this patch:
Quoted 10 lines
$ make dra7xx_hs_evm_usb_defconfig ... $ make -s -j20 ... /opt/kernel.org/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd: env/fat.o: in function `env_fat_load': /home/stefan/git/u-boot/u-boot-marvell/env/fat.c:134: undefined reference to `scsi_scan' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 make: *** [Makefile:2101: spl/u-boot-spl] Error 2
This is failing while building SPL...
Quoted 42 lines
Could you please take a look? And send a fixed version which also passed a "world build" for all supported targets?
Thanks,
StefanQuoted 35 lines
Quoted 35 lines
--- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 2 files changed, 10 insertions(+)env/ext4.c +5
-0@@ -31,6 +31,7 @@#include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <scsi.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;@@ -146,6 +147,10 @@ static int env_ext4_load(void)if (!strcmp (ifname,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (ifname,"scsi" )) +scsi_scan (true); +#endif part =blk_get_device_part_str (ifname, dev_and_part, &dev_desc, &info,1 );env/fat.c +1
-0@@ -17,6 +17,7 @@#include <errno.h> #include <fat.h> #include <mmc.h> +#include <scsi.h>
Quoted 8 lines
Quoted 8 lines
env/fat.c static int env_fat_load(void) · line 126
Quoted 8 lines
env/fat.c +1
-0#include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h> @@ -122,6 +123,10 @@ static int env_fat_load(void)if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI )
... I guess that you should use CONFIG_IS_ENABLED(AHCI) instead of defined(CONFIG_AHCI) for proper SPL support.
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
env/fat.c +3
-0+if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"scsi" )) +scsi_scan (true); +#endif part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, env_fat_device_and_part(),Signature · 1 line
2.7.4Viele Grüße,
Stefan RoeseSignature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 2/2] Add SCSI scan for ENV in EXT4 or FAT
Hi,
Sorry for the late reply. Not much time lately, also had some trouble figuring the world build out. That said I have a fix. Not sure on the usual process, but I will repost it on the mailing list in a moment. Pali was quite close on the solution. I went a slightly different route as I did not want to deviate from style in fat.c, also from reading the recommended CONFIG_IS_ENABLED macro I got the impression you'd have to define separate vars for TPL and SPL which would deviate from normal usage for storing env in fat.
Effectively it amounts to:
+#ifndef CONFIG_SPL_BUILD
+#if defined(CONFIG_AHCI) || defined(CONFIG_SCSI) + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "scsi")) + scsi_scan(true);
+#endif
+#endif
Anyway, let me know if you disagree.
Thanks and regards
Rogier
Quoted 98 lines · Pali Rohár
Quoted 17 lines · On Thursday 21 April 2022 12:34:30 Stefan Roese wrote:
Hi Rogier,
Quoted 10 lines · Pali Rohár
+ Simon, could you review this change? It would be nice to have this fix in upcoming U-Boot release.
Quoted 7 lines · On Wednesday 09 February 2022 00:27:01 Rogier Stam wrote:
When having environment stored in EXT4 or FAT and using an AHCI or SCSI device / partition the scan would not be performed early enough and hence the device would not be recognized. This change adds the scan when the interface is "scsi" in a similar way to
mmc_initialize.Quoted 2 lines
Quoted 1 line
Signed-off-by Rogier Stam <[email protected]>Reviewed-by Pali Rohár <[email protected]>While running some CI tests, this error occurs with this patch:
Quoted 10 lines
$ make dra7xx_hs_evm_usb_defconfig ... $ make -s -j20 ... /opt/kernel.org/gcc-11.1.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ld.bfd: env/fat.o: in function `env_fat_load': /home/stefan/git/u-boot/u-boot-marvell/env/fat.c:134: undefined reference to `scsi_scan' make[1]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 make: *** [Makefile:2101: spl/u-boot-spl] Error 2This is failing while building SPL...
Quoted 42 lines
Could you please take a look? And send a fixed version which also passed a "world build" for all supported targets?
Thanks,
StefanQuoted 35 lines
Quoted 35 lines
--- env/ext4.c | 5 +++++ env/fat.c | 5 +++++ 2 files changed, 10 insertions(+)env/ext4.c +5
-0@@ -31,6 +31,7 @@#include <errno.h> #include <ext4fs.h> #include <mmc.h> +#include <scsi.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR ;@@ -146,6 +147,10 @@ static int env_ext4_load(void)if (!strcmp (ifname,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI ) +if (!strcmp (ifname,"scsi" )) +scsi_scan (true); +#endif part =blk_get_device_part_str (ifname, dev_and_part, &dev_desc, &info,1 );env/fat.c +1
-0@@ -17,6 +17,7 @@#include <errno.h> #include <fat.h> #include <mmc.h> +#include <scsi.h> Quoted 8 lines
Quoted 8 lines
env/fat.c static int env_fat_load(void) · line 126
Quoted 8 lines
env/fat.c +1
-0#include <asm/cache.h> #include <asm/global_data.h> #include <linux/stddef.h> @@ -122,6 +123,10 @@ static int env_fat_load(void)if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"mmc" ))mmc_initialize (NULL );#endif +#if defined(CONFIG_AHCI ) || defined(CONFIG_SCSI )... I guess that you should use
CONFIG_IS_ENABLED(AHCI)instead ofdefined(CONFIG_AHCI)for proper SPL support.Quoted 15 lines
Quoted 8 lines
Quoted 8 lines
env/fat.c +3
-0+if (!strcmp (CONFIG_ENV_FAT_INTERFACE ,"scsi" )) +scsi_scan (true); +#endif part = blk_get_device_part_str(CONFIG_ENV_FAT_INTERFACE, env_fat_device_and_part(),Signature · 1 line
2.7.4Viele Grüße,
Stefan RoeseSignature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]