diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87ed99f1..3777f60e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,6 @@ on: - arm-zephyr-eabi - microblazeel-zephyr-elf - mips-zephyr-elf - - nios2-zephyr-elf - riscv64-zephyr-elf - rx-zephyr-elf - sparc-zephyr-elf @@ -170,7 +169,6 @@ jobs: arm-zephyr-eabi) build_target_arm_zephyr_eabi="y";; microblazeel-zephyr-elf) build_target_microblazeel_zephyr_elf="y";; mips-zephyr-elf) build_target_mips_zephyr_elf="y";; - nios2-zephyr-elf) build_target_nios2_zephyr_elf="y";; riscv64-zephyr-elf) build_target_riscv64_zephyr_elf="y";; rx-zephyr-elf) build_target_rx_zephyr_elf="y";; sparc-zephyr-elf) build_target_sparc_zephyr_elf="y";; @@ -220,7 +218,6 @@ jobs: build_target_arm_zephyr_eabi="y" build_target_microblazeel_zephyr_elf="y" build_target_mips_zephyr_elf="y" - build_target_nios2_zephyr_elf="y" build_target_riscv64_zephyr_elf="y" build_target_rx_zephyr_elf="y" build_target_sparc_zephyr_elf="y" @@ -310,7 +307,6 @@ jobs: [ "${build_target_arm_zephyr_eabi}" == "y" ] && MATRIX_TARGETS+='"arm-zephyr-eabi",' [ "${build_target_microblazeel_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"microblazeel-zephyr-elf",' [ "${build_target_mips_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"mips-zephyr-elf",' - [ "${build_target_nios2_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"nios2-zephyr-elf",' [ "${build_target_riscv64_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"riscv64-zephyr-elf",' [ "${build_target_rx_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"rx-zephyr-elf",' [ "${build_target_sparc_zephyr_elf}" == "y" ] && MATRIX_TARGETS+='"sparc-zephyr-elf",' @@ -1560,9 +1556,6 @@ jobs: mips-zephyr-elf) PLATFORM_ARGS+="-p qemu_malta " ;; - nios2-zephyr-elf) - PLATFORM_ARGS+="-p qemu_nios2 " - ;; riscv64-zephyr-elf) PLATFORM_ARGS+="-p qemu_riscv32 " PLATFORM_ARGS+="-p qemu_riscv32e " diff --git a/cmake/zephyr/target.cmake b/cmake/zephyr/target.cmake index 8fc12ebf..7246f7a4 100644 --- a/cmake/zephyr/target.cmake +++ b/cmake/zephyr/target.cmake @@ -7,7 +7,6 @@ else() set(CROSS_COMPILE_TARGET_arm arm-zephyr-eabi) endif() set(CROSS_COMPILE_TARGET_arm64 aarch64-zephyr-elf) -set(CROSS_COMPILE_TARGET_nios2 nios2-zephyr-elf) set(CROSS_COMPILE_TARGET_riscv riscv64-zephyr-elf) set(CROSS_COMPILE_TARGET_mips mips-zephyr-elf) set(CROSS_COMPILE_TARGET_rx rx-zephyr-elf) diff --git a/configs/nios2-zephyr-elf.config b/configs/nios2-zephyr-elf.config deleted file mode 100644 index c1fd3ad9..00000000 --- a/configs/nios2-zephyr-elf.config +++ /dev/null @@ -1,8 +0,0 @@ -CT_CONFIG_VERSION="3" -CT_EXPERIMENTAL=y -CT_ARCH_NIOS2=y -CT_ARCH_USE_MMU=y -CT_TARGET_VENDOR="zephyr" -CT_TARGET_CFLAGS="-ftls-model=local-exec" -CT_MULTILIB=y -CT_CC_GCC_CONFIG_TLS=n diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb index a7fce814..724f8bd4 100644 --- a/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb +++ b/meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb @@ -173,7 +173,6 @@ do_install:append() { ln -sf ../synopsys/bin/qemu-system-arc64 ${D}${bindir}/qemu-system-arc64 # Link other legacy QEMU executables - ln -sf ../legacy/bin/qemu-system-nios2 ${D}${bindir}/qemu-system-nios2 ln -sf ../legacy/bin/qemu-system-sparc ${D}${bindir}/qemu-system-sparc } diff --git a/meta-zephyr-sdk/recipes-devtools/qemu/qemu.inc b/meta-zephyr-sdk/recipes-devtools/qemu/qemu.inc index f6d27bb7..a5f90a3b 100644 --- a/meta-zephyr-sdk/recipes-devtools/qemu/qemu.inc +++ b/meta-zephyr-sdk/recipes-devtools/qemu/qemu.inc @@ -171,7 +171,6 @@ do_install:append() { ln -sf ../synopsys/bin/qemu-system-arc64 ${D}${bindir}/qemu-system-arc64 # Link other legacy QEMU executables - ln -sf ../legacy/bin/qemu-system-nios2 ${D}${bindir}/qemu-system-nios2 ln -sf ../legacy/bin/qemu-system-sparc ${D}${bindir}/qemu-system-sparc } diff --git a/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb b/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb index e64b98c7..3d1f2b39 100644 --- a/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb +++ b/meta-zephyr-sdk/recipes-devtools/qemu_legacy/qemu-legacy_git.bb @@ -195,7 +195,7 @@ inherit autotools pkgconfig #--disable-fdt: Cannot use if supporting ARM #--disable-kvm: AArch64 has a QEMU/KVM board -QEMUS_BUILT = "nios2-softmmu sparc-softmmu" +QEMUS_BUILT = "sparc-softmmu" QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \ --disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio\ --disable-guest-agent --disable-libssh --disable-vnc-png --disable-seccomp \