summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-11-24 22:01:28 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-11-24 22:02:57 +0100
commit49a817b44be5695a87f6b4c8eadef3bb0f9419f9 (patch)
tree8856913f024d46dcf9a101caa7228a6af5681df6
parent301795aced0720686b10b02b38f7459203e10ee5 (diff)
add special repository short names
They can be used elsewhere in the code when this kernels are used or need special handling. Bug reported by Diez for RPI kernels.
-rw-r--r--rules.mk1
-rw-r--r--target/arm/Makefile2
-rw-r--r--target/config/Config.in.kernelversion11
3 files changed, 13 insertions, 1 deletions
diff --git a/rules.mk b/rules.mk
index ce55e56f8..5cb265f53 100644
--- a/rules.mk
+++ b/rules.mk
@@ -67,6 +67,7 @@ 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_DEFCONFIG:= $(strip $(subst ",, $(ADK_TARGET_KERNEL_DEFCONFIG)))
diff --git a/target/arm/Makefile b/target/arm/Makefile
index dd5542e1e..bdf1cbfa5 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -136,7 +136,7 @@ targethelp:
endif
kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_VERSION_RPI),y)
+ifeq ($(ADK_TARGET_KERNEL_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/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 926662347..c9e99777b 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -186,6 +186,17 @@ config ADK_TARGET_KERNEL_REPO
help
GIT repository to use.
+config ADK_TARGET_KERNEL_REPO_NAME
+ string
+ depends on ADK_TARGET_KERNEL_VERSION_GIT
+ default "rpi" if ADK_TARGET_BOARD_BCM28XX
+ 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 "or1k" if ADK_TARGET_ARCH_OR1K
+ default "lm32" if ADK_TARGET_ARCH_LM32
+ default "linus"
+
config ADK_TARGET_KERNEL_GITVER
string "git version"
depends on ADK_TARGET_KERNEL_VERSION_GIT