diff options
| author | Petr Štetiar <ynezz@true.cz> | 2021-02-14 23:22:55 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2021-02-14 23:28:07 +0100 |
| commit | be0192edb8ebd6673f0c03de0b0e8adea63e9732 (patch) | |
| tree | 56ea3f783e12d06e69cf2f8861f1ec19e5e2c95a /package/boot/uboot-imx6 | |
| parent | 4894a3ff2870438cf812d88704c92c8d997a69db (diff) | |
| download | upstream-be0192edb8ebd6673f0c03de0b0e8adea63e9732.tar.gz upstream-be0192edb8ebd6673f0c03de0b0e8adea63e9732.tar.bz2 upstream-be0192edb8ebd6673f0c03de0b0e8adea63e9732.zip | |
Revert "uboot-imx6: bump to 2021.01 release"
This reverts commit 50a5a8993d15fe090fdbf10fc25aba3f78c47d40 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>
Diffstat (limited to 'package/boot/uboot-imx6')
3 files changed, 24 insertions, 11 deletions
diff --git a/package/boot/uboot-imx6/Makefile b/package/boot/uboot-imx6/Makefile index 549bebb7d2..79acd4abf7 100644 --- a/package/boot/uboot-imx6/Makefile +++ b/package/boot/uboot-imx6/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2021.01 +PKG_VERSION:=2020.04 PKG_RELEASE:=1 -PKG_HASH:=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454 +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 8f8026faf9..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 @@ -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> Date: Sun, 1 Mar 2020 22:47:31 +0100 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 +++++ 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 +++ b/configs/apalis_imx6_defconfig -@@ -46,6 +46,7 @@ CONFIG_CMD_I2C=y - # CONFIG_CMD_LOADB is not set - # CONFIG_CMD_LOADS is not set +@@ -44,6 +44,7 @@ CONFIG_CMD_GPIO=y + CONFIG_CMD_GPT=y + CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=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_OF_CONTROL=y - CONFIG_ENV_OVERWRITE=y + CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis" +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y - CONFIG_SYS_MMC_ENV_PART=1 + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch new file mode 100644 index 0000000000..9d490ddf7e --- /dev/null +++ b/package/boot/uboot-imx6/patches/110-mx6cuboxi-mmc-fallback.patch @@ -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) |