Commit 260a225b authored by Petr Štetiar's avatar Petr Štetiar
Browse files

uboot-imx6: bump to 2020.04 release



Refreshed all patches, run tested on apalis.

Cc: Vladimir Vid <vladimir.vid@sartura.hr>
Cc: Tim Harvey <tharvey@gateworks.com>
Cc: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: default avatarPetr Štetiar <ynezz@true.cz>
parent 0f1b5ce2
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=2020.01 PKG_VERSION:=2020.04
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_HASH:=aa453c603208b1b27bd03525775a7f79b443adec577fdc6e8f06974025a135f1 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
......
...@@ -14,11 +14,9 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz> ...@@ -14,11 +14,9 @@ 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 0d11ab53d663..bbb3ec1aa554 100644
--- a/configs/apalis_imx6_defconfig --- a/configs/apalis_imx6_defconfig
+++ b/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_GPT=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
...@@ -26,7 +24,7 @@ index 0d11ab53d663..bbb3ec1aa554 100644 ...@@ -26,7 +24,7 @@ index 0d11ab53d663..bbb3ec1aa554 100644
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
@@ -52,6 +53,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_DEFAULT_DEVICE_TREE="imx6-apalis" CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
......
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -292,6 +292,12 @@ static void setup_iomux_enet(void) @@ -286,6 +286,12 @@ static void setup_iomux_enet(void)
udelay(100); gpio_free_list_nodev(&desc, 1);
} }
+void board_boot_order(u32 *spl_boot_list) +void board_boot_order(u32 *spl_boot_list)
......
...@@ -13,11 +13,11 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz> ...@@ -13,11 +13,11 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
--- a/configs/mx6cuboxi_defconfig --- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig +++ b/configs/mx6cuboxi_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y @@ -9,6 +9,7 @@ CONFIG_ENV_SIZE=0x2000
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_OFFSET=0xFE000
CONFIG_TARGET_MX6CUBOXI=y CONFIG_DM_GPIO=y
CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_FORCE_MMC_BOOT=y +CONFIG_SPL_FORCE_MMC_BOOT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ENV_SIZE=0x2000 CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_OFFSET=0xFE000 CONFIG_SPL=y
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment