[PATCH 0/4] configs: evb-ast2500: defconfig adjustments
Hello,
Here are small adjustments to the evb-ast2500 defconfig to match the flash layout of openbmc/upstream Linux. With these, one can boot a system from a flash image containing an upstream U-Boot, an upstream kernel and an upstream buildroot using the default configs provided by each component.
Thanks,
C.
Cédric Le Goater (4): configs: evb-ast2500: Remove MMC support from default settings configs: evb-ast2500: Adjust boot command configs: evb-ast2500: Add support for FIT format configs: evb-ast2500: Set environment in SPI flash
configs/evb-ast2500_defconfig | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
This saves ~50K in the resulting u-boot.bin file which is important to fit in the U-Boot partition defined in the flash layout of upstream Linux.
Signed-off-by: Cédric Le Goater clg@kaod.org --- configs/evb-ast2500_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 500c85b8d500..ad0feeb71df5 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -23,7 +23,7 @@ CONFIG_SYS_PBSIZE=276 CONFIG_CMD_EEPROM=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y +# CONFIG_CMD_MMC is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_MII=y @@ -38,8 +38,7 @@ CONFIG_ASPEED_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_ASPEED=y CONFIG_I2C_EEPROM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_ASPEED=y +# CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_GIGADEVICE=y
On Wed, 26 Oct 2022 at 13:11, Cédric Le Goater clg@kaod.org wrote:
This saves ~50K in the resulting u-boot.bin file which is important to fit in the U-Boot partition defined in the flash layout of upstream Linux.
The downside is we stop testing it builds for ast2500. I guess as long as it's being built for the 2600 that's okay?
Signed-off-by: Cédric Le Goater clg@kaod.org
configs/evb-ast2500_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 500c85b8d500..ad0feeb71df5 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -23,7 +23,7 @@ CONFIG_SYS_PBSIZE=276 CONFIG_CMD_EEPROM=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y +# CONFIG_CMD_MMC is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_MII=y @@ -38,8 +38,7 @@ CONFIG_ASPEED_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_ASPEED=y CONFIG_I2C_EEPROM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_ASPEED=y +# CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_GIGADEVICE=y -- 2.37.3
On 10/27/22 08:39, Joel Stanley wrote:
On Wed, 26 Oct 2022 at 13:11, Cédric Le Goater clg@kaod.org wrote:
This saves ~50K in the resulting u-boot.bin file which is important to fit in the U-Boot partition defined in the flash layout of upstream Linux.
The downside is we stop testing it builds for ast2500. I guess as long as it's being built for the 2600 that's okay?
We can not have both MMC and FIT in the same build because of the size of the U-Boot partition. FIT is required to boot.
C.
Signed-off-by: Cédric Le Goater clg@kaod.org
configs/evb-ast2500_defconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 500c85b8d500..ad0feeb71df5 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -23,7 +23,7 @@ CONFIG_SYS_PBSIZE=276 CONFIG_CMD_EEPROM=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y +# CONFIG_CMD_MMC is not set CONFIG_CMD_DHCP=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_MII=y @@ -38,8 +38,7 @@ CONFIG_ASPEED_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_ASPEED=y CONFIG_I2C_EEPROM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_ASPEED=y +# CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_GIGADEVICE=y -- 2.37.3
On Wed, Oct 26, 2022 at 03:11:12PM +0200, Cédric Le Goater wrote:
This saves ~50K in the resulting u-boot.bin file which is important to fit in the U-Boot partition defined in the flash layout of upstream Linux.
Signed-off-by: Cédric Le Goater clg@kaod.org
Applied to u-boot/master, thanks!
Loading a kernel image is enough.
Signed-off-by: Cédric Le Goater clg@kaod.org --- configs/evb-ast2500_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index ad0feeb71df5..8646e6944803 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -13,7 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x83000000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="bootm 20080000 20300000" +CONFIG_BOOTCOMMAND="bootm 20080000" CONFIG_PRE_CONSOLE_BUFFER=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_HUSH_PARSER=y
On Wed, 26 Oct 2022 at 13:11, Cédric Le Goater clg@kaod.org wrote:
Loading a kernel image is enough.
Signed-off-by: Cédric Le Goater clg@kaod.org
Reviewed-by: Joel Stanley joel@jms.id.au
configs/evb-ast2500_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index ad0feeb71df5..8646e6944803 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -13,7 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x83000000 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="bootm 20080000 20300000" +CONFIG_BOOTCOMMAND="bootm 20080000" CONFIG_PRE_CONSOLE_BUFFER=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_HUSH_PARSER=y -- 2.37.3
On Wed, Oct 26, 2022 at 03:11:13PM +0200, Cédric Le Goater wrote:
Loading a kernel image is enough.
Signed-off-by: Cédric Le Goater clg@kaod.org Reviewed-by: Joel Stanley joel@jms.id.au
Applied to u-boot/master, thanks!
Signed-off-by: Cédric Le Goater clg@kaod.org --- configs/evb-ast2500_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 8646e6944803..5364b6ac3703 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" CONFIG_PRE_CON_BUF_ADDR=0x1e720000 CONFIG_SYS_LOAD_ADDR=0x83000000 +CONFIG_FIT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" CONFIG_USE_BOOTCOMMAND=y
On Wed, 26 Oct 2022 at 13:11, Cédric Le Goater clg@kaod.org wrote:
Signed-off-by: Cédric Le Goater clg@kaod.org
Reviewed-by: Joel Stanley joel@jms.id.au
configs/evb-ast2500_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 8646e6944803..5364b6ac3703 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" CONFIG_PRE_CON_BUF_ADDR=0x1e720000 CONFIG_SYS_LOAD_ADDR=0x83000000 +CONFIG_FIT=y CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" CONFIG_USE_BOOTCOMMAND=y -- 2.37.3
On Wed, Oct 26, 2022 at 03:11:14PM +0200, Cédric Le Goater wrote:
Signed-off-by: Cédric Le Goater clg@kaod.org Reviewed-by: Joel Stanley joel@jms.id.au
Applied to u-boot/master, thanks!
We now have a SPI flash driver. Let's use it.
Signed-off-by: Cédric Le Goater clg@kaod.org --- configs/evb-ast2500_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 5364b6ac3703..65a7056ebdbf 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -5,7 +5,9 @@ CONFIG_SYS_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_TARGET_EVB_AST2500=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x20000 +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x60000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" CONFIG_PRE_CON_BUF_ADDR=0x1e720000 @@ -31,6 +33,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_NCSI=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y
On Wed, 26 Oct 2022 at 13:11, Cédric Le Goater clg@kaod.org wrote:
We now have a SPI flash driver. Let's use it.
Signed-off-by: Cédric Le Goater clg@kaod.org
Reviewed-by: Joel Stanley joel@jms.id.au
configs/evb-ast2500_defconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig index 5364b6ac3703..65a7056ebdbf 100644 --- a/configs/evb-ast2500_defconfig +++ b/configs/evb-ast2500_defconfig @@ -5,7 +5,9 @@ CONFIG_SYS_TEXT_BASE=0x0 CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_TARGET_EVB_AST2500=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_ENV_SIZE=0x20000 +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x60000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb" CONFIG_PRE_CON_BUF_ADDR=0x1e720000 @@ -31,6 +33,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_NCSI=y CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y -- 2.37.3
On Wed, Oct 26, 2022 at 03:11:15PM +0200, Cédric Le Goater wrote:
We now have a SPI flash driver. Let's use it.
Signed-off-by: Cédric Le Goater clg@kaod.org Reviewed-by: Joel Stanley joel@jms.id.au
Applied to u-boot/master, thanks!
participants (3)
-
Cédric Le Goater -
Joel Stanley -
Tom Rini