defconfigs: all use the headers from the kernel

For most defconfigs, it was trivial to deduce the kernel version, by
just reading the version string, which could be:
  - a standard upstream version string vX.Y.Z
  - a non-standard version string, but still containg the standard X.Y.Z

Those for which it was not so trivial were those hosted on git tree.
Since most were already using a custom linux-headers version, it could
be easily deduced from that. It was confirmed by browsing said git trees
and check the version there.

There are a few cases were there was a mismatch:

  - microzed:     uses a 3.18 kernel, but 3.8 headers; fixed.
  - xilinx_zc706: uses a 3.14 kernel, but 3.8 headers; fixed.
  - zedboard:     uses a 3.18 kernel, but 3.8 headers; fixed.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

configs/acmesystems_aria_g25_128mb_defconfig

@@ -1,9 +1,7 @@
 # Architecture
 BR2_arm=y
 
-# Toolchain
+# Linux headers same as kernel, a 4.1 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.1.1"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 
 # Kernel

configs/acmesystems_aria_g25_256mb_defconfig

@@ -1,9 +1,7 @@
 # Architecture
 BR2_arm=y
 
-# Toolchain
+# Linux headers same as kernel, a 4.1 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.1.1"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 
 # Kernel

configs/altera_socdk_defconfig

@@ -6,9 +6,7 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_NEON=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
-# Lock to 3.13 headers
+# Linux headers same as kernel, a 3.13 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.5"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
 
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"

configs/altera_sockit_defconfig

@@ -6,9 +6,7 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_NEON=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
-# Lock to 3.13 headers
+# Linux headers same as kernel, a 3.13 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.13.5"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
 
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y

configs/arm_foundationv8_defconfig

@@ -1,6 +1,5 @@
 BR2_aarch64=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.13 series
-BR2_DEFAULT_KERNEL_VERSION="3.13"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_LINUX_KERNEL=y

configs/armadeus_apf27_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 3.18 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.6"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 # System

configs/armadeus_apf28_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 3.12 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.7"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # System

configs/armadeus_apf51_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_cortex_a8=y
 
-# Lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 3.12 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.6"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # System

configs/armadeus_apf9328_defconfig

@@ -10,10 +10,7 @@ BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
-
+# Linux headers same as kernel, a 3.17 series
-# Lock down headers to avoid breaking with new defaults
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.17"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y
 
 # System

configs/at91sam9260eknf_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Toolchain
+# Linux headers same as kernel, a 3.9 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.9.1"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # System

configs/at91sam9g20dfc_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 3.1 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.1.6"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_1=y
 
 # Host utilities

configs/at91sam9g45m10ek_defconfig

@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_arm926t=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/at91sam9rlek_defconfig

@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_arm926t=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/at91sam9x5ek_defconfig

@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_arm926t=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/atmel_sama5d3_xplained_defconfig

@@ -3,8 +3,7 @@ BR2_cortex_a5=y
 BR2_ARM_EABIHF=y
 BR2_ARM_FPU_VFPV4D16=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/atmel_sama5d3_xplained_mmc_defconfig

@@ -1,11 +1,9 @@
 # Architecture
 BR2_arm=y
 BR2_cortex_a5=y
-
-# Toolchain configuration
 BR2_ARM_EABIHF=y
-BR2_KERNEL_HEADERS_VERSION=y
+
-BR2_DEFAULT_KERNEL_VERSION="3.18.8"
+# Linux headers same as kernel, a 3.18 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 # Kernel configuration

configs/atmel_sama5d3xek_defconfig

@@ -3,8 +3,7 @@ BR2_cortex_a5=y
 BR2_ARM_EABIHF=y
 BR2_ARM_FPU_VFPV4D16=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/atmel_sama5d4_xplained_defconfig

@@ -4,8 +4,7 @@ BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_VFPV4D16=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/atmel_sama5d4ek_defconfig

@@ -4,8 +4,7 @@ BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_VFPV4D16=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/beaglebone_defconfig

@@ -15,9 +15,7 @@ BR2_PACKAGE_AM33X_CM3=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 3.12 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.10"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # bootloader

configs/calao_qil_a9260_defconfig

@@ -2,8 +2,7 @@ BR2_arm=y
 BR2_arm926t=y
 BR2_GLOBAL_PATCH_DIR="board/calao/qil-a9260/patches/"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.4 series
-BR2_DEFAULT_KERNEL_VERSION="3.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y

configs/calao_tny_a9g20_lpw_defconfig

@@ -9,9 +9,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 # filesystem
 BR2_TARGET_ROOTFS_UBIFS=y
 
-# lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 3.9 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.9.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # bootloaders

configs/calao_usb_a9260_defconfig

@@ -1,5 +1,7 @@
 BR2_arm=y
 BR2_arm926t=y
+# Linux headers same as kernel, a 3.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 BR2_PACKAGE_MTD=y
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y

configs/calao_usb_a9263_defconfig

@@ -1,5 +1,7 @@
 BR2_arm=y
 BR2_arm926t=y
+# Linux headers same as kernel, a 3.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y
 BR2_TARGET_AT91BOOTSTRAP=y

configs/calao_usb_a9g20_lpw_defconfig

@@ -1,5 +1,7 @@
 BR2_arm=y
 BR2_arm926t=y
+# Linux headers same as kernel, a 3.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 BR2_GLOBAL_PATCH_DIR="board/calao/usb-a9g20-lpw/patches/"
 BR2_PACKAGE_HOST_SAM_BA=y
 BR2_TARGET_ROOTFS_UBIFS=y

configs/ci20_defconfig

@@ -3,10 +3,10 @@ BR2_mipsel=y
 BR2_mips_32r2=y
 # BR2_MIPS_SOFT_FLOAT is not set
 
-# system
+# Linux headers same as kernel, a 3.18 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+
+# system
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS4"
 
 # kernel

configs/cubieboard2_defconfig

@@ -1,8 +1,7 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 4.3 series
-BR2_DEFAULT_KERNEL_VERSION="4.3.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!"

configs/cubieboard_defconfig

@@ -16,8 +16,8 @@ BR2_PACKAGE_SUNXI_TOOLS=y
 BR2_PACKAGE_SUNXI_BOARDS=y
 BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a10/cubieboard.fex"
 
-# Kernel headers
+# Linux headers same as kernel, a 3.4 series
-BR2_KERNEL_HEADERS_3_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/freescale_imx28evk_defconfig

@@ -2,7 +2,7 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# toolchain
+# Linux headers same as kernel, a 3.19 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_19=y
 
 # system

configs/freescale_imx31_3stack_defconfig

@@ -3,7 +3,7 @@ BR2_arm=y
 BR2_arm1136jf_s_r0=y
 BR2_ARM_EABIHF=y
 
-# toolchain
+# Linux headers same as kernel, a 3.15 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_15=y
 
 # system

configs/freescale_imx6dlsabreauto_defconfig

@@ -5,9 +5,7 @@ BR2_cortex_a9=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# toolchain
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # system

configs/freescale_imx6dlsabresd_defconfig

@@ -5,9 +5,7 @@ BR2_cortex_a9=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# toolchain
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # system

configs/freescale_imx6qsabreauto_defconfig

@@ -5,9 +5,7 @@ BR2_cortex_a9=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# toolchain
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # system

configs/freescale_imx6qsabresd_defconfig

@@ -5,9 +5,7 @@ BR2_cortex_a9=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# toolchain
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # system

configs/freescale_imx6sololiteevk_defconfig

@@ -2,6 +2,9 @@
 BR2_arm=y
 BR2_cortex_a9=y
 
+# Linux headers same as kernel, a 3.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
+
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 

configs/freescale_imx6sxsabresd_defconfig

@@ -5,9 +5,7 @@ BR2_cortex_a9=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# toolchain
+# Linux headers same as kernel, a 3.10 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.53"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # system

configs/freescale_imx6ulevk_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_cortex_a7=y
 
-# toolchain
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # system

configs/freescale_mpc8315erdb_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x200
 BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x4000
 BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 
-# Lock headers version to match and avoid breakage
+# Linux headers same as kernel, a 4.2 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.2.5"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
 
 # Kernel

configs/freescale_p1010rdb_pa_defconfig

@@ -9,9 +9,7 @@ BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
 BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x20
 BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000
 
-# Lock headers version to match and avoid breakage
+# Linux headers same as kernel, a 4.1 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.1.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 
 # Kernel

configs/freescale_p2020ds_defconfig

@@ -6,9 +6,7 @@ BR2_powerpc_8548=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_JFFS2=y
 
-# Lock to 3.12 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 3.12 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.33"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # Kernel

configs/galileo_defconfig

@@ -1,6 +1,5 @@
 BR2_x86_x1000=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.8 series
-BR2_DEFAULT_KERNEL_VERSION="3.8"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 # Binutils 2.25 is required as this enables stripping the LOCK prefix
 BR2_BINUTILS_VERSION_2_25_X=y

configs/kb9202_defconfig

@@ -5,9 +5,7 @@ BR2_arm920t=y
 # Filesystem
 BR2_TARGET_ROOTFS_TAR=y
 
-# Lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 2.6 series (so, no option selected)
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
 
 # Kernel
 BR2_LINUX_KERNEL=y

configs/lego_ev3_defconfig

@@ -10,9 +10,7 @@ BR2_GCC_VERSION_4_7_X=y
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
 
