Re: [PATCH v9 8/8] axm/taurus: Disable the SPL_SPI config

2023-12-26 Thread Tom Rini
On Tue, Dec 26, 2023 at 05:14:53PM +0530, Venkatesh Yadav Abbarapu wrote:

> Disabling the CONFIG_SPL_SPI for the axm and taurus defconfigs,
> as facing the SPL size issue "SPL image too big".
> 
> Signed-off-by: Venkatesh Yadav Abbarapu 
> ---
>  board/siemens/taurus/taurus.c | 4 +++-
>  configs/axm_defconfig | 7 ++-
>  configs/taurus_defconfig  | 7 ++-
>  3 files changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
> index ad44a7c0d2..ac1ce8acf4 100644
> --- a/board/siemens/taurus/taurus.c
> +++ b/board/siemens/taurus/taurus.c
> @@ -135,11 +135,12 @@ void spl_board_init(void)
>  
>   /* check for recovery mode */
>   if (at91_is_recovery() == 1) {
> - struct spi_flash *flash;
>  
>   puts("Recovery button pressed\n");
>   nand_init();
>   spl_nand_erase_one(0, 0);
> +#if defined(CONFIG_SPL_SPI)
> + struct spi_flash *flash;
>   flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
>   0,
>   CONFIG_SF_DEFAULT_SPEED,
> @@ -151,6 +152,7 @@ void spl_board_init(void)
>   spi_flash_erase(flash, 0,
>   CFG_SYS_NAND_U_BOOT_SIZE);
>   }
> +#endif
>   }
>  }
>  
> diff --git a/configs/axm_defconfig b/configs/axm_defconfig
> index e1a01b24b8..4d439832d7 100644
> --- a/configs/axm_defconfig
> +++ b/configs/axm_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y
>  CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y
>  CONFIG_SPL_SYS_DCACHE_OFF=y
>  CONFIG_ARCH_CPU_INIT=y
> -CONFIG_SYS_THUMB_BUILD=y
>  # CONFIG_SPL_USE_ARCH_MEMCPY is not set
>  # CONFIG_SPL_USE_ARCH_MEMSET is not set
>  CONFIG_ARCH_AT91=y
> @@ -26,14 +25,14 @@ CONFIG_SPL=y
>  CONFIG_DEBUG_UART_BASE=0xf200
>  CONFIG_DEBUG_UART_CLOCK=18432000
>  CONFIG_ENV_OFFSET_REDUND=0x18
> -CONFIG_SPL_SPI_FLASH_SUPPORT=y
> -CONFIG_SPL_SPI=y
>  CONFIG_SYS_LOAD_ADDR=0x2200
>  CONFIG_DEBUG_UART=y
>  CONFIG_NAND_BOOT=y
>  CONFIG_BOOTDELAY=3
>  CONFIG_USE_BOOTCOMMAND=y
>  CONFIG_BOOTCOMMAND="run flash_self"
> +CONFIG_SYS_CBSIZE=256
> +CONFIG_SYS_PBSIZE=281
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_SPL_MAX_SIZE=0x3e00
> @@ -57,8 +56,6 @@ CONFIG_SPL_NAND_BASE=y
>  CONFIG_SPL_DM_SPI_FLASH=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="U-Boot> "
> -CONFIG_SYS_CBSIZE=256
> -CONFIG_SYS_PBSIZE=281
>  # CONFIG_CMD_BDI is not set
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMI is not set
> diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
> index 9be30c8d8a..7d71262d1a 100644
> --- a/configs/taurus_defconfig
> +++ b/configs/taurus_defconfig
> @@ -4,7 +4,6 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y
>  CONFIG_SPL_SYS_ICACHE_OFF=y
>  CONFIG_SPL_SYS_DCACHE_OFF=y
>  CONFIG_ARCH_CPU_INIT=y
> -CONFIG_SYS_THUMB_BUILD=y
>  # CONFIG_SPL_USE_ARCH_MEMCPY is not set
>  # CONFIG_SPL_USE_ARCH_MEMSET is not set
>  CONFIG_ARCH_AT91=y
> @@ -28,8 +27,6 @@ CONFIG_SPL=y
>  CONFIG_DEBUG_UART_BASE=0xf200
>  CONFIG_DEBUG_UART_CLOCK=18432000
>  CONFIG_ENV_OFFSET_REDUND=0x18
> -CONFIG_SPL_SPI_FLASH_SUPPORT=y
> -CONFIG_SPL_SPI=y
>  CONFIG_SYS_LOAD_ADDR=0x2200
>  CONFIG_DEBUG_UART=y
>  CONFIG_NAND_BOOT=y
> @@ -38,6 +35,8 @@ CONFIG_USE_BOOTARGS=y
>  CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk 
> mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs)
>  root=/dev/mtdblock7 rw rootfstype=jffs2"
>  CONFIG_USE_BOOTCOMMAND=y
>  CONFIG_BOOTCOMMAND="nand read 0x2200 0x20 0x30; bootm"
> +CONFIG_SYS_CBSIZE=256
> +CONFIG_SYS_PBSIZE=281
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_BOARD_EARLY_INIT_F=y
>  CONFIG_SPL_MAX_SIZE=0x3e00
> @@ -61,8 +60,6 @@ CONFIG_SPL_NAND_BASE=y
>  CONFIG_SPL_DM_SPI_FLASH=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_SYS_PROMPT="U-Boot> "
> -CONFIG_SYS_CBSIZE=256
> -CONFIG_SYS_PBSIZE=281
>  # CONFIG_SYS_XTRACE is not set
>  # CONFIG_CMD_BDI is not set
>  CONFIG_CMD_BOOTZ=y

