Skip to contentSkip to conversation

configs: sama5d2_xplained: set default FAT env location to SD-Card

PATCH New Eugen Hristev 2 participants 4 messages May 11, 2018 – May 24, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 configs: sama5d2_xplained: set default FAT env location to SD-Card

For sama5d2_xplained_mmc_defconfig, we have the following layout for SD-Card:
partition 1: FAT: contains bootstrap binary (second level bootloader), U-boot, U-boot env, kernel, dtb
partition 2: EXT4: Rootfs.

Add to defconfig CONFIG_ENV_FAT_DEVICE_AND_PART to have environment by default on SD-Card, to align with our demo layout.

---
 configs/sama5d2_xplained_mmc_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/sama5d2_xplained_mmc_defconfig +1 -0
index 066fdb3..b5233a6 100644
@@ -39,6 +39,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_ENV_IS_IN_FAT=y
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:1"
 CONFIG_DM=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 configs: sama5d2_xplained: fix bootcmd/args for spi+emmc demo

For sama5d2_xplained_spiflash_defconfig, we have the demo layout as presented on this link:
http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d2XplainedMainPage#SPI_eMMC_Flash_demo_Memory_map

on SPI Flash (4 Mbyte) we have Bootstrap (second level bootloader), U-boot + env

and kernel+dtb we keep on eMMC on single partition in /boot directory, formatted with ext4.

Thus, changing the boot command to reflect this demo for the spiflash config, and fixing up bootargs. Sama5d2_xplained does not have NAND flash, so the bootargs were completely wrong.

Fixes "5abc1a45": common: Move CONFIG_BOOTARGS to Kconfig
---
 configs/sama5d2_xplained_spiflash_defconfig | 2 +-
 include/configs/sama5d2_xplained.h          | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
configs/sama5d2_xplained_spiflash_defconfig +1 -1
index 87bca1f..b43270a 100644
@@ -18,7 +18,7 @@ CONFIG_FIT=y
 CONFIG_SPI_BOOT=y
 CONFIG_BOOTDELAY=3
 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) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_HUSH_PARSER=y
include/configs/sama5d2_xplained.h +9 -0
index f70ca83..b205d8d 100644
@@ -43,6 +43,15 @@
 				"fatload mmc 1:1 0x22000000 zImage; " \
 				"bootz 0x22000000 - 0x21000000"
 
+#elif CONFIG_SPI_BOOT
+
+/* bootstrap + u-boot + env in sd card, but kernel + dtb in eMMC */
+#undef CONFIG_BOOTCOMMAND
+
+#define CONFIG_BOOTCOMMAND	"ext4load mmc 0:1 0x21000000 /boot/at91-sama5d2_xplained.dtb; " \
+				"ext4load mmc 0:1 0x22000000 /boot/zImage; " \
+				"bootz 0x22000000 - 0x21000000"
+
 #endif
 
 /* SPL */
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 configs: sama5d2_xplained: fix bootcmd/args for spi+emmc demo

Quoted 9 lines · Eugen Hristev

For sama5d2_xplained_spiflash_defconfig, we have the demo layout as presented on this link:
http://www.at91.com/linux4sam/bin/view/Linux4SAM/Sama5d2XplainedMainPage#SPI_eMMC_Flash_demo_Memory_map

on SPI Flash (4 Mbyte) we have Bootstrap (second level bootloader), U-boot + env

and kernel+dtb we keep on eMMC on single partition in /boot directory, formatted with ext4.

Quoted 6 lines

Thus, changing the boot command to reflect this demo for the spiflash config, and fixing up bootargs. Sama5d2_xplained does not have NAND flash, so the bootargs were completely wrong.

Fixes "5abc1a45": common: Move CONFIG_BOOTARGS to Kconfig

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/98481c0a/attachment.sig>
#3 lore raw

PATCH 1/2 configs: sama5d2_xplained: set default FAT env location to SD-Card

In reply to Eugen Hristev
Quoted 9 lines · Eugen Hristev

For sama5d2_xplained_mmc_defconfig, we have the following layout for SD-Card:
partition 1: FAT: contains bootstrap binary (second level bootloader), U-boot, U-boot env, kernel, dtb
partition 2: EXT4: Rootfs.

Add to defconfig CONFIG_ENV_FAT_DEVICE_AND_PART to have environment by default on SD-Card, to align with our demo layout.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180524/0ce0e764/attachment.sig>