-# Lock to 3.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 3.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_3=y
 
 # Kernel

configs/microzed_defconfig

@@ -1,9 +1,8 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/mini2440_defconfig

@@ -15,10 +15,7 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
 BR2_TARGET_ROOTFS_JFFS2_LE=y
 BR2_TARGET_ROOTFS_TAR=y
 
-
+# Linux headers same as kernel, a 3.0 series
-# Lock down headers to avoid breaking with new defaults
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.0.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y
 
 # Bootloader

configs/minnowboard_defconfig

@@ -6,9 +6,7 @@ BR2_x86_atom=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPCH0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
 
-# Lock to 3.8 headers
+# Linux headers same as kernel, a 3.8 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.8"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 
 # Linux kernel

configs/minnowboard_max_defconfig

@@ -6,9 +6,7 @@ BR2_x86_atom=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard-max/post-build.sh"
 
-# Lock to 4.4 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.4 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 
 # Needed for ethernet

configs/mx53loco_defconfig

@@ -2,15 +2,15 @@
 BR2_arm=y
 BR2_cortex_a8=y
 
+# Linux headers same as kernel, a 2.6 series (so, no option selected)
+
 # System
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.35"
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 
-# Bootloader
+# Bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx53loco"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y

configs/nitrogen6sx_defconfig

@@ -14,9 +14,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 
-# Lock headers to match kernel
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # bootloader

configs/nitrogen6x_defconfig

@@ -14,9 +14,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 
-# Lock headers to match kernel
+# Linux headers same as kernel, a 3.14 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 
 # bootloader

configs/olimex_a20_olinuxino_lime2_defconfig

@@ -1,6 +1,8 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
+# Linux headers same as kernel, a 4.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
 BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"

configs/olimex_a20_olinuxino_lime_defconfig

@@ -3,9 +3,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
 
-# Lock to 4.4 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.4 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 
 # System configuration

configs/olimex_a20_olinuxino_lime_mali_defconfig

@@ -3,9 +3,7 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
 
-# Lock to 3.4 headers as the sunxi kernel is based off the 3.4 branch
+# Linux headers same as kernel, a 3.4 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.4.108"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y
 
 # System configuration

configs/olimex_a20_olinuxino_micro_defconfig

@@ -4,9 +4,7 @@ BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# Lock to 4.0 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.0 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.0.5"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y
 
 # System configuration

configs/olimex_imx233_olinuxino_defconfig

@@ -13,9 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock headers version to match and avoid breakage
+# Linux headers same as kernel, a 3.18 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 # Bootloader

configs/openblocks_a6_defconfig

@@ -11,9 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
 
-# Lock to 3.18 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 3.18 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.1"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 # kernel

configs/orangepipc_defconfig

@@ -1,6 +1,8 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
+# Kernel is a pre-release of 4.5, so we do not yet have a _CUSTOM_4_5
+# option for the headers. Thus, we stick with the 4.4 headers for now.
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y

configs/pandaboard_defconfig

@@ -11,9 +11,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 3.12 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 3.12 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.12.2"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 
 # Kernel

configs/qemu_aarch64_virt_defconfig

@@ -9,9 +9,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_arm_nuri_defconfig

@@ -12,15 +12,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySAC1"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 3.10 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.4 series
-# Stuck at 3.10.x because there's no Nuri DTS
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.92"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+# Stuck at 3.10.x because there's no Nuri DTS
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.92"
 BR2_LINUX_KERNEL_DEFCONFIG="exynos4"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_arm_versatile_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_arm_vexpress_defconfig

@@ -13,9 +13,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_microblazebe_mmu_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_microblazeel_mmu_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_mips64_malta_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_mips64el_malta_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_mips_malta_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_mipsel_malta_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_ppc64_pseries_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_ppc_g3beige_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_ppc_mpc8544ds_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_ppc_virtex_ml507_defconfig

@@ -6,9 +6,7 @@ BR2_powerpc_440=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Use soft float

configs/qemu_sh4_r2d_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Linux kernel

configs/qemu_sh4eb_r2d_defconfig

@@ -9,9 +9,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttySC1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Linux kernel

configs/qemu_sparc64_sun4u_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Linux kernel

configs/qemu_sparc_ss10_defconfig

@@ -9,9 +9,7 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Linux kernel

configs/qemu_x86_64_defconfig

@@ -9,9 +9,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_x86_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qemu_xtensa_lx60_defconfig

@@ -16,9 +16,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Lock to 4.3 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.3 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.3"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_3=y
 
 # Kernel

configs/qmx6_defconfig

@@ -1,7 +1,6 @@
 BR2_arm=y
 BR2_cortex_a9=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.14 series
-BR2_DEFAULT_KERNEL_VERSION="3.14.28"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
 

