* [Buildroot] [PATCH 02/12] support/scripts/gen-bootlin-toolchains: remove nios2 toolchain
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 03/12] toolchain/toolchain-external: remove Bootlin nios2 external toolchain Romain Naour via buildroot
` (11 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni
Nios2 will be removed from Buildroot, so Bootlin toolchains will
no longer provide nios2 toolchain in further releases.
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
support/scripts/gen-bootlin-toolchains | 4 ----
1 file changed, 4 deletions(-)
diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains
index bd1beec995..df16cff5c4 100755
--- a/support/scripts/gen-bootlin-toolchains
+++ b/support/scripts/gen-bootlin-toolchains
@@ -118,10 +118,6 @@ arches = {
'conditions': ['BR2_mips64el', 'BR2_mips_64r6', 'BR2_MIPS_NABI32', '!BR2_MIPS_SOFT_FLOAT'],
'prefix': 'mips64el',
},
- 'nios2': {
- 'conditions': ['BR2_nios2'],
- 'prefix': 'nios2',
- },
'openrisc': {
'conditions': ['BR2_or1k'],
'prefix': 'or1k',
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 03/12] toolchain/toolchain-external: remove Bootlin nios2 external toolchain
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 02/12] support/scripts/gen-bootlin-toolchains: " Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 04/12] package/glibc: remove nios2 support Romain Naour via buildroot
` (10 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
We are going to remove nios2 support, so remove the Bootlin nios2
external toolchain.
Remove this toolchain from the Buildroot testsuite.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Config.in.legacy | 12 +++++
.../tests/toolchain/test_external_bootlin.py | 28 -----------
.../Config.in.options | 50 -------------------
.../toolchain-external-bootlin.hash | 4 --
.../toolchain-external-bootlin.mk | 12 -----
5 files changed, 12 insertions(+), 94 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index fd12f8d49f..54c251be1f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,18 @@ endif
comment "Legacy options removed in 2025.02"
+config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE
+ bool "Bootlin nios2 glibc bleeding-edge toolchain removed"
+ select BR2_LEGACY
+ help
+ The nios2 Bootlin toolchains have been removed.
+
+config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE
+ bool "Bootlin nios2 glibc stable toolchain removed"
+ select BR2_LEGACY
+ help
+ The nios2 Bootlin toolchains have been removed.
+
config BR2_PACKAGE_DIRECTFB
bool "directfb has been removed"
select BR2_LEGACY
diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py
index c137444cbc..6bcebf80c0 100644
--- a/support/testing/tests/toolchain/test_external_bootlin.py
+++ b/support/testing/tests/toolchain/test_external_bootlin.py
@@ -1653,34 +1653,6 @@ class TestExternalToolchainBootlinMips64r6eln32UclibcStable(TestExternalToolchai
TestExternalToolchain.common_check(self)
-class TestExternalToolchainBootlinNios2GlibcBleedingEdge(TestExternalToolchain):
- config = """
- BR2_nios2=y
- BR2_TOOLCHAIN_EXTERNAL=y
- BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
- BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE=y
- # BR2_TARGET_ROOTFS_TAR is not set
- """
- toolchain_prefix = "nios2-linux"
-
- def test_run(self):
- TestExternalToolchain.common_check(self)
-
-
-class TestExternalToolchainBootlinNios2GlibcStable(TestExternalToolchain):
- config = """
- BR2_nios2=y
- BR2_TOOLCHAIN_EXTERNAL=y
- BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
- BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE=y
- # BR2_TARGET_ROOTFS_TAR is not set
- """
- toolchain_prefix = "nios2-linux"
-
- def test_run(self):
- TestExternalToolchain.common_check(self)
-
-
class TestExternalToolchainBootlinOpenriscGlibcBleedingEdge(TestExternalToolchain):
config = """
BR2_or1k=y
diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options
index 098e44fc36..1bbc0239e6 100644
--- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options
+++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options
@@ -22,7 +22,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS
default y if BR2_mips64 && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT
default y if BR2_mips64el && BR2_mips_64 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT
default y if BR2_mips64el && BR2_mips_64r6 && BR2_MIPS_NABI32 && !BR2_MIPS_SOFT_FLOAT
- default y if BR2_nios2
default y if BR2_or1k
default y if BR2_powerpc && BR2_powerpc_440fp
default y if BR2_powerpc && BR2_powerpc_e300c3
@@ -2782,55 +2781,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE
https://toolchains.bootlin.com/
-config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE
- bool "nios2 glibc bleeding-edge 2024.05-1"
- depends on BR2_nios2
- depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15
- depends on BR2_USE_MMU
- select BR2_TOOLCHAIN_GCC_AT_LEAST_14
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15
- select BR2_INSTALL_LIBSTDCPP
- select BR2_TOOLCHAIN_HAS_FORTRAN
- select BR2_TOOLCHAIN_HAS_OPENMP
- select BR2_TOOLCHAIN_HAS_SSP
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS_NPTL
- select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- help
- Bootlin toolchain for the nios2 architecture, using the
- glibc C library. This is a bleeding-edge version, which
- means it is using the latest versions of gcc, gdb and
- binutils.
-
- https://toolchains.bootlin.com/
-
-config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE
- bool "nios2 glibc stable 2024.05-1"
- depends on BR2_nios2
- depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_14
- depends on BR2_USE_MMU
- select BR2_TOOLCHAIN_GCC_AT_LEAST_13
- select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
- select BR2_INSTALL_LIBSTDCPP
- select BR2_TOOLCHAIN_HAS_OPENMP
- select BR2_TOOLCHAIN_HAS_SSP
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS
- select BR2_TOOLCHAIN_HAS_THREADS_NPTL
- select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- help
- Bootlin toolchain for the nios2 architecture, using the
- glibc C library. This is a stable version, which means it
- is using stable and proven versions of gcc, gdb and
- binutils.
-
- https://toolchains.bootlin.com/
-
config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE
bool "openrisc glibc bleeding-edge 2024.05-1"
depends on BR2_or1k
diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash
index adc42531cc..daa5c4cc79 100644
--- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash
+++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash
@@ -212,10 +212,6 @@ sha256 cce09fc456b592a993a7c8d182cdd1f04397a8160f176d9ac6799d8e2e09cef7 mips64
sha256 e12b6536fbacb624b0d938345fb29b202c8b174893d0d8fbefde46fbe727c729 mips64r6el-n32--uclibc--bleeding-edge-2024.05-1.tar.xz
# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2024.05-1.sha256
sha256 a0db853f4c40d120d22e6762ca4bff64e0c3e3db74ab59950967917aeb9bf330 mips64r6el-n32--uclibc--stable-2024.05-1.tar.xz
-# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2024.05-1.sha256
-sha256 5d034a538a8613ef324ae96f097c122ed99574ec8707e3274743e4d79efd374c nios2--glibc--bleeding-edge-2024.05-1.tar.xz
-# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2024.05-1.sha256
-sha256 db7a12e0b22037f3aad01cd126b5f1bfe7dc514e37f8c484eb587b861f20fbcd nios2--glibc--stable-2024.05-1.tar.xz
# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2024.05-1.sha256
sha256 0de17cd13642f71f112d086c1df4b34670440ceb459478a0f3d55007945633ca openrisc--glibc--bleeding-edge-2024.05-1.tar.xz
# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2024.05-1.sha256
diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk
index 18639db1b3..a3d8ce215c 100644
--- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk
+++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk
@@ -642,18 +642,6 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_E
TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs
endif
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE),y)
-TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1
-TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz
-TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs
-endif
-
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE),y)
-TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1
-TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz
-TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs
-endif
-
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE),y)
TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1
TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 04/12] package/glibc: remove nios2 support
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 02/12] support/scripts/gen-bootlin-toolchains: " Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 03/12] toolchain/toolchain-external: remove Bootlin nios2 external toolchain Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 05/12] package/gcc: remove nios2 handling Romain Naour via buildroot
` (9 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Doing so, we remove nios2 support from the internal toolchain backend.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
arch/Config.in | 1 +
package/glibc/Config.in | 1 -
package/glibc/glibc.mk | 4 ----
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/Config.in b/arch/Config.in
index e57f4b2baa..7da2dc69e4 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -145,6 +145,7 @@ config BR2_mips64el
config BR2_nios2
bool "Nios II"
+ select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
select BR2_USE_MMU
help
Nios II is a soft core processor from Altera Corporation.
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index 6075d28874..d464b3def8 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -20,7 +20,6 @@ config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS
default y if BR2_sparc64
default y if BR2_x86_64
default y if BR2_microblaze
- default y if BR2_nios2
default y if BR2_arc && BR2_ARC_ATOMIC_EXT && !BR2_arc750d && !BR2_arc770d
depends on !BR2_POWERPC_CPU_HAS_SPE
depends on BR2_RISCV_ISA_RVA || !BR2_riscv
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index cee03a16fd..e026c18762 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -143,10 +143,6 @@ endif
# Glibc nowadays can be build with optimization flags f.e. -Os
GLIBC_CFLAGS = $(TARGET_OPTIMIZATION)
-# crash in qemu-system-nios2 with -Os
-ifeq ($(BR2_nios2),y)
-GLIBC_CFLAGS += -O2
-endif
# glibc can't be built without optimization
ifeq ($(BR2_OPTIMIZE_0),y)
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 05/12] package/gcc: remove nios2 handling
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (2 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 04/12] package/glibc: remove nios2 support Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 06/12] arch: disable nios2 Romain Naour via buildroot
` (8 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Buildroot internal toolchain backend for nios2 was removed, so
remove nios2 handling for gcc package.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
package/gcc/gcc.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index b39ca8566d..658f5a6b4f 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -293,11 +293,6 @@ HOST_GCC_COMMON_CONF_OPTS += \
--with-long-double-128
endif
-# allow to build gcc 14.x
-ifeq ($(BR2_nios2),y)
-HOST_GCC_COMMON_CONF_OPTS += --enable-obsolete
-endif
-
HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"'
# For gcc-initial, we need to tell gcc that the C library will be
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 06/12] arch: disable nios2
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (3 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 05/12] package/gcc: remove nios2 handling Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 07/12] package: remove BR2_nios2 symbol Romain Naour via buildroot
` (7 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The nios2 architecture was deprecated in gcc-14 and has been removed
in the upcoming gcc-15 [1][2].
Our last and only nios2 defconfig "qemu_nios2_10m50_defconfig" was
removed in 2024.11 due to nios2 removal from Qemu 9.1.0 [3].
This patch only definitively hides the symbol. When all references
to it are removed (to come in followup patches), we'll eventually
remove the symbol altogether.
[1] https://sourceware.org/pipermail/binutils/2024-April/133675.html
[2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e876acab6cdd84bb2b32c98fc69fb0ba29c81153
[3] f96b4c176f6e9d6c4374a0d322de672bf44c35bf
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
ignore warning about BR2_BROKEN symbol:
arch/Config.in:148: BR2_BROKEN referenced but not defined
---
.defconfig | 1 -
arch/Config.in | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/.defconfig b/.defconfig
index 7ab0c3fbf0..d25c62e104 100644
--- a/.defconfig
+++ b/.defconfig
@@ -12,7 +12,6 @@ BR2_i386=y
# BR2_m68k is not set
# BR2_mips is not set
# BR2_mipsel is not set
-# BR2_nios2 is not set
# BR2_powerpc is not set
# BR2_sh is not set
# BR2_sparc is not set
diff --git a/arch/Config.in b/arch/Config.in
index 7da2dc69e4..6254cb6467 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -145,6 +145,7 @@ config BR2_mips64el
config BR2_nios2
bool "Nios II"
+ depends on BR2_BROKEN
select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
select BR2_USE_MMU
help
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 07/12] package: remove BR2_nios2 symbol
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (4 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 06/12] arch: disable nios2 Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 08/12] linux: " Romain Naour via buildroot
` (6 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Remaining "nios2" strings come from existing patches that
are not removed with along with BR2_nios2 symbol.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
.checkpackageignore | 1 -
package/apache/0002-nios2_is_not_os2.patch | 18 ------------------
package/binutils/Config.in | 2 --
package/bird/Config.in | 1 -
package/bpftool/Config.in | 2 --
package/dhcpcd/Config.in | 1 -
package/e2fsprogs/Config.in | 1 -
package/e2fsprogs/e2fsprogs.mk | 4 ----
package/ffmpeg/Config.in | 2 --
package/fio/Config.in | 4 ----
package/gtkmm3/Config.in | 5 -----
package/haproxy/Config.in | 2 --
package/jemalloc/Config.in | 1 -
package/libcdaudio/Config.in | 2 --
package/libgpg-error/Config.in | 4 +---
package/liburcu/Config.in | 2 +-
package/libvncserver/Config.in | 3 ---
package/lightning/Config.in | 2 --
package/ltp-testsuite/Config.in | 2 --
package/mpd/Config.in | 2 --
package/opkg-utils/Config.in | 4 ++--
package/poco/poco.mk | 2 +-
package/postgresql/postgresql.mk | 2 +-
package/qemu/qemu.mk | 1 -
package/quickjs/Config.in | 2 --
package/samba4/Config.in | 1 -
package/sedutil/Config.in | 2 +-
package/strace/Config.in | 6 ------
package/stress-ng/Config.in | 5 ++---
package/swipl/Config.in | 1 -
package/systemd/Config.in | 1 -
package/systemd/systemd.mk | 5 -----
package/tftpd/Config.in | 2 --
package/transmission/Config.in | 2 --
package/uboot-tools/uboot-tools.mk | 4 ++--
package/x11vnc/Config.in | 1 -
package/z3/Config.in | 1 -
37 files changed, 11 insertions(+), 92 deletions(-)
delete mode 100644 package/apache/0002-nios2_is_not_os2.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 84b1e7ae00..a86c5dd6f6 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -268,7 +268,6 @@ package/android-tools/0009-Fix-makefiles-for-out-of-tree-ext4_utils-build.patch
package/android-tools/0010-adb-added-patch-for-openssl-1.1.0-compatibility.patch lib_patch.Upstream
package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch lib_patch.Upstream
package/apache/0001-cross-compile.patch lib_patch.Upstream
-package/apache/0002-nios2_is_not_os2.patch lib_patch.Upstream
package/apache/S50apache Shellcheck lib_sysv.Indent lib_sysv.Variables
package/apitrace/0001-thirdparty-libbacktrace-backtrace-h-include-config.h.patch lib_patch.Upstream
package/apitrace/0002-gltrace-Avoid-__libc_dlsym-and-__libc_dlopen_mode-on-GLIBC-2-34.patch lib_patch.Upstream
diff --git a/package/apache/0002-nios2_is_not_os2.patch b/package/apache/0002-nios2_is_not_os2.patch
deleted file mode 100644
index 9da8ccac02..0000000000
--- a/package/apache/0002-nios2_is_not_os2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix nios2 detection.
-
-Apache treats nios2 as OS/2.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr httpd-2.4.12.org/configure.in httpd-2.4.12/configure.in
---- httpd-2.4.12.org/configure.in 2015-01-22 18:33:07.000000000 +0100
-+++ httpd-2.4.12/configure.in 2015-04-02 22:01:32.851102219 +0200
-@@ -268,7 +268,7 @@
- AC_MSG_NOTICE([])
-
- case $host in
-- *os2*)
-+ *-os2*)
- # Use a custom made libtool replacement
- echo "using aplibtool"
- LIBTOOL="$abs_srcdir/srclib/apr/build/aplibtool"
diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index 5e1a769998..f0ddf924c8 100644
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_BINUTILS
bool "binutils"
- depends on !BR2_nios2
depends on BR2_USE_WCHAR
select BR2_PACKAGE_ZLIB
help
@@ -22,5 +21,4 @@ config BR2_PACKAGE_BINUTILS_TARGET
endif
comment "binutils needs a toolchain w/ wchar"
- depends on !BR2_nios2
depends on !BR2_USE_WCHAR
diff --git a/package/bird/Config.in b/package/bird/Config.in
index 866fc65617..5e32194c2f 100644
--- a/package/bird/Config.in
+++ b/package/bird/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_BIRD
bool "bird"
- depends on !BR2_nios2 # relocations don't fit
depends on BR2_USE_MMU # fork()
help
BIRD Internet Routing Daemon
diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in
index 55fd09ef3d..9500baf11e 100644
--- a/package/bpftool/Config.in
+++ b/package/bpftool/Config.in
@@ -13,7 +13,6 @@ config BR2_PACKAGE_BPFTOOL
bool "bpftool"
depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_nios2 # binutils
depends on BR2_USE_WCHAR # binutils, elfutils
depends on !BR2_STATIC_LIBS # elfutils
depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils
@@ -27,7 +26,6 @@ config BR2_PACKAGE_BPFTOOL
comment "bpftool needs a toolchain w/ wchar, dynamic library, threads, headers >= 4.12"
depends on BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_nios2
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
|| !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
index 8612d4ba81..f55e613071 100644
--- a/package/dhcpcd/Config.in
+++ b/package/dhcpcd/Config.in
@@ -20,7 +20,6 @@ config BR2_PACKAGE_DHCPCD_ENABLE_PRIVSEP
BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
depends on !(BR2_microblazeel || BR2_microblazebe) || \
BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
- depends on !BR2_nios2 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
depends on !BR2_or1k || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
depends on !BR2_sh || BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
depends on !BR2_xtensa || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index a45767d506..aeb9548f15 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -46,7 +46,6 @@ comment "e2scrub needs bash, coreutils, lvm2, and util-linux"
config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
bool "e4defrag"
- depends on !BR2_nios2 # fallocate not implemented
help
Online defragmenter for ext4 filesystem
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 7e2d9a739d..42ebb8ce77 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -63,10 +63,6 @@ else
E2FSPROGS_CONF_OPTS += --disable-fuse2fs
endif
-ifeq ($(BR2_nios2),y)
-E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
-endif
-
# workaround gcc bug 111001
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_111001),y)
E2FSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Os"
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index 599e1ddfc7..fce2fef993 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -1,8 +1,6 @@
config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
bool
default y
- # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
- depends on !BR2_nios2
# No support for ARMv7-M in the ARM assembly logic
depends on !BR2_ARM_CPU_ARMV7M
# m68k coldfire causes a build failure, because the check for
diff --git a/package/fio/Config.in b/package/fio/Config.in
index 7825209b4c..ff16c7263a 100644
--- a/package/fio/Config.in
+++ b/package/fio/Config.in
@@ -5,9 +5,6 @@ config BR2_PACKAGE_FIO
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_TOOLCHAIN_HAS_THREADS
- # fio uses fallocate() which becomes fallocate64() while compiling with
- # largefile support, but fallocate64() is not available on nios2
- depends on !BR2_nios2
help
fio is an I/O tool meant to be used both for benchmark
and stress/hardware verification.
@@ -18,5 +15,4 @@ comment "fio needs a toolchain w/ dynamic library, threads, gcc >= 4.9"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- depends on !BR2_nios2
depends on BR2_USE_MMU
diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in
index 6b924c856b..76af6b24f9 100644
--- a/package/gtkmm3/Config.in
+++ b/package/gtkmm3/Config.in
@@ -7,11 +7,6 @@ comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9
config BR2_PACKAGE_GTKMM3
bool "gtkmm3"
- # Broken on existing external/internal nios2 toolchains,
- # revisit when they are upgraded with at least Binutils >= 2.26
- # and GCC >= 5.3.
- # https://sourceware.org/bugzilla/show_bug.cgi?id=19405
- depends on !BR2_nios2
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz
depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
diff --git a/package/haproxy/Config.in b/package/haproxy/Config.in
index b348eb9d8a..320508f7ee 100644
--- a/package/haproxy/Config.in
+++ b/package/haproxy/Config.in
@@ -1,8 +1,6 @@
config BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS
bool
default y
- # src/proto_http.c:6330:1: internal compiler error: Segmentation fault
- depends on !BR2_nios2
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60040
depends on !(BR2_sh4 && !BR2_TOOLCHAIN_GCC_AT_LEAST_7)
diff --git a/package/jemalloc/Config.in b/package/jemalloc/Config.in
index c272d4522c..a128b8b376 100644
--- a/package/jemalloc/Config.in
+++ b/package/jemalloc/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS
default y if BR2_i386 || BR2_x86_64
default y if BR2_m68k
default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
- default y if BR2_nios2
default y if BR2_or1k
default y if BR2_powerpc
default y if BR2_riscv
diff --git a/package/libcdaudio/Config.in b/package/libcdaudio/Config.in
index 3eca607fc1..02df01e4fc 100644
--- a/package/libcdaudio/Config.in
+++ b/package/libcdaudio/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_LIBCDAUDIO
bool "libcdaudio"
- # binutils assertion failure
- depends on !BR2_nios2
help
libcdaudio is a library designed to provide functions to
control operation of a CD-ROM when playing audio CDs. It
diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in
index a0ee7ec531..bb0679e2f5 100644
--- a/package/libgpg-error/Config.in
+++ b/package/libgpg-error/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
BR2_i386 || BR2_mips || \
BR2_mipsel || BR2_mips64 || \
BR2_mips64el || BR2_m68k || \
- BR2_nios2 || BR2_or1k || \
+ BR2_or1k || \
BR2_powerpc || BR2_powerpc64 || \
BR2_powerpc64le || BR2_RISCV_64 || \
BR2_RISCV_32 || BR2_s390x || \
@@ -40,8 +40,6 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG
if BR2_mips64 || BR2_mips64el
default "m68k-unknown-linux-gnu" \
if BR2_m68k
- default "nios2-unknown-linux-gnu" \
- if BR2_nios2
default "or1k-unknown-linux-gnu" \
if BR2_or1k
default "powerpc-unknown-linux-gnu" \
diff --git a/package/liburcu/Config.in b/package/liburcu/Config.in
index 5e8fd6060f..d30abc526d 100644
--- a/package/liburcu/Config.in
+++ b/package/liburcu/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
default y
depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be || \
BR2_i386 || BR2_mips || BR2_mips64 || BR2_mipsel || \
- BR2_mips64el || BR2_nios2 || BR2_powerpc || BR2_powerpc64 || \
+ BR2_mips64el || BR2_powerpc || BR2_powerpc64 || \
BR2_powerpc64le || BR2_riscv || BR2_sparc64 || BR2_s390x || BR2_x86_64
depends on BR2_USE_MMU # fork() in test
diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in
index f284894555..a3dce57271 100644
--- a/package/libvncserver/Config.in
+++ b/package/libvncserver/Config.in
@@ -1,8 +1,6 @@
config BR2_PACKAGE_LIBVNCSERVER
bool "libvncserver"
depends on BR2_USE_MMU # VNCommand.c uses fork()
- # binutils issue (bad expression)
- depends on !BR2_nios2
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LZO
select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
@@ -27,5 +25,4 @@ endif
comment "libvncserver needs a toolchain w/ dynamic library"
depends on BR2_USE_MMU
- depends on !BR2_nios2
depends on BR2_STATIC_LIBS
diff --git a/package/lightning/Config.in b/package/lightning/Config.in
index e42730addb..e36ce05ac2 100644
--- a/package/lightning/Config.in
+++ b/package/lightning/Config.in
@@ -21,7 +21,6 @@ if BR2_PACKAGE_LIGHTNING
config BR2_PACKAGE_LIGHTNING_DISASSEMBLER
bool "enable disassembler"
- depends on !BR2_nios2 # binutils
depends on BR2_USE_WCHAR # binutils
select BR2_PACKAGE_BINUTILS
select BR2_PACKAGE_ZLIB
@@ -29,7 +28,6 @@ config BR2_PACKAGE_LIGHTNING_DISASSEMBLER
Enable the GNU lightning disassembler.
comment "lightning disassembler needs a toolchain w/ wchar"
- depends on !BR2_nios2
depends on !BR2_USE_WCHAR
endif
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index b42082e2cc..eafac0743c 100644
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -5,8 +5,6 @@ config BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
# provided in ltp-testsuite
default y if BR2_TOOLCHAIN_HAS_SYNC_4
default y if BR2_arc
- # does not build on nios2, cachectl.h issue
- depends on !BR2_nios2
config BR2_PACKAGE_LTP_TESTSUITE
bool "ltp-testsuite"
diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 902a3da779..03ceaa1e00 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -242,13 +242,11 @@ comment "nfs support needs a toolchain w/ threads support"
depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
comment "samba support needs a glibc toolchain w/ dynamic library, RPC"
- depends on !BR2_nios2
depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
!BR2_TOOLCHAIN_HAS_NATIVE_RPC
config BR2_PACKAGE_MPD_LIBSMBCLIENT
bool "samba"
- depends on !BR2_nios2 # samba
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/opkg-utils/Config.in b/package/opkg-utils/Config.in
index 2973055baf..2123c1ff6c 100644
--- a/package/opkg-utils/Config.in
+++ b/package/opkg-utils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_OPKG_UTILS
bool "opkg-utils"
- depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX # binutils
+ depends on BR2_PACKAGE_BUSYBOX # binutils
depends on BR2_USE_MMU # bash, python3
depends on BR2_USE_WCHAR # python3
depends on BR2_TOOLCHAIN_HAS_THREADS # python3 <- libffi
@@ -23,6 +23,6 @@ config BR2_PACKAGE_OPKG_UTILS
https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/
comment "opkg-utils needs a toolchain w/ wchar, threads, dynamic library"
- depends on !BR2_nios2 || BR2_PACKAGE_BUSYBOX
+ depends on BR2_PACKAGE_BUSYBOX
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 233252c67b..ee740b2377 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -48,7 +48,7 @@ POCO_CONF_OPTS += --no-fpenvironment --no-wstring
endif
# architectures missing some FE_* in their fenv.h
-ifeq ($(BR2_sh4a)$(BR2_nios2),y)
+ifeq ($(BR2_sh4a),y)
POCO_CONF_OPTS += --no-fpenvironment
endif
diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk
index f4b58f58ed..8e0ed45c22 100644
--- a/package/postgresql/postgresql.mk
+++ b/package/postgresql/postgresql.mk
@@ -38,7 +38,7 @@ POSTGRESQL_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-world
POSTGRESQL_INSTALL_STAGING_OPTS += DESTDIR=$(STAGING_DIR) install-world
endif
-ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_riscv)$(BR2_xtensa),y)
+ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_riscv)$(BR2_xtensa),y)
POSTGRESQL_CONF_OPTS += -Dspinlocks=false
else
POSTGRESQL_CONF_OPTS += -Dspinlocks=true
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 2fd2e6767b..3a2f69ea3c 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -372,7 +372,6 @@ HOST_QEMU_DEPENDENCIES = \
# mipsel mipsel
# mips64 mips64
# mips64el mips64el
-# nios2 nios2
# or1k or1k
# powerpc ppc
# powerpc64 ppc64
diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in
index fd174bc657..a59d460706 100644
--- a/package/quickjs/Config.in
+++ b/package/quickjs/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_QUICKJS
bool "quickjs"
depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD
- depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2
depends on !BR2_sh # fenv.h lacks FE_{DOWN,UP}WARD
depends on !BR2_STATIC_LIBS
# No way to check for fenv support.
@@ -18,7 +17,6 @@ config BR2_PACKAGE_QUICKJS
comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library"
depends on !BR2_microblaze
- depends on !BR2_nios2
depends on !BR2_sh
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \
diff --git a/package/samba4/Config.in b/package/samba4/Config.in
index 5907bdc478..36ec656168 100644
--- a/package/samba4/Config.in
+++ b/package/samba4/Config.in
@@ -10,7 +10,6 @@ config BR2_PACKAGE_SAMBA4
depends on BR2_USE_WCHAR # python
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi
depends on !BR2_STATIC_LIBS # cmocka, python, gnutls
- depends on !BR2_nios2 # binary too large, relocations don't fit
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_USES_MUSL
select BR2_PACKAGE_CMOCKA
diff --git a/package/sedutil/Config.in b/package/sedutil/Config.in
index e695f2bed7..1fbb870c05 100644
--- a/package/sedutil/Config.in
+++ b/package/sedutil/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS
# no big endian support
default y if BR2_arcle || BR2_arm || BR2_aarch64 \
|| BR2_i386 || BR2_microblazeel || BR2_mipsel \
- || BR2_mips64el || BR2_nios2 || BR2_powerpc64le \
+ || BR2_mips64el || BR2_powerpc64le \
|| BR2_sh4 || BR2_sh4a || BR2_x86_64 \
|| BR2_XTENSA_LITTLE_ENDIAN
diff --git a/package/strace/Config.in b/package/strace/Config.in
index e0551f3861..ff7d271c0c 100644
--- a/package/strace/Config.in
+++ b/package/strace/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_STRACE
bool "strace"
- # needs at least kernel headers 4.0 on nios2
- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2
# needs at least kernel headers 5.0 on xtensa
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa
# needs at least kernel headers 5.0 on musl aarch64
@@ -19,10 +17,6 @@ config BR2_PACKAGE_STRACE
https://strace.io
-comment "strace needs a toolchain w/ headers >= 4.0 on nios2"
- depends on BR2_nios2
- depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
-
comment "strace needs a toolchain w/ headers >= 5.0 on xtensa"
depends on BR2_xtensa
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in
index 30bb4d10c8..4041aba9b6 100644
--- a/package/stress-ng/Config.in
+++ b/package/stress-ng/Config.in
@@ -5,8 +5,7 @@ config BR2_PACKAGE_STRESS_NG
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
depends on BR2_TOOLCHAIN_HAS_THREADS
- # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC
- depends on !BR2_nios2
+ # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on ARC
depends on !BR2_arc
help
stress-ng will stress test a computer system in various
@@ -17,7 +16,7 @@ config BR2_PACKAGE_STRESS_NG
https://github.com/ColinIanKing/stress-ng
comment "stress-ng needs a toolchain w/ threads, headers >= 3.3"
- depends on !BR2_nios2 && !BR2_arc
+ depends on !BR2_arc
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/swipl/Config.in b/package/swipl/Config.in
index 84b6ace47f..8bf58344b3 100644
--- a/package/swipl/Config.in
+++ b/package/swipl/Config.in
@@ -11,7 +11,6 @@ config BR2_PACKAGE_SWIPL_ARCH_SUPPORTS
default y if BR2_m68k
# BR2_microblaze has only FE_TONEAREST
default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
- # BR2_nios2 has only FE_TONEAREST
default y if BR2_or1k
default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
default y if BR2_riscv
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 9a5386c7dc..851b91aeba 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
default y if BR2_m68k
default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
- default y if BR2_nios2
default y if BR2_riscv
default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
default y if BR2_sparc || BR2_sparc64
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index bf70a3d187..28091a72a6 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -111,11 +111,6 @@ ifeq ($(BR2_OPTIMIZE_FAST),y)
SYSTEMD_CFLAGS += -O3 -fno-finite-math-only
endif
-ifeq ($(BR2_nios2),y)
-# Nios2 ld emits warnings, make warnings not to be treated as errors
-SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings
-endif
-
ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
SYSTEMD_JOURNALD_PERMISSIONS = /var/log/journal d 2755 root systemd-journal - - - - -
endif
diff --git a/package/tftpd/Config.in b/package/tftpd/Config.in
index d4e81e70bc..faaff3fe2e 100644
--- a/package/tftpd/Config.in
+++ b/package/tftpd/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_TFTPD
bool "tftpd"
- # linker issue with pre-6.x toolchains
- depends on !(BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_6)
depends on BR2_USE_MMU # fork()
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
help
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index eeaa7890fb..e767723eef 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -37,7 +37,6 @@ config BR2_PACKAGE_TRANSMISSION_DAEMON
config BR2_PACKAGE_TRANSMISSION_GTK
bool "transmission-gtk"
- depends on !BR2_nios2 # gtkmm3
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz -> gtkmm3
depends on BR2_PACKAGE_LIBGTK3 && BR2_SYSTEM_ENABLE_NLS
select BR2_PACKAGE_GTKMM3
@@ -45,7 +44,6 @@ config BR2_PACKAGE_TRANSMISSION_GTK
Install transmission GTK-based GUI interface.
comment "transmission-gtk needs libgtk3 and a toolchain with NLS enabled"
- depends on !BR2_nios2
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_PACKAGE_LIBGTK3 && !BR2_SYSTEM_ENABLE_NLS
endif
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index e9c7edb218..d897a6bc17 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -232,8 +232,8 @@ $(eval $(host-generic-package))
MKIMAGE = $(HOST_DIR)/bin/mkimage
-# mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 nios2 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa
-# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
+# mkimage supports alpha arc arm arm64 blackfin ia64 invalid m68k microblaze mips mips64 nds32 or1k powerpc riscv s390 sandbox sh sparc sparc64 x86 x86_64 xtensa
+# NORMALIZED_ARCH can be arm64 arc arm blackfin m68k microblaze mips powerpc sh sparc i386 x86_64 xtensa
# For i386, we need to convert
# For openrisc, we need to convert
# For others, we'll just keep NORMALIZED_ARCH
diff --git a/package/x11vnc/Config.in b/package/x11vnc/Config.in
index d2639fce1e..e4706953b1 100644
--- a/package/x11vnc/Config.in
+++ b/package/x11vnc/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_X11VNC
bool "x11vnc"
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU # fork()
- depends on !BR2_nios2 # libvncserver
select BR2_PACKAGE_LIBVNCSERVER
select BR2_PACKAGE_XLIB_LIBXT
select BR2_PACKAGE_XLIB_LIBXEXT
diff --git a/package/z3/Config.in b/package/z3/Config.in
index 8cd3128687..3afb8a6a22 100644
--- a/package/z3/Config.in
+++ b/package/z3/Config.in
@@ -11,7 +11,6 @@ config BR2_PACKAGE_Z3_ARCH_SUPPORTS
default y if BR2_m68k
# BR2_microblaze has only FE_TONEAREST
default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
- # BR2_nios2 has only FE_TONEAREST
default y if BR2_or1k
default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
default y if BR2_riscv
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 08/12] linux: remove BR2_nios2 symbol
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (5 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 07/12] package: remove BR2_nios2 symbol Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 09/12] toolchain: remove BR2_TOOLCHAIN_HAS_GCC_BUG_93847 (nios2 only) Romain Naour via buildroot
` (5 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
linux/Config.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 98db89f8ab..943fd77f27 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -33,8 +33,6 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
# mips always generates an ITB image
select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
- # nios2 always generates a U-Boot image
- select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_nios2
config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
bool "Latest CIP SLTS version (5.10.162-cip24)"
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 09/12] toolchain: remove BR2_TOOLCHAIN_HAS_GCC_BUG_93847 (nios2 only)
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (6 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 08/12] linux: " Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 10/12] toolchain: remove BR2_TOOLCHAIN_HAS_GCC_BUG_99410 " Romain Naour via buildroot
` (4 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
package/asterisk/asterisk.mk | 4 ----
package/git/git.mk | 2 +-
toolchain/Config.in | 7 -------
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
index e27aa2f760..7b99d30fd9 100644
--- a/package/asterisk/asterisk.mk
+++ b/package/asterisk/asterisk.mk
@@ -290,10 +290,6 @@ ASTERISK_MAKE_OPTS += OPTIMIZE=""
ASTERISK_CFLAGS = $(TARGET_CFLAGS)
-ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),y)
-ASTERISK_CFLAGS += -O0
-endif
-
ASTERISK_CONF_OPTS += CFLAGS="$(ASTERISK_CFLAGS)"
# We want to install sample configuration files, too.
diff --git a/package/git/git.mk b/package/git/git.mk
index f56807a00f..bc17c9a993 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -66,7 +66,7 @@ endif
GIT_CFLAGS = $(TARGET_CFLAGS)
-ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180)$(BR2_TOOLCHAIN_HAS_GCC_BUG_93847),)
+ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),)
GIT_CFLAGS += -O0
endif
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 87160af3d7..23123138e5 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -180,13 +180,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_90620
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \
|| BR2_TOOLCHAIN_GCC_AT_LEAST_11
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93847
-# ICE: compiler error: Segmentation fault on Nios II. This bug
-# no longer exists in gcc 9.x.
-config BR2_TOOLCHAIN_HAS_GCC_BUG_93847
- bool
- default y if BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_9
-
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410
# Error: branch offset out of range on Nios II. This bug
# no longer exists in gcc 8.x but reappeared on gcc 9.x and still exists
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 10/12] toolchain: remove BR2_TOOLCHAIN_HAS_GCC_BUG_99410 (nios2 only)
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (7 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 09/12] toolchain: remove BR2_TOOLCHAIN_HAS_GCC_BUG_93847 (nios2 only) Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 11/12] toolchain: remove remaining BR2_nios2 from toolchain bugs Romain Naour via buildroot
` (3 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
package/belle-sip/belle-sip.mk | 4 ----
package/matio/matio.mk | 4 ----
toolchain/Config.in | 10 ----------
3 files changed, 18 deletions(-)
diff --git a/package/belle-sip/belle-sip.mk b/package/belle-sip/belle-sip.mk
index c9bcc3f55d..b4de3612ce 100644
--- a/package/belle-sip/belle-sip.mk
+++ b/package/belle-sip/belle-sip.mk
@@ -35,10 +35,6 @@ endif
BELLE_SIP_CFLAGS = $(TARGET_CFLAGS)
-ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y)
-BELLE_SIP_CFLAGS += -O0
-endif
-
BELLE_SIP_CONF_OPTS += -DCMAKE_C_FLAGS="$(BELLE_SIP_CFLAGS)"
$(eval $(cmake-package))
diff --git a/package/matio/matio.mk b/package/matio/matio.mk
index dc9be2ac18..d378f06e5b 100644
--- a/package/matio/matio.mk
+++ b/package/matio/matio.mk
@@ -19,10 +19,6 @@ MATIO_CONF_ENV = ac_cv_va_copy=yes
MATIO_CFLAGS = $(TARGET_CFLAGS)
-ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y)
-MATIO_CFLAGS += -O0
-endif
-
MATIO_CONF_ENV += CFLAGS="$(MATIO_CFLAGS)"
# mat73 require hdf5 (not available), extented-sparse take 2KB
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 23123138e5..86ab3710a0 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -180,16 +180,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_90620
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 \
|| BR2_TOOLCHAIN_GCC_AT_LEAST_11
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99410
-# Error: branch offset out of range on Nios II. This bug
-# no longer exists in gcc 8.x but reappeared on gcc 9.x and still exists
-# on gcc 12.x
-config BR2_TOOLCHAIN_HAS_GCC_BUG_99410
- bool
- default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8
- default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9
- depends on BR2_nios2
-
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737
# ICE: SH4 -Os causes internal compiler error. This bug
# still exists in gcc = 11.1.0
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 11/12] toolchain: remove remaining BR2_nios2 from toolchain bugs
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (8 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 10/12] toolchain: remove BR2_TOOLCHAIN_HAS_GCC_BUG_99410 " Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-08 23:05 ` [Buildroot] [PATCH 12/12] arch/nios2: drop architecture Romain Naour via buildroot
` (2 subsequent siblings)
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
toolchain/Config.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 86ab3710a0..d6ed25ff96 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -89,7 +89,6 @@ config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730
config BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
bool
default y
- depends on !BR2_nios2
depends on !BR2_ARM_CPU_ARMV4
depends on !BR2_ARM_CPU_ARMV5
depends on !BR2_sparc_v8
@@ -221,7 +220,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_107728
bool
default y if BR2_microblazebe || BR2_microblazeel \
|| BR2_mips || BR2_mipsel \
- || BR2_nios2 \
|| BR2_or1k \
|| BR2_sh
depends on BR2_TOOLCHAIN_USES_GLIBC
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 12/12] arch/nios2: drop architecture
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (9 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 11/12] toolchain: remove remaining BR2_nios2 from toolchain bugs Romain Naour via buildroot
@ 2025-01-08 23:05 ` Romain Naour via buildroot
2025-01-10 13:06 ` [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain David Laight
2025-01-15 20:40 ` Julien Olivain
12 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-08 23:05 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The nios2 architecture was deprecated in gcc-14 and has been removed
in the upcoming gcc-15 [1][2].
This commit removes nios2 from the architecture entry.
[1] https://sourceware.org/pipermail/binutils/2024-April/133675.html
[2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e876acab6cdd84bb2b32c98fc69fb0ba29c81153
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Config.in | 2 --
Config.in.legacy | 7 +++++++
DEVELOPERS | 1 -
arch/Config.in | 14 --------------
arch/Config.in.nios2 | 14 --------------
5 files changed, 7 insertions(+), 31 deletions(-)
delete mode 100644 arch/Config.in.nios2
diff --git a/Config.in b/Config.in
index 247a9e8ef1..d290431ab5 100644
--- a/Config.in
+++ b/Config.in
@@ -799,8 +799,6 @@ config BR2_PIC_PIE_ARCH_SUPPORTS
default y
# Microblaze glibc toolchains don't work with PIC/PIE enabled
depends on !BR2_microblaze
- # Nios2 toolchains produce non working binaries with -fPIC
- depends on !BR2_nios2
config BR2_PIC_PIE
bool "Build code with PIC/PIE"
diff --git a/Config.in.legacy b/Config.in.legacy
index 54c251be1f..e091fd8c0a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2025.02"
+config BR2_nios2
+ bool "nios2 architecture removed"
+ select BR2_LEGACY
+ help
+ The nios2 architecture was removed, by lack of toolchain
+ support.
+
config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE
bool "Bootlin nios2 glibc bleeding-edge toolchain removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 16b72eee08..09a7e65a9b 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -950,7 +950,6 @@ F: package/tcf-agent/
N: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
F: board/ci20/
F: configs/ci20_defconfig
-F: arch/Config.in.nios2
F: package/fio/
F: package/iptraf-ng/
F: package/jimtcl/
diff --git a/arch/Config.in b/arch/Config.in
index 6254cb6467..6b54c65df9 100644
--- a/arch/Config.in
+++ b/arch/Config.in
@@ -143,16 +143,6 @@ config BR2_mips64el
http://www.mips.com/
http://en.wikipedia.org/wiki/MIPS_Technologies
-config BR2_nios2
- bool "Nios II"
- depends on BR2_BROKEN
- select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
- select BR2_USE_MMU
- help
- Nios II is a soft core processor from Altera Corporation.
- http://www.altera.com/
- http://en.wikipedia.org/wiki/Nios_II
-
config BR2_or1k
bool "OpenRISC"
select BR2_USE_MMU
@@ -395,10 +385,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el
source "arch/Config.in.mips"
endif
-if BR2_nios2
-source "arch/Config.in.nios2"
-endif
-
if BR2_or1k
source "arch/Config.in.or1k"
endif
diff --git a/arch/Config.in.nios2 b/arch/Config.in.nios2
deleted file mode 100644
index a5d7e66d40..0000000000
--- a/arch/Config.in.nios2
+++ /dev/null
@@ -1,14 +0,0 @@
-config BR2_ARCH
- default "nios2"
-
-config BR2_NORMALIZED_ARCH
- default "nios2"
-
-config BR2_ENDIAN
- default "LITTLE"
-
-config BR2_READELF_ARCH_NAME
- default "Altera Nios II"
-
-# vim: ft=kconfig
-# -*- mode:kconfig; -*-
--
2.47.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (10 preceding siblings ...)
2025-01-08 23:05 ` [Buildroot] [PATCH 12/12] arch/nios2: drop architecture Romain Naour via buildroot
@ 2025-01-10 13:06 ` David Laight
2025-01-10 20:15 ` Romain Naour via buildroot
2025-01-15 20:40 ` Julien Olivain
12 siblings, 1 reply; 15+ messages in thread
From: David Laight @ 2025-01-10 13:06 UTC (permalink / raw)
To: Romain Naour via buildroot; +Cc: Romain Naour, Julien Olivain, Thomas Petazzoni
On Thu, 9 Jan 2025 00:05:10 +0100
Romain Naour via buildroot <buildroot@buildroot.org> wrote:
> The nios2 architecture was deprecated in gcc-14 and has been removed
> in the upcoming gcc-15 [1][2].
>
> Our last and only nios2 defconfig "qemu_nios2_10m50_defconfig" was
> removed in 2024.11 due to nios2 removal from Qemu 9.1.0 [3].
...
Interesting, I've not seen an indication that nios2 support is being removed
from the Linux kernel.
Not that I've ever considered running Linux on nios2 a sane idea.
(Better to get an fpga with a 'proper' cpu in it.)
I know Intel deprecated nios2 in quartus 23.04 (suggesting that RISC-V was a
suitable alternative), but I suspect that some major telco hardware supplies
objected (I believe they use a lot of nios2 for embedded control code in
mobile base stations - they'll be running with a few kB of code and data).
We certainly found it possible to get a free nios2 licence for our fpga builds
(after being told earlier it wasn't possible to get one).
In any case I spent a few weeks writing a compatible cpu we can use for
our embedded hardware.
(We also use the first gcc that supported it - good enough for the code
we have, especially after some local patches.)
David
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain
2025-01-10 13:06 ` [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain David Laight
@ 2025-01-10 20:15 ` Romain Naour via buildroot
0 siblings, 0 replies; 15+ messages in thread
From: Romain Naour via buildroot @ 2025-01-10 20:15 UTC (permalink / raw)
To: David Laight, Romain Naour via buildroot; +Cc: Julien Olivain, Thomas Petazzoni
Hello,
Le 10/01/2025 à 14:06, David Laight a écrit :
> On Thu, 9 Jan 2025 00:05:10 +0100
> Romain Naour via buildroot <buildroot@buildroot.org> wrote:
>
>> The nios2 architecture was deprecated in gcc-14 and has been removed
>> in the upcoming gcc-15 [1][2].
>>
>> Our last and only nios2 defconfig "qemu_nios2_10m50_defconfig" was
>> removed in 2024.11 due to nios2 removal from Qemu 9.1.0 [3].
> ...
>
> Interesting, I've not seen an indication that nios2 support is being removed
> from the Linux kernel.
Without a compiler, it's matter of time I guess.
> Not that I've ever considered running Linux on nios2 a sane idea.
> (Better to get an fpga with a 'proper' cpu in it.)
>
> I know Intel deprecated nios2 in quartus 23.04 (suggesting that RISC-V was a
> suitable alternative), but I suspect that some major telco hardware supplies
> objected (I believe they use a lot of nios2 for embedded control code in
> mobile base stations - they'll be running with a few kB of code and data).
> We certainly found it possible to get a free nios2 licence for our fpga builds
> (after being told earlier it wasn't possible to get one).
Still, we don't have any nios2 defconfig left in Buildroot tree, the last (and
only) one was qemu_nios2_10m50.
>
> In any case I spent a few weeks writing a compatible cpu we can use for
> our embedded hardware.
> (We also use the first gcc that supported it - good enough for the code
> we have, especially after some local patches.)
I believe, it doesn't prevent nios2 removal.
Best regards,
Romain
>
> David
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain
2025-01-08 23:05 [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain Romain Naour via buildroot
` (11 preceding siblings ...)
2025-01-10 13:06 ` [Buildroot] [PATCH 01/12] support/config-fragments: remove nios2 toolchain David Laight
@ 2025-01-15 20:40 ` Julien Olivain
12 siblings, 0 replies; 15+ messages in thread
From: Julien Olivain @ 2025-01-15 20:40 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot, Thomas Petazzoni
Hi Romain,
On 09/01/2025 00:05, Romain Naour via buildroot wrote:
> The nios2 architecture was deprecated in gcc-14 and has been removed
> in the upcoming gcc-15 [1][2].
>
> Our last and only nios2 defconfig "qemu_nios2_10m50_defconfig" was
> removed in 2024.11 due to nios2 removal from Qemu 9.1.0 [3].
>
> Remove nios2 testing from Buildroot autobuilders.
>
> [1] https://sourceware.org/pipermail/binutils/2024-April/133675.html
> [2]
> https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=e876acab6cdd84bb2b32c98fc69fb0ba29c81153
> [3] f96b4c176f6e9d6c4374a0d322de672bf44c35bf
>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Peter Korsgaard <peter@korsgaard.com>
> Cc: Julien Olivain <ju.o@free.fr>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
I merged this series into master, thanks.
Since we just merged
https://gitlab.com/buildroot.org/buildroot/-/commit/2ddc5808cd19f577917566ad83e2a3835d6d43b9
which is adding the BR2_BROKEN symbol, I applied this v1 instead of the
v2
which was avoiding this symbol, posted in:
https://lore.kernel.org/buildroot/20250110195359.3358022-1-romain.naour@smile.fr/
Best regards,
Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread