From 4c6c03c3152d6b9f8c08746e797781566b2fc2cb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2019 15:26:35 +0100 Subject: csky: rework qemu support --- target/linux/Config.in.kernelversion | 4 ---- target/linux/config/Config.in.ethernet | 12 +++--------- target/linux/config/Config.in.serial | 12 +++--------- 3 files changed, 6 insertions(+), 22 deletions(-) (limited to 'target/linux') diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index df2de3ffa..8a6ab33c7 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -207,7 +207,6 @@ config ADK_TARGET_LINUX_KERNEL_GIT_REPO default "https://github.com/beagleboard/linux.git" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "https://git.phytec.de/git/linux-ti.git" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "https://github.com/m-labs/linux-milkymist.git" if ADK_TARGET_ARCH_LM32 - default "https://github.com/c-sky/linux-4.9.y.git" if ADK_TARGET_ARCH_CSKY default "https://github.com/riscv/riscv-linux.git" if ADK_TARGET_ARCH_RISCV32 default "https://github.com/riscv/riscv-linux.git" if ADK_TARGET_ARCH_RISCV64 default "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" @@ -217,7 +216,6 @@ config ADK_TARGET_LINUX_KERNEL_GIT_REPO config ADK_TARGET_LINUX_KERNEL_GIT_REPO_NAME string depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "csky" if ADK_TARGET_ARCH_CSKY default "lm32" if ADK_TARGET_ARCH_LM32 default "riscv" if ADK_TARGET_ARCH_RISCV32 default "riscv" if ADK_TARGET_ARCH_RISCV64 @@ -233,7 +231,6 @@ config ADK_TARGET_LINUX_KERNEL_GIT_REPO_NAME config ADK_TARGET_LINUX_KERNEL_GIT string "git version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "10c530f34ed3fb9eb89ff7d7a95df62a2072b623" if ADK_TARGET_ARCH_CSKY default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 default "a2092141807514666a273971cc8fa9e80f14439f" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 @@ -248,7 +245,6 @@ config ADK_TARGET_LINUX_KERNEL_GIT config ADK_TARGET_LINUX_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "4.9.56" if ADK_TARGET_ARCH_CSKY default "4.18.0" if ADK_TARGET_ARCH_RISCV32 default "4.18.0" if ADK_TARGET_ARCH_RISCV64 default "4.14.43" if ADK_TARGET_BOARD_BCM28XX diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index fe78e55a3..9a98c8ef1 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -484,22 +484,16 @@ config ADK_LINUX_KERNEL_STMMAC_ETH select ADK_LINUX_KERNEL_STMMAC_PLATFORM select ADK_LINUX_KERNEL_DWMAC_SUNXI if ADK_TARGET_SYSTEM_BANANA_PRO \ || ADK_TARGET_SYSTEM_ORANGE_PI0 - select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 - select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 - select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 + select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_QEMU_CSKY select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK select ADK_LINUX_KERNEL_MICREL_PHY if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK depends on ADK_TARGET_SYSTEM_BANANA_PRO \ || ADK_TARGET_SYSTEM_ORANGE_PI0 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 \ + || ADK_TARGET_SYSTEM_QEMU_CSKY \ || ADK_TARGET_SYSTEM_SYNOPSYS_HSDK default y if ADK_TARGET_SYSTEM_BANANA_PRO default y if ADK_TARGET_SYSTEM_ORANGE_PI0 - default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 - default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 - default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 + default y if ADK_TARGET_SYSTEM_QEMU_CSKY default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK default n diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index c6fa0c6e1..44c78d80b 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -92,9 +92,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 select ADK_LINUX_KERNEL_SERIAL_8250_CONSOLE select ADK_LINUX_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \ || ADK_TARGET_SYSTEM_IMGTEC_CI20 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 \ + || ADK_TARGET_SYSTEM_QEMU_CSKY \ || ADK_TARGET_SYSTEM_QEMU_XTENSA \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \ @@ -121,9 +119,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_QEMU_MIPS \ || ADK_TARGET_SYSTEM_QEMU_MIPS64 \ || ADK_TARGET_SYSTEM_QEMU_ALPHA \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 \ - || ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 \ + || ADK_TARGET_SYSTEM_QEMU_CSKY \ || ADK_TARGET_SYSTEM_QEMU_HPPA \ || ADK_TARGET_SYSTEM_QEMU_NIOS2 \ || ADK_TARGET_SYSTEM_QEMU_OR1K \ @@ -153,9 +149,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 default y if ADK_TARGET_SYSTEM_QEMU_ALPHA - default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK610 - default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 - default y if ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 + default y if ADK_TARGET_SYSTEM_QEMU_CSKY default y if ADK_TARGET_SYSTEM_QEMU_HPPA default y if ADK_TARGET_SYSTEM_QEMU_NIOS2 default y if ADK_TARGET_SYSTEM_QEMU_OR1K -- cgit v1.2.3