From ef1706b3df5be86a044566e78c0b002fef175179 Mon Sep 17 00:00:00 2001 From: Guillaume Romagny Date: Tue, 25 Oct 2016 13:43:25 +0200 Subject: [PATCH] Odroid XU4 Armbian based UUID booting (SD card tested) (#510) --- config/bootenv/odroidxu4-next.txt | 3 +++ config/bootscripts/boot-odroid-xu4-next.cmd | 12 ++++++------ config/sources/odroidxu4.conf | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 config/bootenv/odroidxu4-next.txt diff --git a/config/bootenv/odroidxu4-next.txt b/config/bootenv/odroidxu4-next.txt new file mode 100644 index 0000000000..1ee4401800 --- /dev/null +++ b/config/bootenv/odroidxu4-next.txt @@ -0,0 +1,3 @@ +kerneladdr=0x40800000 +initrdaddr=0x42000000 +ftdaddr=0x44000000 diff --git a/config/bootscripts/boot-odroid-xu4-next.cmd b/config/bootscripts/boot-odroid-xu4-next.cmd index f6e3ef3636..180ff46bd5 100644 --- a/config/bootscripts/boot-odroid-xu4-next.cmd +++ b/config/bootscripts/boot-odroid-xu4-next.cmd @@ -1,6 +1,3 @@ - -setenv rootdev "/dev/mmcblk1p1" - # a boot script for U-Boot / Odroid XU4 # # It requires a list of environment variables to be defined before load (in includes files uboot/.../exy*.h): @@ -8,12 +5,15 @@ setenv rootdev "/dev/mmcblk1p1" # system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype # -setenv kerneladdr 0x40800000 -setenv initrdaddr 0x42000000 -setenv ftdaddr 0x44000000 +setenv rootdev "/dev/mmcblk1p1" +setenv load_addr 0x44000000 setenv consolecfg "console=tty1 console=ttySAC2,115200n8" +if load mmc ${mmcbootdev}:${mmcbootpart} ${load_addr} /boot/armbianEnv.txt || load mmc ${mmcbootdev}:${mmcbootpart} ${load_addr} armbianEnv.txt; then + env import -t ${load_addr} ${filesize} +fi + setenv bootargs "${consolecfg} root=${rootdev} rootfstype=${rootfstype} rootwait rw earlyprintk ${opts}"; load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} /boot/zImage; load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} /boot/uInitrd; diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf index 33686785e9..74d354d731 100644 --- a/config/sources/odroidxu4.conf +++ b/config/sources/odroidxu4.conf @@ -23,6 +23,8 @@ case $BRANCH in BOOTCONFIG=odroid-xu4_defconfig UBOOT_FILES="sd_fusing.sh xu4_blobs/bl1.bin.hardkernel xu4_blobs/bl2.bin.hardkernel.1mb_uboot u-boot-dtb.bin xu4_blobs/tzsw.bin.hardkernel" BOOTSCRIPT="boot-odroid-xu4-next.cmd:boot.cmd" + BOOTENV_FILE='odroidxu4-next.txt' + HAS_UUID_SUPPORT=yes KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELBRANCH=$MAINLINE_KERNEL_BRANCH