Update XU4 u-boot configuration

This commit is contained in:
zador-blood-stained 2016-10-25 18:07:02 +03:00
parent ab6c0d1341
commit 13a25fefd4
4 changed files with 34 additions and 19 deletions

View File

@ -1,3 +1,2 @@
kerneladdr=0x40800000
initrdaddr=0x42000000
ftdaddr=0x44000000
verbosity=1
console=both

View File

@ -1,25 +1,37 @@
# a boot script for U-Boot / Odroid XU4
# DO NOT EDIT THIS FILE
#
# It requires a list of environment variables to be defined before load (in includes files uboot/.../exy*.h):
# platform dependent: boardname, fdtfile, console
# system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype
# Please edit /boot/armbianEnv.txt to set supported parameters
#
setenv load_addr "0x44000000"
setenv kerneladdr "0x40800000"
setenv initrdaddr "0x42000000"
setenv ftdaddr "0x44000000"
# default values (configurable)
setenv rootdev "/dev/mmcblk1p1"
setenv load_addr 0x44000000
setenv consolecfg "console=tty1 console=ttySAC2,115200n8"
setenv rootfstype "ext4"
setenv console "both"
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;
load mmc ${mmcbootdev}:${mmcbootpart} ${ftdaddr} /boot/dtb/exynos5422-odroidxu4.dtb;
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttySAC2,115200n8"; fi
bootz ${kerneladdr} ${initrdaddr} ${ftdaddr};
setenv bootargs "${consoleargs} root=${rootdev} rootfstype=${rootfstype} rootwait earlyprintk panic=10 consoleblank=0 enforcing=0 loglevel=${verbosity} ${extraargs}"
# Environment variables to be defined before load (in includes files uboot/.../exy*.h):
# platform dependent: boardname, fdtfile
# system dependent: mmcbootdev, mmcbootpart
load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} /boot/zImage || load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} zImage
load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} /boot/uInitrd || load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} uInitrd
load mmc ${mmcbootdev}:${mmcbootpart} ${ftdaddr} /boot/dtb/exynos5422-odroidxu4.dtb || load mmc ${mmcbootdev}:${mmcbootpart} ${ftdaddr} dtb/exynos5422-odroidxu4.dtb
bootz ${kerneladdr} ${initrdaddr} ${ftdaddr}
# Generate boot.scr:
# mkimage -c none -A arm -T script -d boot.cmd boot.scr

View File

@ -14,13 +14,12 @@ case $BRANCH in
KERNELBRANCH='branch:odroidxu3-3.10.y'
KERNELDIR='linux-odroidxu4'
UBOOT_NEEDS_GCC='< 4.9'
;;
next)
BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
BOOTBRANCH='tag:v2016.05'
BOOTCONFIG=odroid-xu4_defconfig
BOOTBRANCH='tag:v2016.09'
BOOTCONFIG=odroid-xu3_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'

View File

@ -97,10 +97,15 @@ if [[ $RELEASE == trusty || $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; e
# temporary hacks/overrides
case $LINUXFAMILY in
sun*i)
# 2016.07 compilation fails due to GCC bug
# 2016.07+ compilation fails due to GCC bug
# works on Linaro 5.3.1, fails on Ubuntu 5.3.1
UBOOT_NEEDS_GCC='< 5.3'
;;
# also affects XU4 next branch
odroidxu4)
[[ $BRANCH == next ]] && UBOOT_NEEDS_GCC='< 5.3'
;;
esac
# Essential packages