From 5b1ebb102935123c61bf1e2eedf3f2cd89f535d1 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 10 Jan 2017 13:06:31 -0200 Subject: [PATCH] configs/mx6sx_udoo_neo: Bump to U-Boot 2017.01 Bump to U-Boot 2017.01, which supports mx6sx_udoo_neo by default. Remove the U-Boot patch that we used for the previous version. Also adjust the 'fdtfile' name as it has been changed in U-Boot mainline. [Peter: part 2, boot.scr / defconfig changed accidently got dropped] Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- board/udoo/neo/boot.scr.txt | 2 +- configs/mx6sx_udoo_neo_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/udoo/neo/boot.scr.txt b/board/udoo/neo/boot.scr.txt index f647db3719..7a8aa4bd54 100644 --- a/board/udoo/neo/boot.scr.txt +++ b/board/udoo/neo/boot.scr.txt @@ -2,6 +2,6 @@ setenv finduuid "part uuid mmc 0:1 uuid" run finduuid run findfdt setenv bootargs "console=ttymxc0,115200 root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdt_file} +load mmc 0:1 ${fdt_addr} boot/${fdtfile} load mmc 0:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 1de19c0abb..a465eb974c 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" -- 2.30.2