From 5578b70a06d12daa2c9149cb29eef5e47f1f3d13 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 4 Feb 2023 15:22:01 +0100
Subject: c6x: fix default configuration for linux toolchain building

---
 target/config/Config.in.compiler     | 5 +++++
 target/config/Config.in.runtime      | 1 +
 target/linux/Config.in.kernelversion | 5 +++++
 3 files changed, 11 insertions(+)

(limited to 'target')

diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index 0eca4cf16..cd790959b 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -16,6 +16,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_KVX if ADK_TARGET_ARCH_KVX
 default ADK_TOOLCHAIN_GCC_METAG if ADK_TARGET_ARCH_METAG
+default ADK_TOOLCHAIN_GCC_7 if ADK_TARGET_ARCH_C6X # ICE with newer GCC
 default ADK_TOOLCHAIN_GCC_9 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC
 default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_ARCH_CRIS # no longer supported
 default ADK_TOOLCHAIN_GCC_10 if ADK_TARGET_ARCH_H8300 # ICE
@@ -36,12 +37,14 @@ config ADK_TOOLCHAIN_GCC_12
 config ADK_TOOLCHAIN_GCC_11
 	bool "11.3.0"
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_LOONGARCH
 
 config ADK_TOOLCHAIN_GCC_10
 	bool "10.4.0"
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_LOONGARCH
@@ -50,6 +53,7 @@ config ADK_TOOLCHAIN_GCC_9
 	bool "9.5.0"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_LOONGARCH
@@ -58,6 +62,7 @@ config ADK_TOOLCHAIN_GCC_8
 	bool "8.5.0"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_CSKY
 	depends on !ADK_TARGET_ARCH_HPPA
 	depends on !ADK_TARGET_ARCH_METAG
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index e8468956f..0ca806995 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -62,6 +62,7 @@ choice
 prompt "base applications"
 depends on !ADK_APPLIANCE_TOOLCHAIN
 default ADK_RUNTIME_BASE_TOOLBOX if ADK_TARGET_ARCH_H8300
+default ADK_RUNTIME_BASE_TOOLBOX if ADK_TARGET_ARCH_C6X
 default ADK_RUNTIME_BASE_BUSYBOX
 
 config ADK_RUNTIME_BASE_BUSYBOX
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index a7378cb53..ea8b768d7 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -20,12 +20,14 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_FRV
 default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F429
 default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F769
 default ADK_TARGET_LINUX_KERNEL_VERSION_4_19 if ADK_TARGET_ARCH_ARC
+default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_C6X
 default ADK_TARGET_LINUX_KERNEL_VERSION_5_15
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	bool "git"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_FRV
 	select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_HOST_NEED_LZOP if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
@@ -37,6 +39,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_1
 	bool "6.1.7"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_FRV
 	depends on !ADK_TARGET_ARCH_METAG
@@ -45,6 +48,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_15
 	bool "5.15.89"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_FRV
 	depends on !ADK_TARGET_ARCH_METAG
@@ -53,6 +57,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_10
 	bool "5.10.146"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_CRIS
 	depends on !ADK_TARGET_ARCH_FRV
 	depends on !ADK_TARGET_ARCH_METAG
-- 
cgit v1.2.3