From 680b1bf73cedebda44da1e15d6d1127e2b550941 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 12 Sep 2015 19:59:10 +0200
Subject: allow to use a defconfig, enable always experimental support in
 kernel

---
 mk/kernel-build.mk                   | 4 ++++
 rules.mk                             | 1 +
 target/arm/kernel/kinetis-k70        | 6 +++++-
 target/arm/systems/kinetis-k70       | 2 +-
 target/config/Config.in.kernelcfg    | 1 +
 target/linux/config/Config.in.kernel | 5 +++--
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk
index 7194bc4dd..4649a78c5 100644
--- a/mk/kernel-build.mk
+++ b/mk/kernel-build.mk
@@ -42,9 +42,13 @@ $(LINUX_DIR)/.prepared: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PK
 $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig
 	$(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure
 	-for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done
+ifeq ($(ADK_TARGET_KERNEL_USE_DEFCONFIG),y)
+	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} $(ADK_TARGET_KERNEL_DEFCONFIG) $(MAKE_TRACE)
+else
 	$(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/mini.config
 	echo "-${KERNEL_RELEASE}" >${LINUX_DIR}/localversion
 	${KERNEL_MAKE_ENV} $(MAKE) -C "${LINUX_DIR}" ${KERNEL_MAKE_OPTS} KCONFIG_ALLCONFIG=mini.config allnoconfig $(MAKE_TRACE)
+endif
 	touch -c $(LINUX_DIR)/.config
 
 $(LINUX_DIR)/$(KERNEL_FILE): $(LINUX_DIR)/.config
diff --git a/rules.mk b/rules.mk
index 22def2402..9468f9d46 100644
--- a/rules.mk
+++ b/rules.mk
@@ -66,6 +66,7 @@ ADK_PARAMETER_NETCONSOLE_DST_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE
 ADK_JFFS2_OPTS:=			$(strip $(subst ",, $(ADK_JFFS2_OPTS)))
 ADK_WGET_TIMEOUT:=			$(strip $(subst ",, $(ADK_WGET_TIMEOUT)))
 ADK_TARGET_KERNEL_HASH:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_HASH)))
+ADK_TARGET_KERNEL_DEFCONFIG:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_DEFCONFIG)))
 
 ADK_TARGET_KARCH:=$(ADK_TARGET_ARCH)
 
diff --git a/target/arm/kernel/kinetis-k70 b/target/arm/kernel/kinetis-k70
index 4ffe140a4..a2e670272 100644
--- a/target/arm/kernel/kinetis-k70
+++ b/target/arm/kernel/kinetis-k70
@@ -10,7 +10,11 @@ CONFIG_CPU_32v7M=y
 CONFIG_CPU_ABRT_NOMMU=y
 CONFIG_CPU_PABRT_LEGACY=y
 CONFIG_CPU_CACHE_VIPT=y
-CONFIG_ARM_THUMB=y
+CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
+CONFIG_VFPM=y
 CONFIG_ARM_L1_CACHE_SHIFT=5
+CONFIG_ARM_NVIC=y
 CONFIG_ARM_CORTEXM3=y
 CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_SERIAL_KINETIS=y
+CONFIG_SERIAL_KINETIS_CONSOLE=y
diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70
index 7afe39a21..08d054834 100644
--- a/target/arm/systems/kinetis-k70
+++ b/target/arm/systems/kinetis-k70
@@ -10,7 +10,7 @@ config ADK_TARGET_SYSTEM_KINETIS_K70
 	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_TARGET_KERNEL_REPO "https://github.com/EmcraftSystems/linux-emcraft.git"
-	select ADK_TARGET_KERNEL_HASH "a5125a7f66b441008f505e4ce5d45ebb24ea28a7"
+	select ADK_TARGET_KERNEL_HASH "f0cbd4e039e07f586f1cf14f3150f9938b74617e"
 	help
 	  Kinetis K70
 
diff --git a/target/config/Config.in.kernelcfg b/target/config/Config.in.kernelcfg
index 3a654bfdb..bb5e5a91f 100644
--- a/target/config/Config.in.kernelcfg
+++ b/target/config/Config.in.kernelcfg
@@ -15,4 +15,5 @@ endchoice
 config ADK_TARGET_KERNEL_DEFCONFIG
 	string
 	depends on ADK_TARGET_KERNEL_USE_DEFCONFIG
+	default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70
 
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 7daecb79f..f7994b49a 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -1,7 +1,8 @@
-config ADK_KERNEL_STAGING
+config ADK_KERNEL_EXPERIMENTAL
 	bool
+	default y
 
-config ADK_KERNEL_EXPERIMENTAL
+config ADK_KERNEL_STAGING
 	bool
 
 config ADK_KERNEL_RESET_CONTROLLER
-- 
cgit v1.2.3