[Buildroot] [git commit] board/atmel: provide u-boot env for at91sam9x5ek_mmc
From: Thomas Petazzoni <hidden>
Date: 2017-06-21 19:23:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=8c28677ea1bdb603f6162253b092da7ea5a47676 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Default bootargs have changed in U-Boot for this board. Build U-Boot environment and add it to the SD card image to update bootargs. Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> Signed-off-by: Thomas Petazzoni <redacted> --- board/atmel/at91sam9x5ek_mmc/genimage.cfg | 4 ++++ board/atmel/at91sam9x5ek_mmc/uboot-env.txt | 7 +++++++ configs/at91sam9x5ek_mmc_defconfig | 3 +++ configs/at91sam9x5ek_mmc_dev_defconfig | 3 +++ 4 files changed, 17 insertions(+)
diff --git a/board/atmel/at91sam9x5ek_mmc/genimage.cfg b/board/atmel/at91sam9x5ek_mmc/genimage.cfg
index b2be647..7a55266 100644
--- a/board/atmel/at91sam9x5ek_mmc/genimage.cfg
+++ b/board/atmel/at91sam9x5ek_mmc/genimage.cfg@@ -12,6 +12,10 @@ image boot.vfat { "boot.bin", "u-boot.bin" } + + file uboot.env { + image = "uboot-env.bin" + } } size = 16M }
diff --git a/board/atmel/at91sam9x5ek_mmc/uboot-env.txt b/board/atmel/at91sam9x5ek_mmc/uboot-env.txt
new file mode 100644
index 0000000..568e4bc
--- /dev/null
+++ b/board/atmel/at91sam9x5ek_mmc/uboot-env.txt@@ -0,0 +1,7 @@ +bootargs=console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait video=Unknown-1:800x480-16 +bootcmd=fatload mmc 0:1 0x21000000 at91sam9g35ek.dtb; fatload mmc 0:1 0x22000000 zImage; bootz 0x22000000 - 0x21000000 +bootdelay=1 +ethact=gmac0 +stderr=serial +stdin=serial +stdout=serial
diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
index c1c4d67..ed44943 100644
--- a/configs/at91sam9x5ek_mmc_defconfig
+++ b/configs/at91sam9x5ek_mmc_defconfig@@ -33,6 +33,9 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" +BR2_TARGET_UBOOT_ENVIMAGE=y +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image
diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig
index 09482d2..cd266d2 100644
--- a/configs/at91sam9x5ek_mmc_dev_defconfig
+++ b/configs/at91sam9x5ek_mmc_dev_defconfig@@ -95,6 +95,9 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" +BR2_TARGET_UBOOT_ENVIMAGE=y +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image