diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index ae75ae5..5f4e426 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -3,6 +3,10 @@ # # ----------------------------------------------------------------------------- +# arm apollo/shiner/kronos/kronos_v2 +CST_HD2_3_10_PATCH = \ + coolstreamhd2/3_10_Fix-multiple-definition-of-yylloc.patch + # arm hd51/bre2ze4k/h7 GFUTURES_4_10_PATCH = \ gfutures/4_10_0001-export_pmpoweroffprepare.patch \ @@ -139,6 +143,18 @@ VUPLUS_4_1_PATCH = \ # ----------------------------------------------------------------------------- +APOLLO_PATCH = \ + $(CST_HD2_3_10_PATCH) + +SHINER_PATCH = \ + $(CST_HD2_3_10_PATCH) + +KRONOS_PATCH = \ + $(CST_HD2_3_10_PATCH) + +KRONOS_V2_PATCH = \ + $(CST_HD2_3_10_PATCH) + HD51_PATCH = \ $(GFUTURES_4_10_PATCH) @@ -225,6 +241,9 @@ kernel.do_prepare_git: tar -C $(SOURCE_DIR) --exclude-vcs -cp $(NI_LINUX_KERNEL) | tar -C $(BUILD_DIR) -x $(CD) $(BUILD_DIR); \ mv $(NI_LINUX_KERNEL) $(KERNEL_DIR) +ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner kronos kronos_v2)) + $(call APPLY_PATCHES,$(KERNEL_PATCH)) +endif kernel.do_prepare_tar: $(DL_DIR)/$(KERNEL_SOURCE) $(REMOVE)/$(KERNEL_DIR) diff --git a/package/kernel/patches/coolstreamhd2/3_10_Fix-multiple-definition-of-yylloc.patch b/package/kernel/patches/coolstreamhd2/3_10_Fix-multiple-definition-of-yylloc.patch new file mode 100644 index 0000000..4d9069c --- /dev/null +++ b/package/kernel/patches/coolstreamhd2/3_10_Fix-multiple-definition-of-yylloc.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped +index 2d30f41778b..d0eb405cb81 100644 +--- a/scripts/dtc/dtc-lexer.lex.c_shipped ++++ b/scripts/dtc/dtc-lexer.lex.c_shipped +@@ -637,7 +637,7 @@ char *yytext; + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ + #define YY_USER_ACTION \