configs/raspberrypi2_defconfig

@@ -7,10 +7,7 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 
-# Lock to 4.1 headers as the RPi kernel stable tree is
+# Linux headers same as kernel, a 4.1 series
-# based off the 4.1 branch
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.1.15"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 
 BR2_LINUX_KERNEL=y

configs/raspberrypi_defconfig

@@ -4,10 +4,7 @@ BR2_ARM_EABIHF=y
 
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 
-# Lock to 4.1 headers as the RPi kernel stable tree is
+# Linux headers same as kernel, a 4.1 series
-# based off the 4.1 branch
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.1.15"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y

configs/riotboard_defconfig

@@ -19,9 +19,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.10"
 BR2_TARGET_UBOOT_BOARDNAME="riotboard"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
-# kernel headers
+# Linux headers same as kernel, a 4.2 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.2.6"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
 
 # kernel

configs/s6lx9_microboard_defconfig

@@ -1,5 +1,7 @@
 BR2_microblaze=y
 BR2_microblazeel=y
+# Linux headers same as kernel, a 4.4 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y

configs/sheevaplug_defconfig

@@ -10,9 +10,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
 
-# Lock down headers to avoid breaking with new defaults
+# Linux headers same as kernel, a 4.4 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 
 # bootloader

configs/snps_aarch64_vdk_defconfig

@@ -1,5 +1,6 @@
 BR2_aarch64=y
-BR2_KERNEL_HEADERS_3_18=y
+# Linux headers same as kernel, a 3.18 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 BR2_TARGET_GENERIC_HOSTNAME="vdk-buildroot"
 BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS VDK by Buildroot"
 BR2_LINUX_KERNEL=y

configs/snps_axs101_defconfig

@@ -8,9 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
 
-# Headers
+# Linux headers same as kernel, a 4.2 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.2.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
 
 # Kernel

configs/snps_axs103_defconfig

@@ -9,9 +9,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
 
-# Headers
+# Linux headers same as kernel, a 4.2 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.2.4"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
 
 # Kernel

configs/snps_hs38_smp_vdk_defconfig

@@ -8,9 +8,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform"
 BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
 BR2_TARGET_ROOTFS_EXT2=y
 
-# Headers
+# Linux headers same as kernel, a 4.2 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.2"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
 
 # Kernel

configs/snps_hs38_vdk_defconfig

@@ -8,9 +8,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform"
 BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
 BR2_TARGET_ROOTFS_EXT2=y
 
-# Headers
+# Linux headers same as kernel, a 4.2 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.2"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
 
 # Kernel

configs/telit_evk_pro3_defconfig

@@ -2,9 +2,7 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Toolchain
+# Linux headers same as kernel, a 3.9 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.9.1"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
 
 # System

configs/ts5x00_defconfig

@@ -2,7 +2,7 @@
 BR2_i386=y
 BR2_x86_i586=y
 
-# toolchain
+# Linux headers same as kernel, a 3.17 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y
 
 # system

configs/udoo_quad_defconfig

@@ -4,9 +4,7 @@ BR2_cortex_a9=y
 BR2_ARM_EABIHF=y
 BR2_ARM_FPU_VFPV3=y
 
-# Toolchain
+# Linux headers same as kernel, a 3.0 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.0.35"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y
 
 # System

configs/via_imx6_vab820_defconfig

@@ -4,9 +4,7 @@ BR2_cortex_a9=y
 BR2_ARM_EABIHF=y
 BR2_ARM_FPU_VFPV3=y
 
-# Toolchain
+# Linux headers same as kernel, a 3.10 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.10.17"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
 
 # Kernel

configs/wandboard_defconfig

@@ -1,7 +1,7 @@
 BR2_arm=y
 BR2_cortex_a9=y
-BR2_KERNEL_HEADERS_3_14=y
+# Linux headers same as kernel, a 3.14 series
-BR2_DEFAULT_KERNEL_HEADERS="3.14.54"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"

configs/warpboard_defconfig

@@ -5,9 +5,7 @@ BR2_cortex_a9=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/warpboard/patches/"
 
-# lock to 4.0 headers to avoid breaking with newer kernels
+# Linux headers same as kernel, a 4.0 series
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="4.0"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_0=y
 
 # system

configs/xilinx_zc706_defconfig

@@ -2,9 +2,8 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_EABIHF=y
 BR2_ARM_ENABLE_NEON=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.14 series
-BR2_DEFAULT_KERNEL_VERSION="3.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y

configs/zedboard_defconfig

@@ -1,9 +1,8 @@
 BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
-BR2_KERNEL_HEADERS_VERSION=y
+# Linux headers same as kernel, a 3.18 series
-BR2_DEFAULT_KERNEL_VERSION="3.8"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y