From 260a225ba4ed9ad50a8442dc3f731af985d45326 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Tue, 14 Apr 2020 23:21:19 +0200 Subject: [PATCH] uboot-imx6: bump to 2020.04 release MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Refreshed all patches, run tested on apalis. Cc: Vladimir Vid Cc: Tim Harvey Cc: Koen Vandeputte Signed-off-by: Petr Å tetiar --- package/boot/uboot-imx6/Makefile | 4 ++-- ...is_imx6_defconfig-enable-some-useful-commands.patch | 6 ++---- .../patches/110-mx6cuboxi-mmc-fallback.patch | 4 ++-- .../111-mx6cuboxi_defconfig-force-mmc-boot.patch | 10 +++++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package/boot/uboot-imx6/Makefile b/package/boot/uboot-imx6/Makefile index 3f6bb1c5de..79acd4abf7 100644 --- a/package/boot/uboot-imx6/Makefile +++ b/package/boot/uboot-imx6/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2020.01 +PKG_VERSION:=2020.04 PKG_RELEASE:=1 -PKG_HASH:=aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 +PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-imx6/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch b/package/boot/uboot-imx6/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch index 18ad2d66d3..10ed918e77 100644 --- a/package/boot/uboot-imx6/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch +++ b/package/boot/uboot-imx6/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch @@ -14,11 +14,9 @@ Signed-off-by: Petr Å tetiar configs/apalis_imx6_defconfig | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig -index 0d11ab53d663..bbb3ec1aa554 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig -@@ -43,6 +43,7 @@ CONFIG_CMD_GPIO=y +@@ -44,6 +44,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y @@ -26,7 +24,7 @@ index 0d11ab53d663..bbb3ec1aa554 100644 CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y -@@ -52,6 +53,10 @@ CONFIG_CMD_PMIC=y +@@ -53,6 +54,10 @@ CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" diff --git a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch index 111e1b9809..9d490ddf7e 100644 --- a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch +++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch @@ -1,7 +1,7 @@ --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c -@@ -292,6 +292,12 @@ static void setup_iomux_enet(void) - udelay(100); +@@ -286,6 +286,12 @@ static void setup_iomux_enet(void) + gpio_free_list_nodev(&desc, 1); } +void board_boot_order(u32 *spl_boot_list) diff --git a/package/boot/uboot-imx6/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch b/package/boot/uboot-imx6/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch index 19b73e3c9f..4c3dc4ce20 100644 --- a/package/boot/uboot-imx6/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch +++ b/package/boot/uboot-imx6/patches/111-mx6cuboxi_defconfig-force-mmc-boot.patch @@ -13,11 +13,11 @@ Signed-off-by: Petr Å tetiar --- a/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig -@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y - CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_TARGET_MX6CUBOXI=y +@@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000 + CONFIG_ENV_OFFSET=0xFE000 + CONFIG_DM_GPIO=y CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_FORCE_MMC_BOOT=y CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_ENV_SIZE=0x2000 - CONFIG_ENV_OFFSET=0xFE000 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_SPL=y -- 2.25.1