diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index e0e4070121..12c4dd654c 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -22,8 +22,9 @@ if [ "$UBOOT_VERSION" = "default" ]; then PKG_SITE="http://www.denx.de/wiki/U-Boot/WebHome" PKG_URL="ftp://ftp.denx.de/pub/u-boot/$PKG_NAME-$PKG_VERSION.tar.bz2" elif [ "$UBOOT_VERSION" = "imx6-cuboxi" ]; then - PKG_VERSION="imx6-e817fa3" + PKG_VERSION="imx6-408544d" PKG_SITE="http://imx.solid-run.com/wiki/index.php?title=Building_the_kernel_and_u-boot_for_the_CuBox-i_and_the_HummingBoard" + # https://github.com/SolidRun/u-boot-imx6.git PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" else exit 0 diff --git a/packages/tools/u-boot/scripts/update.sh b/packages/tools/u-boot/scripts/update.sh index 5821b02373..a9dc9018e4 100755 --- a/packages/tools/u-boot/scripts/update.sh +++ b/packages/tools/u-boot/scripts/update.sh @@ -58,7 +58,7 @@ fi # access boot partition 1 echo 0 > /sys/block/mmcblk0boot0/force_ro # write u-boot to eMMC - dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot-$SYSTEM_TYPE.imx of=/dev/mmcblk0boot0 bs=1k seek=1 conv=fsync + dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot-$SYSTEM_TYPE.imx of=/dev/mmcblk0boot0 bs=1k seek=1 conv=fsync &>/dev/null # re-enable read-only access echo 1 > /sys/block/mmcblk0boot0/force_ro # enable boot partion 1 to boot @@ -80,7 +80,7 @@ fi if [ -f $SYSTEM_ROOT/usr/share/bootloader/$SPL_SRC ]; then echo "*** updating u-boot SPL Blob on: $BOOT_DISK ..." - dd if="$SYSTEM_ROOT/usr/share/bootloader/$SPL_SRC" of="$BOOT_DISK" bs=1k seek=1 conv=fsync + dd if="$SYSTEM_ROOT/usr/share/bootloader/$SPL_SRC" of="$BOOT_DISK" bs=1k seek=1 conv=fsync &>/dev/null fi fi diff --git a/projects/imx6/patches/u-boot/012-hb1-fb-device.patch b/projects/imx6/patches/u-boot/012-hb1-fb-device.patch new file mode 100644 index 0000000000..b088952a82 --- /dev/null +++ b/projects/imx6/patches/u-boot/012-hb1-fb-device.patch @@ -0,0 +1,24 @@ +commit c3b3b538666cfa2a33f231e8ffb7424761f1a638 +Author: Matus Kral +Date: Tue Dec 29 15:43:03 2015 +0100 + + fix for HB1 + +the SR's uboot tree after commit 144b1e90d15f3a94f0c8183827d4f1b93f6f2e68 +is keeping IPU started - what is keeping gfx in 4.x+ kernels from starting + +diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c +index 5c3c080..ca74901 100644 +--- a/arch/arm/imx-common/cpu.c ++++ b/arch/arm/imx-common/cpu.c +@@ -176,5 +176,9 @@ void arch_preboot_os(void) + { + /* disable video before launching O/S */ + ipuv3_fb_shutdown(); ++ ++ struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; ++ setbits_le32(&ccm->analog_pll_video, BM_ANADIG_PLL_VIDEO_POWERDOWN); ++ + } + #endif +