| Message ID | 20231108164858.3497420-3-seanga2@gmail.com |
|---|---|
| State | Accepted |
| Commit | 3b46cdd7a0d9d4af9f2ff6b75d67bc5fa630fc2e |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | spl: Use common function for loading/parsing images | expand |
On Wed, 8 Nov 2023 at 09:49, Sean Anderson <seanga2@gmail.com> wrote: > > Several boards enable SPL_FS_FAT and SPL_LIBDISK_SUPPORT when they can't be > used (as there is no block device support enabled). Disable these configs. > The list of boards was generated with the following command: > > $ tools/qconfig.py -f SPL SPL_FS_FAT ~SPL_MMC ~SPL_BLK_FS ~SPL_SATA \ > ~SPL_USB_STORAGE ~ENV_IS_IN_FAT ~EFI > > LIBDISK was left enabled for the am* boards, since it seems to result in > actual size reduction, indicating that partitions are being used for > something. > > Signed-off-by: Sean Anderson <seanga2@gmail.com> > --- > > Changes in v7: > - Disable FS_FAT for the zynq(mp) boards as well, as suggested by Michal > > Changes in v6: > - New > > configs/am335x_evm_spiboot_defconfig | 2 +- > configs/am65x_evm_r5_usbdfu_defconfig | 1 - > configs/xilinx_zynqmp_mini_qspi_defconfig | 3 ++- > configs/zynq_cse_nand_defconfig | 2 ++ > configs/zynq_cse_nor_defconfig | 2 ++ > configs/zynq_cse_qspi_defconfig | 2 ++ > 6 files changed, 9 insertions(+), 3 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On 11/8/23 17:48, Sean Anderson wrote: > Several boards enable SPL_FS_FAT and SPL_LIBDISK_SUPPORT when they can't be > used (as there is no block device support enabled). Disable these configs. > The list of boards was generated with the following command: > > $ tools/qconfig.py -f SPL SPL_FS_FAT ~SPL_MMC ~SPL_BLK_FS ~SPL_SATA \ > ~SPL_USB_STORAGE ~ENV_IS_IN_FAT ~EFI > > LIBDISK was left enabled for the am* boards, since it seems to result in > actual size reduction, indicating that partitions are being used for > something. > > Signed-off-by: Sean Anderson <seanga2@gmail.com> > --- > > Changes in v7: > - Disable FS_FAT for the zynq(mp) boards as well, as suggested by Michal > > Changes in v6: > - New > > configs/am335x_evm_spiboot_defconfig | 2 +- > configs/am65x_evm_r5_usbdfu_defconfig | 1 - > configs/xilinx_zynqmp_mini_qspi_defconfig | 3 ++- > configs/zynq_cse_nand_defconfig | 2 ++ > configs/zynq_cse_nor_defconfig | 2 ++ > configs/zynq_cse_qspi_defconfig | 2 ++ > 6 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig > index b5b11fb62c8..fff5265e56a 100644 > --- a/configs/am335x_evm_spiboot_defconfig > +++ b/configs/am335x_evm_spiboot_defconfig > @@ -13,6 +13,7 @@ CONFIG_CLOCK_SYNTHESIZER=y > # CONFIG_OF_LIBFDT_OVERLAY is not set > # CONFIG_SPL_MMC is not set > CONFIG_SPL=y > +# CONFIG_SPL_FS_FAT is not set > CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI=y > CONFIG_TIMESTAMP=y > @@ -27,7 +28,6 @@ CONFIG_SPL_SYS_MALLOC=y > CONFIG_SPL_SYS_MALLOC_SIZE=0x800000 > CONFIG_SPL_FIT_IMAGE_TINY=y > # CONFIG_SPL_FS_EXT4 is not set > -CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img" > CONFIG_SPL_MTD=y > # CONFIG_SPL_NAND_SUPPORT is not set > CONFIG_SPL_DM_SPI_FLASH=y > diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig > index f610b2dd94e..6b0bb120d10 100644 > --- a/configs/am65x_evm_r5_usbdfu_defconfig > +++ b/configs/am65x_evm_r5_usbdfu_defconfig > @@ -21,7 +21,6 @@ CONFIG_SPL_DRIVERS_MISC=y > CONFIG_SPL_STACK_R_ADDR=0x82000000 > CONFIG_SPL_SIZE_LIMIT=0x7ec00 > CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x2000 > -CONFIG_SPL_FS_FAT=y > CONFIG_SPL_LIBDISK_SUPPORT=y > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > CONFIG_SPL_LOAD_FIT=y > diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig > index a1adfb9e5d1..b044743474d 100644 > --- a/configs/xilinx_zynqmp_mini_qspi_defconfig > +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig > @@ -11,6 +11,8 @@ CONFIG_ENV_SIZE=0x80 > CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi" > CONFIG_SPL_STACK=0xfffffffc > CONFIG_SPL=y > +# CONFIG_SPL_FS_FAT is not set > +# CONFIG_SPL_LIBDISK_SUPPORT is not set > CONFIG_SYS_MEM_RSVD_FOR_MMU=y > CONFIG_ZYNQMP_NO_DDR=y > # CONFIG_PSCI_RESET is not set > @@ -89,7 +91,6 @@ CONFIG_SPI_FLASH_WINBOND=y > CONFIG_ARM_DCC=y > CONFIG_SPI=y > CONFIG_ZYNQMP_GQSPI=y > -# CONFIG_FAT_WRITE is not set > CONFIG_PANIC_HANG=y > # CONFIG_GZIP is not set > # CONFIG_LMB is not set > diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig > index 19f653f40d0..2eb45e1242e 100644 > --- a/configs/zynq_cse_nand_defconfig > +++ b/configs/zynq_cse_nand_defconfig > @@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" > CONFIG_SPL_STACK_R_ADDR=0x200000 > CONFIG_SPL_STACK=0xfffffe00 > CONFIG_SPL=y > +# CONFIG_SPL_FS_FAT is not set > +# CONFIG_SPL_LIBDISK_SUPPORT is not set > CONFIG_SYS_LOAD_ADDR=0x0 > CONFIG_REMAKE_ELF=y > CONFIG_SYS_CUSTOM_LDSCRIPT=y > diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig > index 64df1f0b83e..c5a28f28b9d 100644 > --- a/configs/zynq_cse_nor_defconfig > +++ b/configs/zynq_cse_nor_defconfig > @@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" > CONFIG_SPL_STACK_R_ADDR=0x200000 > CONFIG_SPL_STACK=0xfffffe00 > CONFIG_SPL=y > +# CONFIG_SPL_FS_FAT is not set > +# CONFIG_SPL_LIBDISK_SUPPORT is not set > CONFIG_SYS_LOAD_ADDR=0x0 > CONFIG_REMAKE_ELF=y > CONFIG_SYS_CUSTOM_LDSCRIPT=y > diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig > index 9368fb4ffbc..9a2770af20e 100644 > --- a/configs/zynq_cse_qspi_defconfig > +++ b/configs/zynq_cse_qspi_defconfig > @@ -16,6 +16,8 @@ CONFIG_SPL_STACK=0xfffffe00 > CONFIG_SPL=y > CONFIG_DEBUG_UART_BASE=0x0 > CONFIG_DEBUG_UART_CLOCK=0 > +# CONFIG_SPL_FS_FAT is not set > +# CONFIG_SPL_LIBDISK_SUPPORT is not set > # CONFIG_ZYNQ_DDRC_INIT is not set > # CONFIG_CMD_ZYNQ is not set > CONFIG_SYS_LOAD_ADDR=0x0 Reviewed-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index b5b11fb62c8..fff5265e56a 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -13,6 +13,7 @@ CONFIG_CLOCK_SYNTHESIZER=y # CONFIG_OF_LIBFDT_OVERLAY is not set # CONFIG_SPL_MMC is not set CONFIG_SPL=y +# CONFIG_SPL_FS_FAT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_TIMESTAMP=y @@ -27,7 +28,6 @@ CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_SYS_MALLOC_SIZE=0x800000 CONFIG_SPL_FIT_IMAGE_TINY=y # CONFIG_SPL_FS_EXT4 is not set -CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img" CONFIG_SPL_MTD=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_DM_SPI_FLASH=y diff --git a/configs/am65x_evm_r5_usbdfu_defconfig b/configs/am65x_evm_r5_usbdfu_defconfig index f610b2dd94e..6b0bb120d10 100644 --- a/configs/am65x_evm_r5_usbdfu_defconfig +++ b/configs/am65x_evm_r5_usbdfu_defconfig @@ -21,7 +21,6 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_SIZE_LIMIT=0x7ec00 CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x2000 -CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL_LOAD_FIT=y diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index a1adfb9e5d1..b044743474d 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -11,6 +11,8 @@ CONFIG_ENV_SIZE=0x80 CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi" CONFIG_SPL_STACK=0xfffffffc CONFIG_SPL=y +# CONFIG_SPL_FS_FAT is not set +# CONFIG_SPL_LIBDISK_SUPPORT is not set CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_ZYNQMP_NO_DDR=y # CONFIG_PSCI_RESET is not set @@ -89,7 +91,6 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_ARM_DCC=y CONFIG_SPI=y CONFIG_ZYNQMP_GQSPI=y -# CONFIG_FAT_WRITE is not set CONFIG_PANIC_HANG=y # CONFIG_GZIP is not set # CONFIG_LMB is not set diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index 19f653f40d0..2eb45e1242e 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK=0xfffffe00 CONFIG_SPL=y +# CONFIG_SPL_FS_FAT is not set +# CONFIG_SPL_LIBDISK_SUPPORT is not set CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_REMAKE_ELF=y CONFIG_SYS_CUSTOM_LDSCRIPT=y diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 64df1f0b83e..c5a28f28b9d 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -13,6 +13,8 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_SPL_STACK=0xfffffe00 CONFIG_SPL=y +# CONFIG_SPL_FS_FAT is not set +# CONFIG_SPL_LIBDISK_SUPPORT is not set CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_REMAKE_ELF=y CONFIG_SYS_CUSTOM_LDSCRIPT=y diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index 9368fb4ffbc..9a2770af20e 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -16,6 +16,8 @@ CONFIG_SPL_STACK=0xfffffe00 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x0 CONFIG_DEBUG_UART_CLOCK=0 +# CONFIG_SPL_FS_FAT is not set +# CONFIG_SPL_LIBDISK_SUPPORT is not set # CONFIG_ZYNQ_DDRC_INIT is not set # CONFIG_CMD_ZYNQ is not set CONFIG_SYS_LOAD_ADDR=0x0
Several boards enable SPL_FS_FAT and SPL_LIBDISK_SUPPORT when they can't be used (as there is no block device support enabled). Disable these configs. The list of boards was generated with the following command: $ tools/qconfig.py -f SPL SPL_FS_FAT ~SPL_MMC ~SPL_BLK_FS ~SPL_SATA \ ~SPL_USB_STORAGE ~ENV_IS_IN_FAT ~EFI LIBDISK was left enabled for the am* boards, since it seems to result in actual size reduction, indicating that partitions are being used for something. Signed-off-by: Sean Anderson <seanga2@gmail.com> --- Changes in v7: - Disable FS_FAT for the zynq(mp) boards as well, as suggested by Michal Changes in v6: - New configs/am335x_evm_spiboot_defconfig | 2 +- configs/am65x_evm_r5_usbdfu_defconfig | 1 - configs/xilinx_zynqmp_mini_qspi_defconfig | 3 ++- configs/zynq_cse_nand_defconfig | 2 ++ configs/zynq_cse_nor_defconfig | 2 ++ configs/zynq_cse_qspi_defconfig | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-)