configs/mx6cubox: bump Linux and U-Boot versions

remove merged patches

Signed-off-by: Francois Perrad <[email protected]>
Reviewed-by: Fabio Estevam <[email protected]>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>

diff --git a/board/solidrun/mx6cubox/patches/uboot/0001-mx6cuboxi-Fix-the-mmc-device-for-the-rootfs.patch b/board/solidrun/mx6cubox/patches/uboot/0001-mx6cuboxi-Fix-the-mmc-device-for-the-rootfs.patch
deleted file mode 100644 (file)
index b9755a0..0000000
--- a/board/solidrun/mx6cubox/patches/uboot/0001-mx6cuboxi-Fix-the-mmc-device-for-the-rootfs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 96db7c072b96f9b7a1d9a986eff20353f7459004 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <[email protected]>
-Date: Sun, 18 Jul 2021 19:08:36 -0300
-Subject: [PATCH] mx6cuboxi: Fix the mmc device for the rootfs
-
-After the comversion to DM_MMC, the rootfs is mmc 1, so
-adjust it accordingly.
-
-Signed-off-by: Fabio Estevam <[email protected]>
----
- include/configs/mx6cuboxi.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
-index 55717c77ab38..1a06f29b8c17 100644
---- a/include/configs/mx6cuboxi.h
-+++ b/include/configs/mx6cuboxi.h
-@@ -57,7 +57,7 @@
-       "console=" CONSOLE_DEV ",115200\0" \
-       "bootm_size=0x10000000\0" \
-       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
--      "finduuid=part uuid mmc 0:1 uuid\0" \
-+      "finduuid=part uuid mmc 1:1 uuid\0" \
-       "update_sd_firmware=" \
-               "if test ${ip_dyn} = yes; then " \
-                       "setenv get_cmd dhcp; " \
--- 
-2.25.1
-

diff --git a/board/solidrun/mx6cubox/patches/uboot/0002-mx6cuboxi-Fix-the-console-variable.patch b/board/solidrun/mx6cubox/patches/uboot/0002-mx6cuboxi-Fix-the-console-variable.patch
deleted file mode 100644 (file)
index c021341..0000000
--- a/board/solidrun/mx6cubox/patches/uboot/0002-mx6cuboxi-Fix-the-console-variable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab1dd9332c379164925aee755a013dbd8839501b Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <[email protected]>
-Date: Mon, 19 Jul 2021 16:48:07 -0300
-Subject: [PATCH 2/2] mx6cuboxi: Fix the console variable
-
-Do not pass the console baudrate to the 'console' variable
-to avoid the baudrate being passed twice when using extlinux.conf:
-
-cat /proc/cmdline
-root=PARTUUID=00000000-01 rootwait rw console=ttymxc0,115200,115200
-
-Signed-off-by: Fabio Estevam <[email protected]>
----
- include/configs/mx6cuboxi.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
-index 1a06f29b8c17..9e5083b0d876 100644
---- a/include/configs/mx6cuboxi.h
-+++ b/include/configs/mx6cuboxi.h
-@@ -38,7 +38,6 @@
- /* Command definition */
- 
- #define CONFIG_MXC_UART_BASE  UART1_BASE
--#define CONSOLE_DEV   "ttymxc0"
- 
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
-@@ -54,7 +53,7 @@
-       "ramdiskaddr=0x13000000\0" \
-       "initrd_high=0xffffffff\0" \
-       "ip_dyn=yes\0" \
--      "console=" CONSOLE_DEV ",115200\0" \
-+      "console=ttymxc0\0" \
-       "bootm_size=0x10000000\0" \
-       "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "finduuid=part uuid mmc 1:1 uuid\0" \
--- 
-2.25.1
-

diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig
index 60bfd17092b87f1fcb746c76f3d87fba3cdfcb8f..d0ce2f9a6d7b5c3a939dee54dc47c469a249e7b1 100644 (file)
--- a/configs/mx6cubox_defconfig
+++ b/configs/mx6cubox_defconfig
@@ -13,12 +13,11 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_OVERLAY="board/solidrun/mx6cubox/rootfs_overlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_GLOBAL_PATCH_DIR="board/solidrun/mx6cubox/patches"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.48"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.70"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15"
@@ -33,7 +32,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi"
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y