toolchain: add 4.16.x choice for headers

PATCH New Fabio Estevam 2 participants 7 messages Apr 4, 2018 – Apr 9, 2018

lore

Share & tools

lore

Fabio Estevam

author

2018-04-04 15:34 UTC #0 lore raw

PATCH 1/4 toolchain: add 4.16.x choice for headers

Signed-off-by Fabio Estevam <[email protected]>

---
 toolchain/Config.in                                                  | 5 +++++
 .../toolchain-external/toolchain-external-custom/Config.in.options   | 4 ++++
 2 files changed, 9 insertions(+)

toolchain/Config.in +5 -0

index b33eaffd52..e2ef1e7ef3 100644
@@ -323,10 +323,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "4.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
 	default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 	default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
 	default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13

toolchain/toolchain-external/toolchain-external-custom/Config.in.options +4 -0

index 6c12b1619c..8cc9db6841 100644
@@ -108,6 +108,10 @@ choice
 	    m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
 	    p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16
+	bool "4.16.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_15
 	bool "4.15.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15

Signature · 1 line

2.14.1

Fabio Estevam

author

2018-04-04 15:34 UTC #1 lore raw

PATCH 2/4 linux-headers: bump to 4.16 kernel version

Signed-off-by Fabio Estevam <[email protected]>

---
 package/linux-headers/Config.in.host | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

package/linux-headers/Config.in.host +10 -1

index 2a59e2902a..75f7966e51 100644
@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
-	default BR2_KERNEL_HEADERS_4_15
+	default BR2_KERNEL_HEADERS_4_16
 	help
 	  Select the kernel version to get headers from.

@@ -67,6 +67,10 @@ config BR2_KERNEL_HEADERS_4_15
 	bool "Linux 4.15.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
 
+config BR2_KERNEL_HEADERS_4_16
+	bool "Linux 4.16.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"

@@ -89,6 +93,10 @@ choice
 	  This is used to hide/show some packages that have strict
 	  requirements on the version of kernel headers.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16
+	bool "4.16.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15
 	bool "4.15.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15

@@ -250,4 +258,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.13.16"	if BR2_KERNEL_HEADERS_4_13
 	default "4.14.32"	if BR2_KERNEL_HEADERS_4_14
 	default "4.15.15"	if BR2_KERNEL_HEADERS_4_15
+	default "4.16"		if BR2_KERNEL_HEADERS_4_16
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

Signature · 1 line

2.14.1

Fabio Estevam

author

2018-04-04 15:34 UTC #2 lore raw

PATCH 3/4 linux: bump default to version 4.16

In reply to Fabio Estevam

Signed-off-by Fabio Estevam <[email protected]>

---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

linux/Config.in +2 -2

index d9c5b62863..d52af66e5c 100644
@@ -26,7 +26,7 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.15)"
+	bool "Latest version (4.16)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	bool "Latest CIP SLTS version (v4.4.112-cip18)"

@@ -116,7 +116,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.15.15" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.16" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.4.112-cip18" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION

Signature · 1 line

2.14.1

Thomas Petazzoni

2018-04-04 15:39 UTC #3 lore raw

PATCH 3/4 linux: bump default to version 4.16

Hello,

Quoted 4 lines · Fabio Estevam

Signed-off-by Fabio Estevam <[email protected]>
---
 linux/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

A series from Bernd has already been sent to do this, and it is actually a bit more complete, because it takes into account the fact that Linux 4.16 now requires host-bison and host-flex.

See http://patchwork.ozlabs.org/project/buildroot/list/?series=36984

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Fabio Estevam

author

2018-04-05 00:19 UTC #4 lore raw

PATCH 3/4 linux: bump default to version 4.16

Hi Thomas,

Quoted 5 lines · Thomas Petazzoni

A series from Bernd has already been sent to do this, and it is actually a bit more complete, because it takes into account the fact that Linux 4.16 now requires host-bison and host-flex.
See http://patchwork.ozlabs.org/project/buildroot/list/?series=36984

Ok, great. I will resend only patch 4/4 after Bernd's series get applied.

Thanks

Fabio Estevam

author

2018-04-04 15:34 UTC #5 lore raw

PATCH 4/4 configs/wandboard: Bump to kernel 4.16

In reply to Fabio Estevam

Signed-off-by Fabio Estevam <[email protected]>

---
 configs/wandboard_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

configs/wandboard_defconfig +3 -3

index b43c0c0e13..1d249c4cb2 100644
@@ -3,8 +3,8 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+# Linux headers same as kernel, a 4.16 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"

@@ -19,7 +19,7 @@ BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1 imx6q-wandboard-revd1 imx6dl-wandboard-revd1 imx6qp-wandboard-revd1"

Signature · 1 line

2.14.1

Thomas Petazzoni

Applied

2018-04-09 19:23 UTC #6 lore raw

PATCH 4/4 configs/wandboard: Bump to kernel 4.16

Hello,

Quoted 4 lines · Fabio Estevam

Signed-off-by Fabio Estevam <[email protected]>
---
 configs/wandboard_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com