From 3da4aad44388cc94da304e1b4a0fe04cb1d03e46 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 7 Oct 2019 13:44:06 +0200 Subject: armv6: unbreak compile errors, we need to stick with gcc 7.4.0 and Linux 4.9.x --- target/config/Config.in.compiler | 3 +++ target/linux/Config.in.kernelversion | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'target') diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 9299957e8..b4e5ebc2f 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -33,6 +33,7 @@ default ADK_TOOLCHAIN_GCC_ARC if ADK_TARGET_ARCH_ARC default ADK_TOOLCHAIN_GCC_AVR32 if ADK_TARGET_ARCH_AVR32 default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32 +default ADK_TOOLCHAIN_GCC_7 if ADK_TARGET_CPU_ARM_ARM11MPCORE default ADK_TOOLCHAIN_GCC_8 config ADK_TOOLCHAIN_GCC_GIT @@ -47,6 +48,7 @@ config ADK_TOOLCHAIN_GCC_9 depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_CPU_ARM_ARM11MPCORE config ADK_TOOLCHAIN_GCC_8 bool "8.3.0" @@ -56,6 +58,7 @@ config ADK_TOOLCHAIN_GCC_8 depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_NDS32 depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_CPU_ARM_ARM11MPCORE config ADK_TOOLCHAIN_GCC_7 bool "7.4.0" diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index f666d0287..62627a3bb 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -20,6 +20,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_H8300 default ADK_TARGET_LINUX_KERNEL_VERSION_4_4 if ADK_TARGET_ARCH_METAG default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_AVR32 default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_BFIN +default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_CPU_ARM_ARM11MPCORE default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT @@ -40,6 +41,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_3 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_CPU_ARM_ARM11MPCORE config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 bool "4.19.75" @@ -51,6 +53,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_RISCV32 depends on !ADK_TARGET_ARCH_RISCV64 + depends on !ADK_TARGET_CPU_ARM_ARM11MPCORE config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 bool "4.14.142" @@ -63,6 +66,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 depends on !ADK_TARGET_ARCH_NDS32 depends on !ADK_TARGET_ARCH_RISCV32 depends on !ADK_TARGET_ARCH_RISCV64 + depends on !ADK_TARGET_CPU_ARM_ARM11MPCORE config ADK_TARGET_LINUX_KERNEL_VERSION_4_9 bool "4.9.179" -- cgit v1.2.3