From 571c1e13fe646d2730ce332a597086d5a2174582 Mon Sep 17 00:00:00 2001 From: Park Ju Hyung Date: Mon, 6 Jan 2020 09:45:20 +0900 Subject: [PATCH 1/2] kernel: remove x86 target support We don't use any x86 devices as a target Change-Id: Ie47b35a494cbf1cdc7918967103d20b2ff861a86 Signed-off-by: Park Ju Hyung --- config/BoardConfigKernel.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk index 2adb8fd3b..e94f0e04e 100644 --- a/config/BoardConfigKernel.mk +++ b/config/BoardConfigKernel.mk @@ -25,7 +25,6 @@ # TARGET_KERNEL_CROSS_COMPILE_PREFIX = Compiler prefix (e.g. arm-eabi-) # defaults to arm-linux-androidkernel- for arm # aarch64-linux-android- for arm64 -# x86_64-linux-android- for x86 # # TARGET_KERNEL_CLANG_COMPILE = Compile kernel with clang, defaults to false # @@ -61,9 +60,6 @@ KERNEL_TOOLCHAIN_PREFIX_arm64 := aarch64-linux-android- # arm toolchain KERNEL_TOOLCHAIN_arm := $(GCC_PREBUILTS)/arm/arm-linux-androideabi-4.9/bin KERNEL_TOOLCHAIN_PREFIX_arm := arm-linux-androidkernel- -# x86 toolchain -KERNEL_TOOLCHAIN_x86 := $(GCC_PREBUILTS)/x86/x86_64-linux-android-4.9/bin -KERNEL_TOOLCHAIN_PREFIX_x86 := x86_64-linux-android- TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)) ifneq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),) From 0226d6408c32ad53efdbd7ed2e7526deef0989e7 Mon Sep 17 00:00:00 2001 From: Park Ju Hyung Date: Mon, 6 Jan 2020 10:53:00 +0900 Subject: [PATCH 2/2] kernel: allow devices to use newer GCC Change-Id: I7ca23584c6479f300e38857707bec0bad1b94dad Signed-off-by: Park Ju Hyung --- config/BoardConfigKernel.mk | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk index e94f0e04e..465c4134d 100644 --- a/config/BoardConfigKernel.mk +++ b/config/BoardConfigKernel.mk @@ -27,6 +27,7 @@ # aarch64-linux-android- for arm64 # # TARGET_KERNEL_CLANG_COMPILE = Compile kernel with clang, defaults to false +# TARGET_KERNEL_NEW_GCC_COMPILE = Compile kernel with newer version GCC, defaults to false # # KERNEL_TOOLCHAIN_PREFIX = Overrides TARGET_KERNEL_CROSS_COMPILE_PREFIX, # Set this var in shell to override @@ -54,13 +55,24 @@ endif TARGET_KERNEL_HEADERS ?= $(TARGET_KERNEL_SOURCE) GCC_PREBUILTS := $(BUILD_TOP)/prebuilts/gcc/$(HOST_OS)-x86 -# arm64 toolchain -KERNEL_TOOLCHAIN_arm64 := $(GCC_PREBUILTS)/aarch64/aarch64-linux-android-4.9/bin -KERNEL_TOOLCHAIN_PREFIX_arm64 := aarch64-linux-android- -# arm toolchain -KERNEL_TOOLCHAIN_arm := $(GCC_PREBUILTS)/arm/arm-linux-androideabi-4.9/bin -KERNEL_TOOLCHAIN_PREFIX_arm := arm-linux-androidkernel- - +ifeq ($(TARGET_KERNEL_NEW_GCC_COMPILE),true) + ifeq ($(TARGET_KERNEL_CLANG_COMPILE),true) + $(error TARGET_KERNEL_NEW_GCC_COMPILE cannot be used with TARGET_KERNEL_CLANG_COMPILE!) + endif + # arm64 toolchain + KERNEL_TOOLCHAIN_arm64 := $(GCC_PREBUILTS)/aarch64/aarch64-elf/bin + KERNEL_TOOLCHAIN_PREFIX_arm64 := aarch64-elf- + # arm toolchain + KERNEL_TOOLCHAIN_arm := $(GCC_PREBUILTS)/arm/arm-eabi/bin + KERNEL_TOOLCHAIN_PREFIX_arm := arm-eabi- +else + # arm64 toolchain + KERNEL_TOOLCHAIN_arm64 := $(GCC_PREBUILTS)/aarch64/aarch64-linux-android-4.9/bin + KERNEL_TOOLCHAIN_PREFIX_arm64 := aarch64-linux-android- + # arm toolchain + KERNEL_TOOLCHAIN_arm := $(GCC_PREBUILTS)/arm/arm-linux-androideabi-4.9/bin + KERNEL_TOOLCHAIN_PREFIX_arm := arm-linux-androidkernel- +endif TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)) ifneq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),) KERNEL_TOOLCHAIN_PREFIX ?= $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)