From 36aef09c8c7b4966bd39d9e356824f37a7523ca9 Mon Sep 17 00:00:00 2001 From: seth-hunter <71946694+seth-hunter@users.noreply.github.com> Date: Sun, 27 Sep 2020 16:49:11 +0000 Subject: [PATCH] Revert removal of armbianEnv.txt load on odroid-xu4 (#2226) Fixes breakage of setting board_name, usbstoragequirks, and extraargs on odroid-xu4 via armbianEnv.txt Co-authored-by: hunter --- config/bootscripts/boot-odroid-xu4.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/bootscripts/boot-odroid-xu4.ini b/config/bootscripts/boot-odroid-xu4.ini index 4dd9c083d..ff78a2a42 100644 --- a/config/bootscripts/boot-odroid-xu4.ini +++ b/config/bootscripts/boot-odroid-xu4.ini @@ -20,6 +20,8 @@ setenv verbosity "1" # To update boot loader on your eMMC use the nand-sata-install tool # run copy_uboot_sd2emmc +if ext4load mmc 0:1 0x44000000 /boot/armbianEnv.txt || fatload mmc 0:1 0x44000000 armbianEnv.txt || ext4load mmc 0:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; fi + if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttySAC2,115200n8 ${consoleargs}"; fi if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi