Skip to contentSkip to conversation

ARM: at91: Allow running SPL with DTB append

PATCH New Gregory CLEMENT 2 participants 4 messages Jun 5, 2020 – Jun 18, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover ARM: at91: Allow running SPL with DTB append

Hello,

a few months ago I submitted a small series allowing to run SPL with DTB append. Indeed according to the linker BSS section was all the time separated for SPL but the symbol SPL_SEPARATE_BSS was only enabled on some boards.

In this v2 the changes are:
- add reviewed-by Stefan Roese <[email protected]>
- modify a new defconfig sama5d3_xplained_nandflash_defconfig

Thanks,

Gregory

Gregory CLEMENT (2):
ARM: at91: Enable SPL_SEPARATE_BSS by default
configs: atmel: cleanup CONFIG_SPL_SEPARATE_BSS

 arch/arm/Kconfig                                | 1 +
 configs/gardena-smart-gateway-at91sam_defconfig | 1 -
 configs/sama5d27_som1_ek_mmc1_defconfig         | 1 -
 configs/sama5d27_som1_ek_mmc_defconfig          | 1 -
 configs/sama5d27_som1_ek_qspiflash_defconfig    | 1 -
 configs/sama5d27_wlsom1_ek_mmc_defconfig        | 1 -
 configs/sama5d27_wlsom1_ek_qspiflash_defconfig  | 1 -
 configs/sama5d2_icp_mmc_defconfig               | 1 -
 configs/sama5d2_xplained_emmc_defconfig         | 1 -
 configs/sama5d2_xplained_mmc_defconfig          | 1 -
 configs/sama5d2_xplained_qspiflash_defconfig    | 1 -
 configs/sama5d3_xplained_mmc_defconfig          | 1 -
 configs/sama5d3xek_mmc_defconfig                | 1 -
 configs/sama5d4_xplained_mmc_defconfig          | 1 -
 configs/sama5d4ek_mmc_defconfig                 | 1 -
 15 files changed, 1 insertion(+), 14 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/2 ARM: at91: Enable SPL_SEPARATE_BSS by default

According to the linker script for both armv7 and arm926ejs based SoC, BSS section was all the time separated for SPL but this symbol was only enabled on some boards. However, it is necessary to have it enabled for OF_SEPARATE configuration where DTB is appended to u-boot with DTB.

---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
index 21df1c415f..3ba7e338b6 100644
@@ -532,6 +532,7 @@ choice
 config ARCH_AT91
 	bool "Atmel AT91"
 	select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
+	select SPL_SEPARATE_BSS if SPL
 
 config TARGET_EDB93XX
 	bool "Support edb93xx"
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/2 configs: atmel: cleanup CONFIG_SPL_SEPARATE_BSS

In reply to Gregory CLEMENT

Now that CONFIG_SPL_SEPARATE_BSS is selected for all the AT91 based boards, cleanups the defconfigs by removing it.

---
 configs/gardena-smart-gateway-at91sam_defconfig | 1 -
 configs/sama5d27_som1_ek_mmc1_defconfig         | 1 -
 configs/sama5d27_som1_ek_mmc_defconfig          | 1 -
 configs/sama5d27_som1_ek_qspiflash_defconfig    | 1 -
 configs/sama5d27_wlsom1_ek_mmc_defconfig        | 1 -
 configs/sama5d27_wlsom1_ek_qspiflash_defconfig  | 1 -
 configs/sama5d2_icp_mmc_defconfig               | 1 -
 configs/sama5d2_xplained_emmc_defconfig         | 1 -
 configs/sama5d2_xplained_mmc_defconfig          | 1 -
 configs/sama5d2_xplained_qspiflash_defconfig    | 1 -
 configs/sama5d3_xplained_mmc_defconfig          | 1 -
 configs/sama5d3xek_mmc_defconfig                | 1 -
 configs/sama5d4_xplained_mmc_defconfig          | 1 -
 configs/sama5d4ek_mmc_defconfig                 | 1 -
 14 files changed, 14 deletions(-)
