From f54bb6d9a78ed92f89efeaef36ffe9b81d3dd7dd Mon Sep 17 00:00:00 2001 From: Matthias Riechmann <21068765+mmriech@users.noreply.github.com> Date: Mon, 27 Jan 2020 17:32:10 +0100 Subject: [PATCH] Fixes makefiles of rockchip headers (#1765) * Fixed makefile of kernel header 4.4.202 for rockchip64 * Fixed makefile of kernel header for rockchip --- ...ld_of_i-file_in_external_module_case.patch | 20 +++++++++++++++++++ ...ld_of_i-file_in_external_module_case.patch | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 patch/kernel/rockchip-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch create mode 100644 patch/kernel/rockchip64-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch diff --git a/patch/kernel/rockchip-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch b/patch/kernel/rockchip-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch new file mode 100644 index 000000000..c43b6c03b --- /dev/null +++ b/patch/kernel/rockchip-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch @@ -0,0 +1,20 @@ +diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile +index 605f6cf4..08b797df 100644 +--- a/arch/arm64/Makefile ++++ b/arch/arm64/Makefile +@@ -141,6 +141,7 @@ archclean: + $(Q)$(MAKE) $(clean)=$(boot) + $(Q)$(MAKE) $(clean)=$(boot)/dts + ++ifeq ($(KBUILD_EXTMOD),) + # We need to generate vdso-offsets.h before compiling certain files in kernel/. + # In order to do that, we should use the archprepare target, but we can't since + # asm-offsets.h is included in some files used to generate vdso-offsets.h, and +@@ -150,6 +151,7 @@ archclean: + prepare: vdso_prepare + vdso_prepare: prepare0 + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h ++endif + + define archhelp + echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)' diff --git a/patch/kernel/rockchip64-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch b/patch/kernel/rockchip64-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch new file mode 100644 index 000000000..c43b6c03b --- /dev/null +++ b/patch/kernel/rockchip64-legacy/arm64_makefile_fix_build_of_i-file_in_external_module_case.patch @@ -0,0 +1,20 @@ +diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile +index 605f6cf4..08b797df 100644 +--- a/arch/arm64/Makefile ++++ b/arch/arm64/Makefile +@@ -141,6 +141,7 @@ archclean: + $(Q)$(MAKE) $(clean)=$(boot) + $(Q)$(MAKE) $(clean)=$(boot)/dts + ++ifeq ($(KBUILD_EXTMOD),) + # We need to generate vdso-offsets.h before compiling certain files in kernel/. + # In order to do that, we should use the archprepare target, but we can't since + # asm-offsets.h is included in some files used to generate vdso-offsets.h, and +@@ -150,6 +151,7 @@ archclean: + prepare: vdso_prepare + vdso_prepare: prepare0 + $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h ++endif + + define archhelp + echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)'