From b36c4e594c658d49d19bf388b7fd4a912b6fde42 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Oct 2021 14:40:23 +0200 Subject: [PATCH] configs: remove qemu_csky defconfigs We are going to remove the gcc fork for csky since it doesn't build with the latest compilers (gcc 8, 10, 11 tested) [1]. Removing theses defconfigs and the csky gcc fork has become unavoidable since the Buildroot Docker image used by the gitlab CI will switch soon to Debian bullseye soon [2]. The cksy gcc fork based on gcc 6 has not been updated since it has been added to Buildroot [3]. Since then, csky has been added to binutils and gcc but using the latest upstream version (binutils 2.37 and gcc 11) is not yet possible due to build issue with glibc 2.34 [4]. Moreover, qemu_csky defconfigs was to be used with the csky qemu fork (based on Qemu 3.x) added by commit [5] and removed by commit [6]. Since then it's not possible to do a runtime test with theses defconfigs. Theses defconfigs can be added back later if the csky toolchain support is fixed and csky supported by upstream Qemu. [1] http://lists.busybox.net/pipermail/buildroot/2021-August/621504.html [2] 71b83227128be62c169313e85bb8f339f977ad67 [3] 7873a5bd5ebbeb1674293dae6b06b50f0a1f2184 [4] http://lists.busybox.net/pipermail/buildroot/2021-October/624596.html [5] f816e5b276f1ef15840bec6667f1e8219717ab7d [6] 58af9a70cc0f195116dedb3fd0e2ca5b4fec9e70 Signed-off-by: Romain Naour Cc: Guo Ren Cc: Thomas Petazzoni Asked-by: Guo Ren Signed-off-by: Yann E. MORIN --- board/qemu/csky/linux-ck610.config.fragment | 6 ------ board/qemu/csky/linux-ck807.config.fragment | 5 ----- board/qemu/csky/linux-ck810.config.fragment | 5 ----- board/qemu/csky/linux-ck860.config.fragment | 9 --------- board/qemu/csky/readme.txt | 15 --------------- configs/qemu_csky610_virt_defconfig | 20 -------------------- configs/qemu_csky807_virt_defconfig | 20 -------------------- configs/qemu_csky810_virt_defconfig | 20 -------------------- configs/qemu_csky860_virt_defconfig | 20 -------------------- 9 files changed, 120 deletions(-) delete mode 100644 board/qemu/csky/linux-ck610.config.fragment delete mode 100644 board/qemu/csky/linux-ck807.config.fragment delete mode 100644 board/qemu/csky/linux-ck810.config.fragment delete mode 100644 board/qemu/csky/linux-ck860.config.fragment delete mode 100644 board/qemu/csky/readme.txt delete mode 100644 configs/qemu_csky610_virt_defconfig delete mode 100644 configs/qemu_csky807_virt_defconfig delete mode 100644 configs/qemu_csky810_virt_defconfig delete mode 100644 configs/qemu_csky860_virt_defconfig diff --git a/board/qemu/csky/linux-ck610.config.fragment b/board/qemu/csky/linux-ck610.config.fragment deleted file mode 100644 index b690c7d6ec..0000000000 --- a/board/qemu/csky/linux-ck610.config.fragment +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK610=y -CONFIG_CPU_PM_WAIT=y -CONFIG_RAM_BASE=0x10000000 -CONFIG_CSKY_APB_INTC=y -CONFIG_GX6605S_TIMER=y diff --git a/board/qemu/csky/linux-ck807.config.fragment b/board/qemu/csky/linux-ck807.config.fragment deleted file mode 100644 index b6974f0157..0000000000 --- a/board/qemu/csky/linux-ck807.config.fragment +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK807=y -# CONFIG_CPU_HAS_FPU is not set -CONFIG_CPU_PM_WAIT=y -CONFIG_CSKY_APB_INTC=y diff --git a/board/qemu/csky/linux-ck810.config.fragment b/board/qemu/csky/linux-ck810.config.fragment deleted file mode 100644 index 50fa1f4f79..0000000000 --- a/board/qemu/csky/linux-ck810.config.fragment +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK810=y -# CONFIG_CPU_HAS_FPU is not set -CONFIG_CPU_PM_WAIT=y -CONFIG_CSKY_APB_INTC=y diff --git a/board/qemu/csky/linux-ck860.config.fragment b/board/qemu/csky/linux-ck860.config.fragment deleted file mode 100644 index e8f6af10ba..0000000000 --- a/board/qemu/csky/linux-ck860.config.fragment +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG_COMPILE_TEST=y -CONFIG_CPU_CK860=y -# CONFIG_CPU_HAS_FPU is not set -CONFIG_CPU_PM_WAIT=y -CONFIG_SMP=y -CONFIG_HOTPLUG_CPU=y -CONFIG_CSKY_APB_INTC=y -CONFIG_CSKY_MPINTC=y -CONFIG_CSKY_MP_TIMER=y diff --git a/board/qemu/csky/readme.txt b/board/qemu/csky/readme.txt deleted file mode 100644 index 5e4cb1871c..0000000000 --- a/board/qemu/csky/readme.txt +++ /dev/null @@ -1,15 +0,0 @@ -Run with qemu: - -For ck860 smp: - qemu-system-cskyv2 -M virt -cpu ck860 -smp 2 -nographic -kernel vmlinux # qemu_csky860_virt_defconfig - -For ck807: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky807_virt_defconfig - -For ck810: - qemu-system-cskyv2 -M virt -nographic -kernel vmlinux # qemu_csky810_virt_defconfig - -For ck610: - qemu-system-cskyv1 -M virt -nographic -kernel vmlinux # qemu_csky610_virt_defconfig - -The login prompt will appear in the terminal that started Qemu. Username is root and no password. diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig deleted file mode 100644 index e7d75f5f49..0000000000 --- a/configs/qemu_csky610_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck610=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" diff --git a/configs/qemu_csky807_virt_defconfig b/configs/qemu_csky807_virt_defconfig deleted file mode 100644 index df12450a55..0000000000 --- a/configs/qemu_csky807_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck807=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck807.config.fragment" diff --git a/configs/qemu_csky810_virt_defconfig b/configs/qemu_csky810_virt_defconfig deleted file mode 100644 index dd1fd329f5..0000000000 --- a/configs/qemu_csky810_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck810=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck810.config.fragment" diff --git a/configs/qemu_csky860_virt_defconfig b/configs/qemu_csky860_virt_defconfig deleted file mode 100644 index 6edfba4e8e..0000000000 --- a/configs/qemu_csky860_virt_defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck860=y - -# System -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# linux kernel header, the same version with linux kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck860.config.fragment"