From 2e14a5b778866c1db64c481190c613bc9d4eb4d5 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 17 Sep 2017 12:41:03 -0500
Subject: [PATCH] 4.14-rc1-bone0 release

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 build_kernel.sh                 |  5 ++++-
 patches/defconfig               |  9 +++++----
 patches/defconfig-bone          | 11 ++++++++---
 patches/ref_omap2plus_defconfig |  5 ++---
 tools/rebuild.sh                |  5 ++++-
 version.sh                      |  8 ++++----
 6 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/build_kernel.sh b/build_kernel.sh
index df9f455d1..dff6f5695 100755
--- a/build_kernel.sh
+++ b/build_kernel.sh
@@ -253,7 +253,10 @@ if [  -f "${DIR}/.yakbuild" ] ; then
 fi
 make_kernel
 make_modules_pkg
-make_firmware_pkg
+if [ -f "${DIR}/KERNEL/scripts/Makefile.fwinst" ] ; then
+	#Finally nuked in v4.14.0-rc0 merge...
+	make_firmware_pkg
+fi
 if grep -q dtbs "${DIR}/KERNEL/arch/${KERNEL_ARCH}/Makefile"; then
 	make_dtbs_pkg
 fi
diff --git a/patches/defconfig b/patches/defconfig
index 260d64b2a..697a8f093 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0 Kernel Configuration
+# Linux/arm 4.14.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -36,7 +36,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
@@ -2602,6 +2602,7 @@ CONFIG_INPUT_TPS65218_PWRBUTTON=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_VIBRA is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -2874,8 +2875,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_SPRD is not set
-# CONFIG_PINCTRL_SPRD_SC9860 is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
@@ -5673,6 +5672,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_BERLIN is not set
 # CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_IMX7 is not set
+# CONFIG_RESET_LANTIQ is not set
 # CONFIG_RESET_LPC18XX is not set
 # CONFIG_RESET_MESON is not set
 # CONFIG_RESET_PISTACHIO is not set
@@ -5928,6 +5928,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_ZSTD is not set
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index c6118faae..63e376d7c 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0 Kernel Configuration
+# Linux/arm 4.14.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2669,6 +2669,7 @@ CONFIG_INPUT_TPS65218_PWRBUTTON=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_PWM_BEEPER=m
+# CONFIG_INPUT_PWM_VIBRA is not set
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
@@ -2942,8 +2943,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_SPRD is not set
-# CONFIG_PINCTRL_SPRD_SC9860 is not set
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
@@ -5264,6 +5263,7 @@ CONFIG_COMMON_CLK=y
 #
 # Common Clock Framework
 #
+# CONFIG_CLK_HSDK is not set
 # CONFIG_COMMON_CLK_SI5351 is not set
 # CONFIG_COMMON_CLK_SI514 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
@@ -5774,6 +5774,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_BERLIN is not set
 # CONFIG_RESET_HSDK_V1 is not set
 # CONFIG_RESET_IMX7 is not set
+# CONFIG_RESET_LANTIQ is not set
 # CONFIG_RESET_LPC18XX is not set
 # CONFIG_RESET_MESON is not set
 # CONFIG_RESET_PISTACHIO is not set
@@ -6034,6 +6035,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
@@ -6668,6 +6670,7 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=y
 # CONFIG_CRC8 is not set
+CONFIG_XXHASH=y
 CONFIG_AUDIT_GENERIC=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -6678,6 +6681,8 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_LZ4_COMPRESS=m
 CONFIG_LZ4HC_COMPRESS=m
 CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 # CONFIG_XZ_DEC_X86 is not set
 # CONFIG_XZ_DEC_POWERPC is not set
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index c8c8d5184..9354bf1fc 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.13.0 Kernel Configuration
+# Linux/arm 4.14.0-rc1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1856,6 +1856,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_PWM_VIBRA is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_IMS_PCU is not set
@@ -2088,8 +2089,6 @@ CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_PALMAS is not set
-# CONFIG_PINCTRL_SPRD is not set
-# CONFIG_PINCTRL_SPRD_SC9860 is not set
 CONFIG_PINCTRL_TI_IODELAY=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_GPIOLIB=y
diff --git a/tools/rebuild.sh b/tools/rebuild.sh
index f408f42ae..a6e583e4e 100755
--- a/tools/rebuild.sh
+++ b/tools/rebuild.sh
@@ -232,7 +232,10 @@ if [  -f "${DIR}/.yakbuild" ] ; then
 fi
 make_kernel
 make_modules_pkg
-make_firmware_pkg
+if [ -f "${DIR}/KERNEL/scripts/Makefile.fwinst" ] ; then
+	#Finally nuked in v4.14.0-rc0 merge...
+	make_firmware_pkg
+fi
 if grep -q dtbs "${DIR}/KERNEL/arch/${KERNEL_ARCH}/Makefile"; then
 	make_dtbs_pkg
 fi
diff --git a/version.sh b/version.sh
index 7ffd4cad1..41a4b61b2 100644
--- a/version.sh
+++ b/version.sh
@@ -29,15 +29,15 @@ toolchain="gcc_linaro_gnueabihf_7"
 #toolchain="gcc_linaro_aarch64_gnu_7"
 
 #Kernel
-KERNEL_REL=4.13
-KERNEL_TAG=${KERNEL_REL}
+KERNEL_REL=4.14
+KERNEL_TAG=${KERNEL_REL}-rc1
 kernel_rt=".X-rtY"
 #Kernel Build
 BUILD=${build_prefix}0
 
 #v4.X-rcX + upto SHA
-prev_KERNEL_SHA="3882a734c19b3cd7feb9e30e1dbd8ae54ac0905a"
-KERNEL_SHA="46c1e79fee417f151547aa46fae04ab06cb666f4"
+#prev_KERNEL_SHA=""
+#KERNEL_SHA=""
 
 #git branch
 BRANCH="${branch_prefix}${KERNEL_REL}${branch_postfix}"
-- 
GitLab