diff options
Diffstat (limited to 'target/csky')
-rw-r--r-- | target/csky/Makefile | 11 | ||||
-rw-r--r-- | target/csky/kernel/qemu-csky (renamed from target/csky/kernel/qemu-csky-ck610) | 1 | ||||
-rw-r--r-- | target/csky/kernel/qemu-csky-ck807 | 8 | ||||
-rw-r--r-- | target/csky/kernel/qemu-csky-ck810 | 8 | ||||
-rw-r--r-- | target/csky/qemu.dtb | bin | 1606 -> 0 bytes | |||
-rw-r--r-- | target/csky/qemu.dts | 87 | ||||
-rw-r--r-- | target/csky/systems/qemu-csky | 7 | ||||
-rw-r--r-- | target/csky/systems/qemu-csky-ck610 | 8 | ||||
-rw-r--r-- | target/csky/systems/qemu-csky-ck807 | 8 | ||||
-rw-r--r-- | target/csky/systems/qemu-csky-ck810 | 8 | ||||
-rw-r--r-- | target/csky/uclibc-ng.config | 21 |
11 files changed, 25 insertions, 142 deletions
diff --git a/target/csky/Makefile b/target/csky/Makefile index 7a470dafe..7b668d815 100644 --- a/target/csky/Makefile +++ b/target/csky/Makefile @@ -7,16 +7,9 @@ include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) +QEMU:=qemu-system-cskyv2 QEMU_ARGS:=${ADK_QEMU_ARGS} -M virt -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK610),y) -QEMU:=qemu-system-cskyv1 -dtb target/csky/qemu.dtb -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK807),y) -QEMU:=qemu-system-cskyv2 -dtb target/csky/qemu.dtb -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_CSKY_CK810),y) -QEMU:=qemu-system-cskyv2 -dtb target/csky/qemu.dtb -endif +QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0 # target helper text ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/csky/kernel/qemu-csky-ck610 b/target/csky/kernel/qemu-csky index 0b5df804f..1d06909b6 100644 --- a/target/csky/kernel/qemu-csky-ck610 +++ b/target/csky/kernel/qemu-csky @@ -1,5 +1,4 @@ CONFIG_CSKY=y -CONFIG_CPU_CK610=y CONFIG_CSKY_IRQ=y CONFIG_RAM_BASE=0x0 CONFIG_NATIONALCHIP_IRQ=y diff --git a/target/csky/kernel/qemu-csky-ck807 b/target/csky/kernel/qemu-csky-ck807 deleted file mode 100644 index ea91eeffe..000000000 --- a/target/csky/kernel/qemu-csky-ck807 +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_CSKY=y -CONFIG_CPU_CK807=y -CONFIG_CSKY_IRQ=y -CONFIG_RAM_BASE=0x0 -CONFIG_NATIONALCHIP_IRQ=y -CONFIG_NATIONALCHIP_TIMER=y -CONFIG_CSKYMAC=y -CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/csky/kernel/qemu-csky-ck810 b/target/csky/kernel/qemu-csky-ck810 deleted file mode 100644 index 6abd83aa8..000000000 --- a/target/csky/kernel/qemu-csky-ck810 +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_CSKY=y -CONFIG_CPU_CK810=y -CONFIG_CSKY_IRQ=y -CONFIG_RAM_BASE=0x0 -CONFIG_NATIONALCHIP_IRQ=y -CONFIG_NATIONALCHIP_TIMER=y -CONFIG_CSKYMAC=y -CONFIG_SECTION_MISMATCH_WARN_ONLY=y diff --git a/target/csky/qemu.dtb b/target/csky/qemu.dtb Binary files differdeleted file mode 100644 index 8b24acfd2..000000000 --- a/target/csky/qemu.dtb +++ /dev/null diff --git a/target/csky/qemu.dts b/target/csky/qemu.dts deleted file mode 100644 index 44f57f352..000000000 --- a/target/csky/qemu.dts +++ /dev/null @@ -1,87 +0,0 @@ -/dts-v1/; - -/ { - model = "qemu.csky"; - compatible = "csky"; - #address-cells = <1>; - #size-cells = <1>; - - memory { - device_type = "memory"; - reg = <0x0 0x40000000>; - }; - - soc { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - ranges; - - intc: interrupt-controller { - compatible = "csky,intc-v1"; - reg = <0xfffff000 0x1000>; - interrupt-controller; - #interrupt-cells = <1>; - }; - - /* clockevent */ - timer0 { - compatible = "snps,dw-apb-timer"; - reg = <0xffffd000 0x1000>; - clocks = <&dummy_apb>; - clock-names = "timer"; - interrupts = <1>; - interrupt-parent = <&intc>; - }; - - /* clocksource */ - timer1 { - compatible = "snps,dw-apb-timer"; - reg = <0xffffd014 0x800>; - clocks = <&dummy_apb>; - clock-names = "timer"; - interrupts = <2>; - interrupt-parent = <&intc>; - }; - - serial0 { - compatible = "ns16550a"; - reg = <0xffffe000 0x1000>; - interrupt-parent = <&intc>; - interrupts = <3>; - clocks = <&dummy_apb>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <1>; - }; - - dummy_apb: apb-clock { - compatible = "fixed-clock"; - clock-frequency = <40000000>; - clock-output-names = "dummy_apb"; - #clock-cells = <0>; - }; - - gmac: ethernet { - compatible = "snps,dwmac"; - reg = <0xffffa000 0x2000>; - interrupt-parent = <&intc>; - interrupts = <4>; - interrupt-names = "macirq"; - clocks = <&dummy_apb>; - clock-names = "stmmaceth"; - phy-mode = "mii"; - snps,pbl = <32>; - snps,fixed-burst; - }; - - qemu-exit { - compatible = "csky,qemu-exit"; - reg = <0xffffc000 0x1000>; - }; - }; - - chosen { - bootargs = "console=ttyS0,115200"; - }; -}; diff --git a/target/csky/systems/qemu-csky b/target/csky/systems/qemu-csky new file mode 100644 index 000000000..ee38d08c5 --- /dev/null +++ b/target/csky/systems/qemu-csky @@ -0,0 +1,7 @@ +config ADK_TARGET_SYSTEM_QEMU_CSKY + bool "Qemu Emulator" + select ADK_TARGET_QEMU + select ADK_TARGET_KERNEL_WITH_COMPRESSION + help + Qemu Emulator for C-SKY architecture. + 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/systems/qemu-csky-ck807 b/target/csky/systems/qemu-csky-ck807 deleted file mode 100644 index c938c70cd..000000000 --- a/target/csky/systems/qemu-csky-ck807 +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_CSKY_CK807 - bool "Qemu Emulator (ck807)" - select ADK_TARGET_QEMU - select ADK_TARGET_CPU_CSKY_CK807 - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for C-SKY architecture (ck807). - diff --git a/target/csky/systems/qemu-csky-ck810 b/target/csky/systems/qemu-csky-ck810 deleted file mode 100644 index 68a431588..000000000 --- a/target/csky/systems/qemu-csky-ck810 +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_CSKY_CK810 - bool "Qemu Emulator (ck810)" - select ADK_TARGET_QEMU - select ADK_TARGET_CPU_CSKY_CK810 - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for C-SKY architecture (ck810). - diff --git a/target/csky/uclibc-ng.config b/target/csky/uclibc-ng.config index 00de26e54..92328ce91 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.48 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -16,6 +16,7 @@ TARGET_csky=y # TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set +# TARGET_kvx is not set # TARGET_lm32 is not set # TARGET_m68k is not set # TARGET_metag is not set @@ -25,11 +26,16 @@ TARGET_csky=y # TARGET_nios2 is not set # TARGET_or1k is not set # TARGET_powerpc is not set +# TARGET_riscv64 is not set +# TARGET_riscv32 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 +TARGET_LDSO_NAME="ld-uClibc" +TARGET_ARCH_BITS=32 # # Target Architecture Features and Options @@ -41,7 +47,6 @@ TARGET_SUBARCH="" # # Using ELF file format # -ARCH_HAS_DEPRECATED_SYSCALLS=y ARCH_ANY_ENDIAN=y ARCH_LITTLE_ENDIAN=y # ARCH_WANTS_BIG_ENDIAN is not set @@ -60,6 +65,7 @@ HAVE_DOT_CONFIG=y # General Library Settings # # DOPIC is not set +HAVE_LDSO=y HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y @@ -75,7 +81,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 @@ -84,6 +89,7 @@ UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y +PTHREADS_STACK_DEFAULT_SIZE=2097152 UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set @@ -112,6 +118,7 @@ UCLIBC_HAS_TZ_FILE=y UCLIBC_HAS_TZ_FILE_READ_MANY=y UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y +UCLIBC_USE_TIME64=y # # Advanced Library Settings @@ -127,6 +134,7 @@ UCLIBC_HAS_GNU_ERROR=y UCLIBC_BSD_SPECIFIC=y UCLIBC_HAS_BSD_ERR=y UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y +# UCLIBC_HAS_BSD_B64_NTOP_B64_PTON is not set UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL=y UCLIBC_NTP_LEGACY=y # UCLIBC_SV4_DEPRECATED is not set @@ -149,6 +157,10 @@ UCLIBC_HAS_BSD_RES_CLOSE=y UCLIBC_HAS_COMPAT_RES_STATE=y UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y UCLIBC_HAS_RESOLVER_SUPPORT=y +# UCLIBC_DNSRAND_MODE_URANDOM is not set +# UCLIBC_DNSRAND_MODE_CLOCK is not set +UCLIBC_DNSRAND_MODE_PRNGPLUS=y +# UCLIBC_DNSRAND_MODE_SIMPLECOUNTER is not set # # String and Stdio Support @@ -218,7 +230,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 +248,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 |