Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "uboot-imx6: bump to 2021.01 release"

Browse source 
This reverts commit 50a5a8993d as the bump
to 2021.01 unveiled issue with missing swig host tool needed for
mx6cuboxi's SPL.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
Petr Štetiar 2021-02-14 23:22:55 +01:00
parent 4894a3ff28
commit be0192edb8
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/boot/uboot-imx6/Makefile
View file

@ -7,10 +7,10 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=2021.01 PKG_VERSION:=2020.04
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_HASH:=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

16
package/boot/uboot-imx6/patches/0001-apalis_imx6_defconfig-enable-some-useful-commands.patch
View file

@ -1,4 +1,4 @@
From 40fea3f6913086566586ba3a7304e28e670c9455 Mon Sep 17 00:00:00 2001 From 630b39c46b29de1874149c6b2c18c64966a0fabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz> From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Sun, 1 Mar 2020 22:47:31 +0100 Date: Sun, 1 Mar 2020 22:47:31 +0100
Subject: [PATCH] apalis_imx6_defconfig: enable some useful commands Subject: [PATCH] apalis_imx6_defconfig: enable some useful commands
@ -14,26 +14,24 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
configs/apalis_imx6_defconfig | 5 +++++ configs/apalis_imx6_defconfig | 5 +++++
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 1c791ab74846..4d21e9680747 100644
--- a/configs/apalis_imx6_defconfig --- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig
@@ -46,6 +46,7 @@ CONFIG_CMD_I2C=y @@ -44,6 +44,7 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_LOADB is not set CONFIG_CMD_GPT=y
# CONFIG_CMD_LOADS is not set CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y +CONFIG_CMD_PART=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_SDP=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
@@ -58,6 +59,10 @@ CONFIG_CMD_PMIC=y @@ -53,6 +54,10 @@ CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y CONFIG_CMD_REGULATOR=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_ENV_OVERWRITE=y CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
+CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y +CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_FS_GENERIC=y
CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_SYS_MMC_ENV_PART=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y

15
package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch Normal file
View file

@ -0,0 +1,15 @@
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -286,6 +286,12 @@ static void setup_iomux_enet(void)
gpio_free_list_nodev(&desc, 1);
}
+void board_boot_order(u32 *spl_boot_list)
+{
+ spl_boot_list[0] = spl_boot_device();
+ spl_boot_list[1] = BOOT_DEVICE_MMC1;
+}
+
int board_phy_config(struct phy_device *phydev)
{
if (phydev->drv->config)