configs/gardena-smart-gateway-at91sam_defconfig +0 -1
index 79d1cb9a96..8f536734e6 100644
@@ -26,7 +26,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SPL_SEPARATE_BSS=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_HUSH_PARSER=y
configs/sama5d27_som1_ek_mmc1_defconfig +0 -1
index a750ec9e18..417a41980e 100644
@@ -29,7 +29,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d27_som1_ek_mmc_defconfig +0 -1
index 3f22fde026..7aaf2a5c3c 100644
@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d27_som1_ek_qspiflash_defconfig +0 -1
index 2c8ae8d004..726d884983 100644
@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d27_wlsom1_ek_mmc_defconfig +0 -1
index a5fb4f514e..d19089c2e5 100644
@@ -28,7 +28,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DISPLAY_PRINT=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_AT91_MCK_BYPASS=y
configs/sama5d27_wlsom1_ek_qspiflash_defconfig +0 -1
index 92decb4b85..6edfdf5e0a 100644
@@ -29,7 +29,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DISPLAY_PRINT=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_SPI_LOAD=y
configs/sama5d2_icp_mmc_defconfig +0 -1
index dd15441798..0560f6ea19 100644
@@ -26,7 +26,6 @@ CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_DISPLAY_PRINT=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_RAM_SUPPORT=y
configs/sama5d2_xplained_emmc_defconfig +0 -1
index 75d68a76e4..b75af59960 100644
@@ -28,7 +28,6 @@ CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d2_xplained_mmc_defconfig +0 -1
index 779e91a52a..1e8664fe2d 100644
@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d2_xplained_qspiflash_defconfig +0 -1
index 9b5645667d..4f08ba91eb 100644
@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d3_xplained_mmc_defconfig +0 -1
index 76e981dabf..2a08e2bd6e 100644
@@ -28,7 +28,6 @@ CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d3xek_mmc_defconfig +0 -1
index d7f2ebeffd..3a2d5148d3 100644
@@ -30,7 +30,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwai
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
configs/sama5d4_xplained_mmc_defconfig +0 -1
index eaee73ec99..02531f5c2a 100644
@@ -29,7 +29,6 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 CONFIG_MISC_INIT_R=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_FLASH is not set
configs/sama5d4ek_mmc_defconfig +0 -1
index c1c64dd322..4a19911dc8 100644
@@ -30,7 +30,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwai
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMI is not set
Signature · 1 line
2.26.2
#3 lore raw

v2 cover ARM: at91: Allow running SPL with DTB append

In reply to Gregory CLEMENT
Quoted 37 lines · Gregory CLEMENT

Hello,

a few months ago I submitted a small series allowing to run SPL with DTB append. Indeed according to the linker BSS section was all the time separated for SPL but the symbol SPL_SEPARATE_BSS was only enabled on some boards.

In this v2 the changes are:
- add reviewed-by Stefan Roese <[email protected]>
- modify a new defconfig sama5d3_xplained_nandflash_defconfig

Thanks,

Gregory

Gregory CLEMENT (2):
ARM: at91: Enable SPL_SEPARATE_BSS by default
configs: atmel: cleanup CONFIG_SPL_SEPARATE_BSS

  arch/arm/Kconfig                                | 1 +
  configs/gardena-smart-gateway-at91sam_defconfig | 1 -
  configs/sama5d27_som1_ek_mmc1_defconfig         | 1 -
  configs/sama5d27_som1_ek_mmc_defconfig          | 1 -
  configs/sama5d27_som1_ek_qspiflash_defconfig    | 1 -
  configs/sama5d27_wlsom1_ek_mmc_defconfig        | 1 -
  configs/sama5d27_wlsom1_ek_qspiflash_defconfig  | 1 -
  configs/sama5d2_icp_mmc_defconfig               | 1 -
  configs/sama5d2_xplained_emmc_defconfig         | 1 -
  configs/sama5d2_xplained_mmc_defconfig          | 1 -
  configs/sama5d2_xplained_qspiflash_defconfig    | 1 -
  configs/sama5d3_xplained_mmc_defconfig          | 1 -
  configs/sama5d3xek_mmc_defconfig                | 1 -
  configs/sama5d4_xplained_mmc_defconfig          | 1 -
  configs/sama5d4ek_mmc_defconfig                 | 1 -
  15 files changed, 1 insertion(+), 14 deletions(-)
Quoted 3 lines

--
2.26.2

Applied to u-boot-atmel/master,
Thanks!