This patch seems wrong. You're disabling thumb (and thumb in SPL) which
increases size and then removing specifically enabled functionality.
Please figure out how to add the functionality you're wanting to add,
but allow it to be disabled so that we have minimal (or if possible, no)
size growth on platforms that can't and won't use that functionality,
thanks.

-- 
Tom


signature.asc
Description: PGP signature


[PATCH v9 8/8] axm/taurus: Disable the SPL_SPI config

2023-12-26 Thread Venkatesh Yadav Abbarapu
Disabling the CONFIG_SPL_SPI for the axm and taurus defconfigs,
as facing the SPL size issue "SPL image too big".

Signed-off-by: Venkatesh Yadav Abbarapu 
---
 board/siemens/taurus/taurus.c | 4 +++-
 configs/axm_defconfig | 7 ++-
 configs/taurus_defconfig  | 7 ++-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index ad44a7c0d2..ac1ce8acf4 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -135,11 +135,12 @@ void spl_board_init(void)
 
/* check for recovery mode */
if (at91_is_recovery() == 1) {
-   struct spi_flash *flash;
 
puts("Recovery button pressed\n");
nand_init();
spl_nand_erase_one(0, 0);
+#if defined(CONFIG_SPL_SPI)
+   struct spi_flash *flash;
flash = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
0,
CONFIG_SF_DEFAULT_SPEED,
@@ -151,6 +152,7 @@ void spl_board_init(void)
spi_flash_erase(flash, 0,
CFG_SYS_NAND_U_BOOT_SIZE);
}
+#endif
}
 }
 
diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index e1a01b24b8..4d439832d7 100644
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y
 CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y
 CONFIG_SPL_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
-CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
@@ -26,14 +25,14 @@ CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xf200
 CONFIG_DEBUG_UART_CLOCK=18432000
 CONFIG_ENV_OFFSET_REDUND=0x18
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0x2200
 CONFIG_DEBUG_UART=y
 CONFIG_NAND_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="run flash_self"
+CONFIG_SYS_CBSIZE=256
+CONFIG_SYS_PBSIZE=281
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_MAX_SIZE=0x3e00
@@ -57,8 +56,6 @@ CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
-CONFIG_SYS_CBSIZE=256
-CONFIG_SYS_PBSIZE=281
 # CONFIG_CMD_BDI is not set
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index 9be30c8d8a..7d71262d1a 100644
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -4,7 +4,6 @@ CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y
 CONFIG_SPL_SYS_ICACHE_OFF=y
 CONFIG_SPL_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
-CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
@@ -28,8 +27,6 @@ CONFIG_SPL=y
 CONFIG_DEBUG_UART_BASE=0xf200
 CONFIG_DEBUG_UART_CLOCK=18432000
 CONFIG_ENV_OFFSET_REDUND=0x18
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
-CONFIG_SPL_SPI=y
 CONFIG_SYS_LOAD_ADDR=0x2200
 CONFIG_DEBUG_UART=y
 CONFIG_NAND_BOOT=y
@@ -38,6 +35,8 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk 
mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs)
 root=/dev/mtdblock7 rw rootfstype=jffs2"
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="nand read 0x2200 0x20 0x30; bootm"
+CONFIG_SYS_CBSIZE=256
+CONFIG_SYS_PBSIZE=281
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL_MAX_SIZE=0x3e00
@@ -61,8 +60,6 @@ CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
-CONFIG_SYS_CBSIZE=256
-CONFIG_SYS_PBSIZE=281
 # CONFIG_SYS_XTRACE is not set
 # CONFIG_CMD_BDI is not set
 CONFIG_CMD_BOOTZ=y
-- 
2.25.1