1
0
Просмотр исходного кода

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.
Waldemar Brodkorb 9 лет назад
Родитель
Сommit
49a817b44b
3 измененных файлов с 13 добавлено и 1 удалено
  1. 1 0
      rules.mk
  2. 1 1
      target/arm/Makefile
  3. 11 0
      target/config/Config.in.kernelversion

+ 1 - 0
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_PARAMETER_NETCONSOLE_DST_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_DST_IP)))
 ADK_JFFS2_OPTS:=			$(strip $(subst ",, $(ADK_JFFS2_OPTS)))
 ADK_JFFS2_OPTS:=			$(strip $(subst ",, $(ADK_JFFS2_OPTS)))
 ADK_TARGET_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_VERSION)))
 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_GITVER:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GITVER)))
 ADK_TARGET_KERNEL_GITTYPE:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GITTYPE)))
 ADK_TARGET_KERNEL_GITTYPE:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_GITTYPE)))
 ADK_TARGET_KERNEL_DEFCONFIG:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_DEFCONFIG)))
 ADK_TARGET_KERNEL_DEFCONFIG:=		$(strip $(subst ",, $(ADK_TARGET_KERNEL_DEFCONFIG)))

+ 1 - 1
target/arm/Makefile

@@ -136,7 +136,7 @@ targethelp:
 endif
 endif
 
 
 kernel-strip:
 kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_VERSION_RPI),y)
+ifeq ($(ADK_TARGET_KERNEL_REPO_NAME),rpi)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	@echo adding DT trailer to kernel $(MAKE_TRACE)
 	PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 	PATH='$(HOST_PATH)' perl $(LINUX_DIR)/scripts/mkknlimg --dtok $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 else
 else

+ 11 - 0
target/config/Config.in.kernelversion

@@ -186,6 +186,17 @@ config ADK_TARGET_KERNEL_REPO
 	help
 	help
 	  GIT repository to use.
 	  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
 config ADK_TARGET_KERNEL_GITVER
 	string "git version"
 	string "git version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
 	depends on ADK_TARGET_KERNEL_VERSION_GIT