Skip to contentSkip to conversation

configs/imx6ulpico: Bump kernel and U-Boot

PATCH New Fabio Estevam 2 participants 4 messages Jun 8, 2018 Arm i.MX and Layerscape

lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/2 configs/imx6ulpico: Bump kernel and U-Boot

Bump kernel to version 4.17 and U-Boot to 2018.05.

As the imx_v6_v7_defconfig in 4.17 already selects the CONFIG_CFG80211_WEXT option, the linux.fragment can be simply removed.

---
 board/technexion/imx6ulpico/linux.fragment | 1 -
 configs/imx6ulpico_defconfig               | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 board/technexion/imx6ulpico/linux.fragment
board/technexion/imx6ulpico/linux.fragment deleted +0 -1
deleted file mode 100644
index 892d0cb..0000000
@@ -1 +0,0 @@
-CONFIG_CFG80211_WEXT=y
configs/imx6ulpico_defconfig +4 -5
index 96ac038..69d1a80 100644
@@ -3,8 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.17 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc5"
@@ -15,9 +15,8 @@ BR2_ROOTFS_OVERLAY="board/technexion/imx6ulpico/rootfs_overlay"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/technexion/imx6ulpico/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-pico-hobbit"
 
@@ -37,7 +36,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="pico-imx6ul"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
 # required tools to create the eMMC image
Signature · 1 line
2.7.4
author reviewer
#1 lore raw

PATCH 2/2 configs/imx7dpico: Bump kernel and U-Boot

Bump kernel to version 4.17 and U-Boot to 2018.05.

As the dtb file has been renamed in mainline, make the necessary adjustments in U-Boot environment and also in BR2_LINUX_KERNEL_INTREE_DTS_NAME.

---
 .../patches/uboot/0001-picomx7dname.patch          | 31 ++++++++++++++++++++++
 configs/imx7dpico_defconfig                        | 13 +++++----
 2 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch
board/technexion/imx7dpico/patches/uboot/0001-picomx7dname.patch new file +31 -0
new file mode 100644
index 0000000..33637df
@@ -0,0 +1,31 @@
+From 6d298b0fcacfc555f93864fa45fb612140902388 Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <[email protected]>
+Date: Tue, 5 Jun 2018 22:12:48 -0300
+Subject: [PATCH] pico-imx7d: Adjust the dtb name
+
+Since kernel commit 41bbeadceb03 ("ARM: dts: imx7d-pico-pi: Separate
+into cpu and baseboard dts") the dtb name has changed.
+
+Fix it accordingly.
+
+Signed-off-by: Fabio Estevam <[email protected]>
+---
+ include/configs/pico-imx7d.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
+index b208d7f..d2ffa70 100644
+--- a/include/configs/pico-imx7d.h
++++ b/include/configs/pico-imx7d.h
+@@ -41,7 +41,7 @@
+ 	"console=ttymxc4\0" \
+ 	"fdt_high=0xffffffff\0" \
+ 	"initrd_high=0xffffffff\0" \
+-	"fdt_file=imx7d-pico.dtb\0" \
++	"fdt_file=imx7d-pico-pi.dtb\0" \
+ 	"fdt_addr=0x83000000\0" \
+ 	"ip_dyn=yes\0" \
+ 	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
+-- 
+2.7.4
+
configs/imx7dpico_defconfig +8 -5
index b72d56b..971e402 100644
@@ -3,8 +3,11 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# Linux headers same as kernel, a 4.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+# patches
+BR2_GLOBAL_PATCH_DIR="board/technexion/imx7dpico/patches"
+
+# Linux headers same as kernel, a 4.17 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
@@ -12,16 +15,16 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico-pi"
 
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
 # required tools to create the eMMC image
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 configs/imx7dpico: Bump kernel and U-Boot

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Estevam <[email protected]> writes:

Bump kernel to version 4.17 and U-Boot to 2018.05.
As the dtb file has been renamed in mainline, make the necessary adjustments in U-Boot environment and also in BR2_LINUX_KERNEL_INTREE_DTS_NAME.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 configs/imx6ulpico: Bump kernel and U-Boot

In reply to Fabio Estevam
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabio" == Fabio Estevam <[email protected]> writes:

Bump kernel to version 4.17 and U-Boot to 2018.05. As the imx_v6_v7_defconfig in 4.17 already selects the CONFIG_CFG80211_WEXT option, the linux.fragment can be simply removed.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard