rework git kernel infrastructure

Module loading was broken, use stable hashes and
add kernel versions to allow kernel module loading.
Convert kinetis-k70 to use new infrastructure.

6 files changed, 30 insertions, 17 deletions

diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index bda689686..a13d97049 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -11,9 +11,9 @@
 # KERNEL_VERSION:  final kernel version how we want to identify a specific kernel
 
 ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
-KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_GITVER)
+KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_GIT)
 KERNEL_RELEASE:=	1
-KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
+KERNEL_VERSION:=	$(ADK_TARGET_KERNEL_GIT_VER)
 endif
 ifeq ($(ADK_TARGET_KERNEL_VERSION_4_8),y)
 KERNEL_FILE_VER:=	4.8.11
diff --git a/mk/linux.mk b/mk/linux.mk
index 47427ea95..c206906e3 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -4,9 +4,9 @@
 PKG_NAME:=	linux
 PKG_RELEASE:=	$(KERNEL_RELEASE)
 ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
-PKG_VERSION:=	$(ADK_TARGET_KERNEL_GITVER)
-PKG_GIT:=	$(ADK_TARGET_KERNEL_GITTYPE)
-PKG_SITES:=	$(ADK_TARGET_KERNEL_REPO)
+PKG_VERSION:=	$(ADK_TARGET_KERNEL_GIT)
+PKG_GIT:=	$(ADK_TARGET_KERNEL_GIT_TYPE)
+PKG_SITES:=	$(ADK_TARGET_KERNEL_GIT_REPO)
 else
 PKG_VERSION:=	$(KERNEL_FILE_VER)
 PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v4.x/} \
diff --git a/rules.mk b/rules.mk
index 5cb265f53..03c0eb24b 100644
--- a/rules.mk
+++ b/rules.mk
@@ -67,9 +67,10 @@ ADK_PARAMETER_NETCONSOLE_SRC_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE
 ADK_PARAMETER_NETCONSOLE_DST_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_DST_IP)))
 ADK_JFFS2_OPTS:=			$(strip $(subst ",, $(ADK_JFFS2_OPTS)))
 ADK_TARGET_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_VERSION)))
-ADK_TARGET_KERNEL_REPO_NAME:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_REPO_NAME)))
-ADK_TARGET_KERNEL_GITVER:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GITVER)))
-ADK_TARGET_KERNEL_GITTYPE:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GITTYPE)))
+ADK_TARGET_KERNEL_GIT_REPO_NAME:=	$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT_REPO_NAME)))
+ADK_TARGET_KERNEL_GIT:=			$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT)))
+ADK_TARGET_KERNEL_GIT_VER:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT_VER)))
+ADK_TARGET_KERNEL_GIT_TYPE:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GIT_TYPE)))
 ADK_TARGET_KERNEL_DEFCONFIG:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_DEFCONFIG)))
 
 ADK_TARGET_KARCH:=$(ADK_TARGET_ARCH)
diff --git a/target/arm/Makefile b/target/arm/Makefile
index bdf1cbfa5..3567595b3 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -136,7 +136,7 @@ targethelp:
 endif
 
 kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_REPO_NAME),rpi)
+ifeq ($(ADK_TARGET_KERNEL_GIT_REPO_NAME),rpi)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 else
diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70
index 66eedf140..c0d76a425 100644
--- a/target/arm/systems/kinetis-k70
+++ b/target/arm/systems/kinetis-k70
@@ -11,8 +11,6 @@ config ADK_TARGET_SYSTEM_KINETIS_K70
 	select ADK_TARGET_WITH_NAND
 	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 "1d008423ab5fd12459f53342e4d17585ec63cfe4"
 	help
 	  Kinetis K70
 
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index df82d2d7f..f6da4281b 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -8,6 +8,7 @@ default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_BOARD_BCM28XX
 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_SYSTEM_KINETIS_K70
 default ADK_TARGET_KERNEL_VERSION_GIT if ADK_TARGET_ARCH_LM32
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_CRIS
 default ADK_TARGET_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG
@@ -169,10 +170,11 @@ config ADK_TARGET_KERNEL_VERSION_2_6_32
 
 endchoice
 
-config ADK_TARGET_KERNEL_REPO
+config ADK_TARGET_KERNEL_GIT_REPO
 	string "git repository"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	default "https://github.com/raspberrypi/linux.git" if ADK_TARGET_BOARD_BCM28XX
+	default "https://github.com/EmcraftSystems/linux-emcraft.git" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "https://github.com/SolidRun/linux-fslc.git" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "https://github.com/SolidRun/linux-armada38x.git" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 	default "https://github.com/beagleboard/linux.git" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
@@ -181,23 +183,35 @@ config ADK_TARGET_KERNEL_REPO
 	help
 	  GIT repository to use.
 
-config ADK_TARGET_KERNEL_REPO_NAME
+config ADK_TARGET_KERNEL_GIT_REPO_NAME
 	string
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	default "rpi" if ADK_TARGET_BOARD_BCM28XX
+	default "emcraft" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "fslc" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "clearfog" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 	default "bb" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "lm32" if ADK_TARGET_ARCH_LM32
 	default "linus"
 
-config ADK_TARGET_KERNEL_GITVER
+config ADK_TARGET_KERNEL_GIT
 	string "git version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
-	default "head"
+	default "3b68e3a8223134801f0acccc70bef3388eab1e91" if ADK_TARGET_BOARD_BCM28XX
+	default "1d008423ab5fd12459f53342e4d17585ec63cfe4" if ADK_TARGET_SYSTEM_KINETIS_K70
+	default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
+	default "27e61f66e7f03cc6199ddc2787340a01b80c6ed6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default "8624998967676862843aed1f8ee2141e98987f81" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+
+config ADK_TARGET_KERNEL_GIT_VER
+	string "kernel version"
+	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	default "4.4.34-1-v7+" if ADK_TARGET_BOARD_BCM28XX
+	default "3.14.79-1+" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	default "4.4.37-1+" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
-config ADK_TARGET_KERNEL_GITTYPE
+config ADK_TARGET_KERNEL_GIT_TYPE
 	string
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "hash" if ADK_TARGET_ARCH_LM32
+	default "hash"