From 8fb4f8b834418606c2b5f85998def2bbbe8029e3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Oct 2019 20:30:47 +0200 Subject: c-sky: remove ck607 abiv1 support as it is deprecated, default to gcc 9.2.0, allow qemu to be build big/little endian --- target/config/Config.in.compiler | 1 + target/config/Config.in.cpu | 10 ---------- target/config/Config.in.endian | 2 ++ target/csky/Makefile | 3 --- target/csky/systems/qemu-csky-ck610 | 8 -------- target/csky/uclibc-ng.config | 8 ++++---- 6 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 target/csky/systems/qemu-csky-ck610 (limited to 'target') diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 7c2adb055..316af4cc5 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -20,6 +20,7 @@ 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_7 if ADK_TARGET_CPU_ARM_CORTEX_A53 default ADK_TOOLCHAIN_GCC_9 if ADK_TARGET_ARCH_OR1K +default ADK_TOOLCHAIN_GCC_9 if ADK_TARGET_ARCH_CSKY default ADK_TOOLCHAIN_GCC_8 config ADK_TOOLCHAIN_GCC_GIT diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index ac3559503..77214193a 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -433,18 +433,9 @@ config ADK_TARGET_CPU_CRIS_CRISV32 depends on ADK_TARGET_ARCH_CRIS # c-sky -config ADK_TARGET_CPU_CSKY_CK610 - bool "ck610" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_SUPPORTS_NPTL - select ADK_TARGET_WITH_MMU - depends on ADK_TARGET_ARCH_CSKY - config ADK_TARGET_CPU_CSKY_CK807 bool "ck807" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_CSKY @@ -452,7 +443,6 @@ config ADK_TARGET_CPU_CSKY_CK807 config ADK_TARGET_CPU_CSKY_CK810 bool "ck810" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_CSKY diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian index d6c15da15..2da7d4c51 100644 --- a/target/config/Config.in.endian +++ b/target/config/Config.in.endian @@ -17,6 +17,8 @@ depends on ADK_TARGET_SYSTEM_GENERIC_ARC \ || ADK_TARGET_SYSTEM_GENERIC_XTENSA \ || ADK_TARGET_SYSTEM_SYNOPSYS_NSIM \ || ADK_TARGET_SYSTEM_QEMU_AARCH64 \ + || ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 \ + || ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ || ADK_TARGET_SYSTEM_QEMU_MIPS \ diff --git a/target/csky/Makefile b/target/csky/Makefile index 057f84f57..83f4363f7 100644 --- a/target/csky/Makefile +++ b/target/csky/Makefile @@ -8,9 +8,6 @@ include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) QEMU_ARGS:=${ADK_QEMU_ARGS} -M virt -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK610),y) -QEMU:=qemu-system-cskyv1 -endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK807),y) QEMU:=qemu-system-cskyv2 endif diff --git a/target/csky/systems/qemu-csky-ck610 b/target/csky/systems/qemu-csky-ck610 deleted file mode 100644 index 6f740cb42..000000000 --- a/target/csky/systems/qemu-csky-ck610 +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 - bool "Qemu Emulator (ck610)" - select ADK_TARGET_QEMU - select ADK_TARGET_CPU_CSKY_CK610 - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for C-SKY architecture (ck610). - diff --git a/target/csky/uclibc-ng.config b/target/csky/uclibc-ng.config index 00de26e54..c80a15a89 100644 --- a/target/csky/uclibc-ng.config +++ b/target/csky/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.27 C Library Configuration +# uClibc-ng 1.0.31 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -25,9 +25,11 @@ TARGET_csky=y # TARGET_nios2 is not set # TARGET_or1k is not set # TARGET_powerpc is not set +# TARGET_riscv64 is not set # TARGET_sh is not set # TARGET_sparc is not set # TARGET_sparc64 is not set +# TARGET_tile is not set # TARGET_x86_64 is not set # TARGET_xtensa is not set @@ -75,7 +77,6 @@ LDSO_RUNPATH=y LDSO_SAFE_RUNPATH=y LDSO_SEARCH_INTERP_PATH=y LDSO_LD_LIBRARY_PATH=y -# LDSO_NO_CLEANUP is not set UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set @@ -218,7 +219,6 @@ HARDWIRED_ABSPATH=y # # Security options # -# UCLIBC_HAS_ARC4RANDOM is not set UCLIBC_HAS_SSP=y # SSP_QUICK_CANARY is not set # UCLIBC_BUILD_SSP is not set @@ -237,6 +237,6 @@ DOSTRIP=y # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set -UCLIBC_HAS_BACKTRACE=y +# UCLIBC_HAS_BACKTRACE is not set WARNINGS="-Wall" # EXTRA_WARNINGS is not set -- cgit v1.2.3