diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-11 23:36:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-11 23:37:56 +0100 |
| commit | d20e328bd5b09bd06b8bbbdee5069617a69f0fd9 (patch) | |
| tree | 1ceca19698d548768b95fa3c0a0bdc6ae577a7a4 /target | |
| parent | 85a8783c62c43d67e18516a86593fb549ff95564 (diff) | |
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.
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 2 | ||||
| -rw-r--r-- | target/arm/systems/kinetis-k70 | 2 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion | 26 |
3 files changed, 21 insertions, 9 deletions
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" |