Skip to contentSkip to conversation

arch/Config.in.riscv: lp64f ABI is only supported if MMU is enabled

PATCH Applied Thomas Petazzoni via buildroot 3 participants 16 messages Jul 26, 2022 – Aug 29, 2022 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/4 arch/Config.in.riscv: lp64f ABI is only supported if MMU is enabled

Even though that seems weird, the LP64F ABI is only supported when MMU support is enabled. Indeed, as per commit 9a51381cedc16e6d70cb85e1144f6e0fa89af69a ("package/uclibc: prevent config with unsupported RISC-V float ABI"), uClibc does not support LP64F. But uClibc is the only C library that support RISC-V 64-bit noMMU.

So the selection of LP64F and !MMU is impossible. Right now this selection causes a build failure as no C library is enabled.

This commit fixes this by ensuring we cannot use LP64F when MMU support is not available.

Fixes:

http://autobuild.buildroot.net/results/6320dcc655f1871eb8bf6a9689bddde7447385f5/

---
 arch/Config.in.riscv | 1 +
 1 file changed, 1 insertion(+)
arch/Config.in.riscv +1 -0
index 288ed833eb..30bdcaa80b 100644
@@ -108,6 +108,7 @@ config BR2_RISCV_ABI_LP64
 config BR2_RISCV_ABI_LP64F
 	bool "lp64f"
 	depends on BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
+	depends on BR2_USE_MMU
 
 config BR2_RISCV_ABI_LP64D
 	bool "lp64d"
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH v2 2/4 package/Makefile.in: add detection for the lack of C library

We recently had several cases of architecture configurations for which no C library was available, leading to a build failure during the gcc build. In order to more easily detect those bogus configurations, let's bail out very early by detecting the lack of C library selection.

---
 package/Makefile.in | 6 ++++++
 1 file changed, 6 insertions(+)
package/Makefile.in +6 -0
index 508ea7c366..f8920c87a4 100644
@@ -47,6 +47,12 @@ else
 TARGET_OS = linux
 endif
 
+# This happens if there is a bug in Buildroot that allows an
+# architecture configuration that isn't supported by any library.
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_TOOLCHAIN_USES_MUSL),)
+$(error No C library enabled, this is not possible.)
+endif
+
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 LIBC = uclibc
 else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH v2 2/4] package/Makefile.in: add detection for the lack of C library

Thomas, All,

On 2022-07-26 18:39 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 16 lines

We recently had several cases of architecture configurations for which no C library was available, leading to a build failure during the gcc build. In order to more easily detect those bogus configurations, let's bail out very early by detecting the lack of C library selection.

---
 package/Makefile.in | 6 ++++++
 1 file changed, 6 insertions(+)
package/Makefile.in +0 -0
index 508ea7c366..f8920c87a4 100644

package/Makefile.in else · line 54

Quoted 8 lines
package/Makefile.in +5 -0
@@ -47,6 +47,12 @@ else
 TARGET_OS = linux
 endif
 
+# This happens if there is a bug in Buildroot that allows an
+# architecture configuration that isn't supported by any library.
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_TOOLCHAIN_USES_MUSL),)
+$(error No C library enabled, this is not possible.)
+endif

I've moved this as the last else clause in the fllowing conditional block (and added an explicit test for the else-glibc case of course).

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 9 lines
package/Makefile.in +0 -0
 LIBC = uclibc
 else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

Re: [Buildroot] [PATCH v2 2/4] package/Makefile.in: add detection for the lack of C library

Quoted 8 lines · On Wed, 27 Jul 2022 09:58:26 +0200 "Yann E. MORIN" <[email protected]>…

package/Makefile.in else · line 54

Quoted 5 lines
package/Makefile.in +5 -0
+# This happens if there is a bug in Buildroot that allows an
+# architecture configuration that isn't supported by any library.
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_TOOLCHAIN_USES_MUSL),)
+$(error No C library enabled, this is not possible.)
+endif  

I've moved this as the last else clause in the fllowing conditional block (and added an explicit test for the else-glibc case of course).

Aaah, yes, that's even better indeed! Thanks for fixing this!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH v2 2/4] package/Makefile.in: add detection for the lack of C library

In reply to Thomas Petazzoni via buildroot
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni via buildroot <[email protected]> writes:

We recently had several cases of architecture configurations for which no C library was available, leading to a build failure during the gcc build. In order to more easily detect those bogus configurations, let's bail out very early by detecting the lack of C library selection.

Committed to 2022.05.x and 2022.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH v2 3/4 arch/Config.in: move the binary format selection further down

In reply to Thomas Petazzoni via buildroot

Right now the "Target options" menu looks like this:

Target architecture (....)
... options related to the binary format selection ... ... options related to the architecture variant selection ...

This doesn't make much sense: the architecture variant selection should be just below the target architecture selection. With this commit, things will now be presented this way:

Target architecture (....)
... options related to the architecture variant selection ... ... options related to the binary format selection ...

---
 arch/Config.in | 100 ++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)
arch/Config.in +50 -50
index 9135df9def..095036f1aa 100644
@@ -371,56 +371,6 @@ config BR2_BINFMT_SUPPORTS_SHARED
 config BR2_READELF_ARCH_NAME
 	string
 
-# Set up target binary format
-choice
-	prompt "Target Binary Format"
-	default BR2_BINFMT_ELF if BR2_USE_MMU
-	default BR2_BINFMT_FLAT
-
-config BR2_BINFMT_ELF
-	bool "ELF"
-	depends on BR2_USE_MMU
-	select BR2_BINFMT_SUPPORTS_SHARED
-	help
-	  ELF (Executable and Linkable Format) is a format for libraries
-	  and executables used across different architectures and
-	  operating systems.
-
-config BR2_BINFMT_FLAT
-	bool "FLAT"
-	depends on !BR2_USE_MMU
-	help
-	  FLAT binary is a relatively simple and lightweight executable
-	  format based on the original a.out format. It is widely used
-	  in environment where no MMU is available.
-
-endchoice
-
-# Set up flat binary type
-choice
-	prompt "FLAT Binary type"
-	default BR2_BINFMT_FLAT_ONE
-	depends on BR2_BINFMT_FLAT
-
-config BR2_BINFMT_FLAT_ONE
-	bool "One memory region"
-	help
-	  All segments are linked into one memory region.
-
-config BR2_BINFMT_FLAT_SHARED
-	bool "Shared binary"
-	depends on BR2_m68k
-	# Even though this really generates shared binaries, there is no libdl
-	# and dlopen() cannot be used. So packages that require shared
-	# libraries cannot be built. Therefore, we don't select
-	# BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS.
-	# Although this adds -static to the compilation, that's not a problem
-	# because the -mid-shared-library option overrides it.
-	help
-	  Allow to load and link indiviual FLAT binaries at run time.
-
-endchoice
-
 if BR2_arcle || BR2_arceb
 source "arch/Config.in.arc"
 endif
@@ -481,4 +431,54 @@ if BR2_xtensa
 source "arch/Config.in.xtensa"
 endif
 
+# Set up target binary format
+choice
+	prompt "Target Binary Format"
+	default BR2_BINFMT_ELF if BR2_USE_MMU
+	default BR2_BINFMT_FLAT
+
+config BR2_BINFMT_ELF
+	bool "ELF"
+	depends on BR2_USE_MMU
+	select BR2_BINFMT_SUPPORTS_SHARED
+	help
+	  ELF (Executable and Linkable Format) is a format for libraries
+	  and executables used across different architectures and
+	  operating systems.
+
+config BR2_BINFMT_FLAT
+	bool "FLAT"
+	depends on !BR2_USE_MMU
+	help
+	  FLAT binary is a relatively simple and lightweight executable
+	  format based on the original a.out format. It is widely used
+	  in environment where no MMU is available.
+
+endchoice
+
+# Set up flat binary type
+choice
+	prompt "FLAT Binary type"
+	default BR2_BINFMT_FLAT_ONE
+	depends on BR2_BINFMT_FLAT
+
+config BR2_BINFMT_FLAT_ONE
+	bool "One memory region"
+	help
+	  All segments are linked into one memory region.
+
+config BR2_BINFMT_FLAT_SHARED
+	bool "Shared binary"
+	depends on BR2_m68k
+	# Even though this really generates shared binaries, there is no libdl
+	# and dlopen() cannot be used. So packages that require shared
+	# libraries cannot be built. Therefore, we don't select
+	# BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS.
+	# Although this adds -static to the compilation, that's not a problem
+	# because the -mid-shared-library option overrides it.
+	help
+	  Allow to load and link indiviual FLAT binaries at run time.
+
+endchoice
+
 endmenu # Target options
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

Re: [Buildroot] [PATCH v2 3/4] arch/Config.in: move the binary format selection further down

Thomas, All,

On 2022-07-26 18:39 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 10 lines

Right now the "Target options" menu looks like this:

Target architecture (....)
... options related to the binary format selection ... ... options related to the architecture variant selection ...

This doesn't make much sense: the architecture variant selection should be just below the target architecture selection. With this commit, things will now be presented this way:

Quoted 5 lines

Target architecture (....)
... options related to the architecture variant selection ... ... options related to the binary format selection ...

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 127 lines
---
 arch/Config.in | 100 ++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)
arch/Config.in +50 -50
index 9135df9def..095036f1aa 100644
@@ -371,56 +371,6 @@ config BR2_BINFMT_SUPPORTS_SHARED
 config BR2_READELF_ARCH_NAME
 	string
 
-# Set up target binary format
-choice
-	prompt "Target Binary Format"
-	default BR2_BINFMT_ELF if BR2_USE_MMU
-	default BR2_BINFMT_FLAT
-
-config BR2_BINFMT_ELF
-	bool "ELF"
-	depends on BR2_USE_MMU
-	select BR2_BINFMT_SUPPORTS_SHARED
-	help
-	  ELF (Executable and Linkable Format) is a format for libraries
-	  and executables used across different architectures and
-	  operating systems.
-
-config BR2_BINFMT_FLAT
-	bool "FLAT"
-	depends on !BR2_USE_MMU
-	help
-	  FLAT binary is a relatively simple and lightweight executable
-	  format based on the original a.out format. It is widely used
-	  in environment where no MMU is available.
-
-endchoice
-
-# Set up flat binary type
-choice
-	prompt "FLAT Binary type"
-	default BR2_BINFMT_FLAT_ONE
-	depends on BR2_BINFMT_FLAT
-
-config BR2_BINFMT_FLAT_ONE
-	bool "One memory region"
-	help
-	  All segments are linked into one memory region.
-
-config BR2_BINFMT_FLAT_SHARED
-	bool "Shared binary"
-	depends on BR2_m68k
-	# Even though this really generates shared binaries, there is no libdl
-	# and dlopen() cannot be used. So packages that require shared
-	# libraries cannot be built. Therefore, we don't select
-	# BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS.
-	# Although this adds -static to the compilation, that's not a problem
-	# because the -mid-shared-library option overrides it.
-	help
-	  Allow to load and link indiviual FLAT binaries at run time.
-
-endchoice
-
 if BR2_arcle || BR2_arceb
 source "arch/Config.in.arc"
 endif
@@ -481,4 +431,54 @@ if BR2_xtensa
 source "arch/Config.in.xtensa"
 endif
 
+# Set up target binary format
+choice
+	prompt "Target Binary Format"
+	default BR2_BINFMT_ELF if BR2_USE_MMU
+	default BR2_BINFMT_FLAT
+
+config BR2_BINFMT_ELF
+	bool "ELF"
+	depends on BR2_USE_MMU
+	select BR2_BINFMT_SUPPORTS_SHARED
+	help
+	  ELF (Executable and Linkable Format) is a format for libraries
+	  and executables used across different architectures and
+	  operating systems.
+
+config BR2_BINFMT_FLAT
+	bool "FLAT"
+	depends on !BR2_USE_MMU
+	help
+	  FLAT binary is a relatively simple and lightweight executable
+	  format based on the original a.out format. It is widely used
+	  in environment where no MMU is available.
+
+endchoice
+
+# Set up flat binary type
+choice
+	prompt "FLAT Binary type"
+	default BR2_BINFMT_FLAT_ONE
+	depends on BR2_BINFMT_FLAT
+
+config BR2_BINFMT_FLAT_ONE
+	bool "One memory region"
+	help
+	  All segments are linked into one memory region.
+
+config BR2_BINFMT_FLAT_SHARED
+	bool "Shared binary"
+	depends on BR2_m68k
+	# Even though this really generates shared binaries, there is no libdl
+	# and dlopen() cannot be used. So packages that require shared
+	# libraries cannot be built. Therefore, we don't select
+	# BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS.
+	# Although this adds -static to the compilation, that's not a problem
+	# because the -mid-shared-library option overrides it.
+	help
+	  Allow to load and link indiviual FLAT binaries at run time.
+
+endchoice
+
 endmenu # Target options
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#7 lore raw

PATCH v2 4/4 arch: rework MMU option handling and move to "Target architecture" menu

In reply to Thomas Petazzoni via buildroot

The MMU option is currently located in the "Toolchain" menu, but it doesn't make sense as it's really architecture related. In addition, the selection of MMU has an impact on the choice of binary format available, which is visible in the architecture menu.

Therefore, this commit moves the MMU option into the architecture menu.

However, if we simply move it in arch/Config.in, it means that we would have the following order of options:

Target architecture
Target architecture variant
ABI
MMU
Binary format

But really, the MMU option should be right below the Target architecture variant, and the available ABIs derived from that.

Since in fact only 2 architectures show a visible prompt for the MMU option (RISC-V and Xtensa), we move this option in arch/Config.in.riscv and arch/Config.in.xtensa.

Some walkthrough the commit:

- BR2_ARCH_HAS_MMU_MANDATORY and BR2_ARCH_HAS_MMU_OPTIONAL are removed as they are no longer needed

- BR2_USE_MMU becomes a hidden boolean

- All the places where we used to select BR2_ARCH_HAS_MMU_MANDATORY now select BR2_USE_MMU directly.

- Introduce BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU.

- All defconfigs that used "# BR2_USE_MMU is not set" are switched to using the new option.

All in all, this simplifies things quite a bit, and allows to have a good option ordering in the Target architecture menu.

This commit might raise a concern in terms of backward compatibility with existing configurations. The only configurations that will be broken by this change are RISC-V noMMU (which was very recently introduced) and Xtensa noMMU (which we can probably agree is not such a widely popular configuration).

---
Changes since v1:
- Make BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU default y to behave like BR2_USE_MMU used to
- Update the defconfigs that had "# BR2_USE_MMU is not set" to use the new option.

---
 arch/Config.in                            | 47 +++++++++++------------
 arch/Config.in.arm                        | 10 ++---
 arch/Config.in.m68k                       |  2 +-
 arch/Config.in.riscv                      | 12 +++++-
 arch/Config.in.xtensa                     | 12 +++++-
 configs/canaan_kd233_defconfig            |  2 +-
 configs/qemu_riscv64_nommu_virt_defconfig |  4 +-
 configs/qemu_xtensa_lx60_nommu_defconfig  |  4 +-
 configs/sipeed_maix_bit_defconfig         |  2 +-
 configs/sipeed_maix_bit_sdcard_defconfig  |  2 +-
 configs/sipeed_maix_dock_defconfig        |  2 +-
 configs/sipeed_maix_dock_sdcard_defconfig |  2 +-
 configs/sipeed_maix_go_defconfig          |  2 +-
 configs/sipeed_maix_go_sdcard_defconfig   |  2 +-
 configs/sipeed_maixduino_defconfig        |  2 +-
 configs/sipeed_maixduino_sdcard_defconfig |  2 +-
 toolchain/Config.in                       |  7 ----
 17 files changed, 59 insertions(+), 57 deletions(-)
arch/Config.in +22 -25
index 095036f1aa..1d38c7a065 100644
@@ -9,10 +9,7 @@ config BR2_KERNEL_64_USERLAND_32
 config BR2_SOFT_FLOAT
 	bool
 
-config BR2_ARCH_HAS_MMU_MANDATORY
-	bool
-
-config BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_USE_MMU
 	bool
 
 choice
@@ -23,7 +20,7 @@ choice
 
 config BR2_arcle
 	bool "ARC (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -31,7 +28,7 @@ config BR2_arcle
 
 config BR2_arceb
 	bool "ARC (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -49,7 +46,7 @@ config BR2_arm
 
 config BR2_armeb
 	bool "ARM (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  ARM is a 32-bit reduced instruction set computer (RISC)
 	  instruction set architecture (ISA) developed by ARM Holdings.
@@ -76,7 +73,7 @@ config BR2_aarch64_be
 config BR2_csky
 	bool "csky"
 	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
@@ -85,7 +82,7 @@ config BR2_csky
 
 config BR2_i386
 	bool "i386"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Intel i386 architecture compatible microprocessor
 	  http://en.wikipedia.org/wiki/I386
@@ -99,7 +96,7 @@ config BR2_m68k
 
 config BR2_microblazeel
 	bool "Microblaze AXI (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI
 	  bus based architecture (little endian)
@@ -108,7 +105,7 @@ config BR2_microblazeel
 
 config BR2_microblazebe
 	bool "Microblaze non-AXI (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB
 	  bus based architecture (non-AXI, big endian)
@@ -117,7 +114,7 @@ config BR2_microblazebe
 
 config BR2_mips
 	bool "MIPS (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -126,7 +123,7 @@ config BR2_mips
 
 config BR2_mipsel
 	bool "MIPS (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -136,7 +133,7 @@ config BR2_mipsel
 config BR2_mips64
 	bool "MIPS64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -146,7 +143,7 @@ config BR2_mips64
 config BR2_mips64el
 	bool "MIPS64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -155,7 +152,7 @@ config BR2_mips64el
 
 config BR2_nios2
 	bool "Nios II"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Nios II is a soft core processor from Altera Corporation.
 	  http://www.altera.com/
@@ -163,14 +160,14 @@ config BR2_nios2
 
 config BR2_or1k
 	bool "OpenRISC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  OpenRISC is a free and open processor for embedded system.
 	  http://openrisc.io
 
 config BR2_powerpc
 	bool "PowerPC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -180,7 +177,7 @@ config BR2_powerpc
 config BR2_powerpc64
 	bool "PowerPC64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -190,7 +187,7 @@ config BR2_powerpc64
 config BR2_powerpc64le
 	bool "PowerPC64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Little endian.
@@ -210,7 +207,7 @@ config BR2_riscv
 config BR2_s390x
 	bool "s390x"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  s390x is a big-endian architecture made by IBM.
 	  http://www.ibm.com/
@@ -218,7 +215,7 @@ config BR2_s390x
 
 config BR2_sh
 	bool "SuperH"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SuperH (or SH) is a 32-bit reduced instruction set computer
 	  (RISC) instruction set architecture (ISA) developed by
@@ -228,7 +225,7 @@ config BR2_sh
 
 config BR2_sparc
 	bool "SPARC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -239,7 +236,7 @@ config BR2_sparc
 config BR2_sparc64
 	bool "SPARC64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -250,7 +247,7 @@ config BR2_sparc64
 config BR2_x86_64
 	bool "x86_64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  x86-64 is an extension of the x86 instruction set (Intel i386
 	  architecture compatible microprocessor).
arch/Config.in.arm +5 -5
index eb71d70430..15f96c4239 100644
@@ -73,26 +73,26 @@ config BR2_ARM_CPU_HAS_THUMB2
 
 config BR2_ARM_CPU_ARMV4
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV5
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV6
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7M
 	bool
 
 config BR2_ARM_CPU_ARMV8A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 choice
 	prompt "Target Architecture Variant"
arch/Config.in.m68k +1 -1
index 1f7d944621..9fd22aaf1e 100644
@@ -26,7 +26,7 @@ choice
 config BR2_m68k_68040
 	bool "68040"
 	select BR2_m68k_m68k
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_m68k_cf5208
 	bool "5208"
arch/Config.in.riscv +10 -2
index 30bdcaa80b..b5e84389e0 100644
@@ -71,15 +71,23 @@ choice
 
 config BR2_RISCV_32
 	bool "32-bit"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_RISCV_64
 	bool "64-bit"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 endchoice
 
+config BR2_RISCV_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_RISCV_64
+	select BR2_USE_MMU
+	help
+	  Enable this option if your RISC-V core has a MMU (Memory
+	  Management Unit).
+
 choice
 	prompt "Target ABI"
 	default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
arch/Config.in.xtensa +10 -2
index 45ad2dc487..f9d5adb4c9 100644
@@ -5,11 +5,10 @@ choice
 
 config BR2_XTENSA_CUSTOM
 	bool "Custom Xtensa processor configuration"
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 config BR2_xtensa_fsf
 	bool "fsf - Default configuration"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 endchoice
 
@@ -41,6 +40,15 @@ config BR2_XTENSA_BIG_ENDIAN
 
 endchoice
 
+config BR2_XTENSA_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_XTENSA_CUSTOM
+	select BR2_USE_MMU
+	help
+	  Enable this option if your Xtensa core has a MMU (Memory
+	  Management Unit).
+
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_XTENSA_LITTLE_ENDIAN
 	default "BIG"		if BR2_xtensa_fsf || BR2_XTENSA_BIG_ENDIAN
configs/canaan_kd233_defconfig +1 -1
index 85b7b14fbd..278fb883bf 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/qemu_riscv64_nommu_virt_defconfig +1 -3
index 33fad50a3c..691cf31748 100644
@@ -1,13 +1,11 @@
 # Architecture
 BR2_riscv=y
 BR2_RISCV_64=y
+# BR2_RISCV_USE_MMU is not set
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
-# Toolchain
-# BR2_USE_MMU is not set
-
 # Busybox with hush
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
 
configs/qemu_xtensa_lx60_nommu_defconfig +1 -3
index f107b7e73b..4be1b66edc 100644
@@ -2,9 +2,7 @@
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
 BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
-
-# Toolchain
-# BR2_USE_MMU is not set
+# BR2_XTENSA_USE_MMU is not set
 
 # Use minimal busybox with hush and networking tools
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
configs/sipeed_maix_bit_defconfig +1 -1
index dbc5af4e74..b31bc1309b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_bit_sdcard_defconfig +1 -1
index 9f1c3a305f..4ad3b2e1db 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_defconfig +1 -1
index 0f30e8d38f..d071e5d380 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_sdcard_defconfig +1 -1
index fdbca11590..de79ff950b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_defconfig +1 -1
index 2054e49ae2..3055379db4 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_sdcard_defconfig +1 -1
index a16943608c..7338b0c09d 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_defconfig +1 -1
index a581ecbea5..50c59bd4ad 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_sdcard_defconfig +1 -1
index 7e627e5d15..b4f1994239 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
toolchain/Config.in +0 -7
index e6fabbfc74..5f79c07df0 100644
@@ -315,13 +315,6 @@ config BR2_TOOLCHAIN_EXTRA_LIBS
 config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
 	bool
 
-config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
-	default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY
-	help
-	  If your target has a MMU, you should say Y here.  If you
-	  are unsure, just say Y.
-
 config BR2_TARGET_OPTIMIZATION
 	string "Target Optimizations"
 	default ""
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author Reviewed-by Damien Le Moal Tested-by Damien Le Moal on v2 4/4
#8 lore raw

Re: [Buildroot] [PATCH v2 4/4] arch: rework MMU option handling and move to "Target architecture" menu

Quoted 42 lines · Thomas Petazzoni via buildroot

The MMU option is currently located in the "Toolchain" menu, but it doesn't make sense as it's really architecture related. In addition, the selection of MMU has an impact on the choice of binary format available, which is visible in the architecture menu.

Therefore, this commit moves the MMU option into the architecture menu.

However, if we simply move it in arch/Config.in, it means that we would have the following order of options:

Target architecture
Target architecture variant
ABI
MMU
Binary format

But really, the MMU option should be right below the Target architecture variant, and the available ABIs derived from that.

Since in fact only 2 architectures show a visible prompt for the MMU option (RISC-V and Xtensa), we move this option in arch/Config.in.riscv and arch/Config.in.xtensa.

Some walkthrough the commit:

- BR2_ARCH_HAS_MMU_MANDATORY and BR2_ARCH_HAS_MMU_OPTIONAL are removed as they are no longer needed

- BR2_USE_MMU becomes a hidden boolean

- All the places where we used to select BR2_ARCH_HAS_MMU_MANDATORY now select BR2_USE_MMU directly.

- Introduce BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU.

- All defconfigs that used "# BR2_USE_MMU is not set" are switched to using the new option.

All in all, this simplifies things quite a bit, and allows to have a good option ordering in the Target architecture menu.

Quoted 7 lines

This commit might raise a concern in terms of backward compatibility with existing configurations. The only configurations that will be broken by this change are RISC-V noMMU (which was very recently introduced) and Xtensa noMMU (which we can probably agree is not such a widely popular configuration).

I also gave this a spin with a Sipeed MAIX bit board. No problems. So:

Quoted 565 lines

---
Changes since v1:
- Make BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU default y to behave like BR2_USE_MMU used to
- Update the defconfigs that had "# BR2_USE_MMU is not set" to use the new option.

---
 arch/Config.in                            | 47 +++++++++++------------
 arch/Config.in.arm                        | 10 ++---
 arch/Config.in.m68k                       |  2 +-
 arch/Config.in.riscv                      | 12 +++++-
 arch/Config.in.xtensa                     | 12 +++++-
 configs/canaan_kd233_defconfig            |  2 +-
 configs/qemu_riscv64_nommu_virt_defconfig |  4 +-
 configs/qemu_xtensa_lx60_nommu_defconfig  |  4 +-
 configs/sipeed_maix_bit_defconfig         |  2 +-
 configs/sipeed_maix_bit_sdcard_defconfig  |  2 +-
 configs/sipeed_maix_dock_defconfig        |  2 +-
 configs/sipeed_maix_dock_sdcard_defconfig |  2 +-
 configs/sipeed_maix_go_defconfig          |  2 +-
 configs/sipeed_maix_go_sdcard_defconfig   |  2 +-
 configs/sipeed_maixduino_defconfig        |  2 +-
 configs/sipeed_maixduino_sdcard_defconfig |  2 +-
 toolchain/Config.in                       |  7 ----
 17 files changed, 59 insertions(+), 57 deletions(-)
arch/Config.in +22 -25
index 095036f1aa..1d38c7a065 100644
@@ -9,10 +9,7 @@ config BR2_KERNEL_64_USERLAND_32
 config BR2_SOFT_FLOAT
 	bool
 
-config BR2_ARCH_HAS_MMU_MANDATORY
-	bool
-
-config BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_USE_MMU
 	bool
 
 choice
@@ -23,7 +20,7 @@ choice
 
 config BR2_arcle
 	bool "ARC (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -31,7 +28,7 @@ config BR2_arcle
 
 config BR2_arceb
 	bool "ARC (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -49,7 +46,7 @@ config BR2_arm
 
 config BR2_armeb
 	bool "ARM (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  ARM is a 32-bit reduced instruction set computer (RISC)
 	  instruction set architecture (ISA) developed by ARM Holdings.
@@ -76,7 +73,7 @@ config BR2_aarch64_be
 config BR2_csky
 	bool "csky"
 	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
@@ -85,7 +82,7 @@ config BR2_csky
 
 config BR2_i386
 	bool "i386"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Intel i386 architecture compatible microprocessor
 	  http://en.wikipedia.org/wiki/I386
@@ -99,7 +96,7 @@ config BR2_m68k
 
 config BR2_microblazeel
 	bool "Microblaze AXI (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI
 	  bus based architecture (little endian)
@@ -108,7 +105,7 @@ config BR2_microblazeel
 
 config BR2_microblazebe
 	bool "Microblaze non-AXI (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB
 	  bus based architecture (non-AXI, big endian)
@@ -117,7 +114,7 @@ config BR2_microblazebe
 
 config BR2_mips
 	bool "MIPS (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -126,7 +123,7 @@ config BR2_mips
 
 config BR2_mipsel
 	bool "MIPS (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -136,7 +133,7 @@ config BR2_mipsel
 config BR2_mips64
 	bool "MIPS64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -146,7 +143,7 @@ config BR2_mips64
 config BR2_mips64el
 	bool "MIPS64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -155,7 +152,7 @@ config BR2_mips64el
 
 config BR2_nios2
 	bool "Nios II"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Nios II is a soft core processor from Altera Corporation.
 	  http://www.altera.com/
@@ -163,14 +160,14 @@ config BR2_nios2
 
 config BR2_or1k
 	bool "OpenRISC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  OpenRISC is a free and open processor for embedded system.
 	  http://openrisc.io
 
 config BR2_powerpc
 	bool "PowerPC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -180,7 +177,7 @@ config BR2_powerpc
 config BR2_powerpc64
 	bool "PowerPC64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -190,7 +187,7 @@ config BR2_powerpc64
 config BR2_powerpc64le
 	bool "PowerPC64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Little endian.
@@ -210,7 +207,7 @@ config BR2_riscv
 config BR2_s390x
 	bool "s390x"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  s390x is a big-endian architecture made by IBM.
 	  http://www.ibm.com/
@@ -218,7 +215,7 @@ config BR2_s390x
 
 config BR2_sh
 	bool "SuperH"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SuperH (or SH) is a 32-bit reduced instruction set computer
 	  (RISC) instruction set architecture (ISA) developed by
@@ -228,7 +225,7 @@ config BR2_sh
 
 config BR2_sparc
 	bool "SPARC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -239,7 +236,7 @@ config BR2_sparc
 config BR2_sparc64
 	bool "SPARC64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -250,7 +247,7 @@ config BR2_sparc64
 config BR2_x86_64
 	bool "x86_64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  x86-64 is an extension of the x86 instruction set (Intel i386
 	  architecture compatible microprocessor).
arch/Config.in.arm +5 -5
index eb71d70430..15f96c4239 100644
@@ -73,26 +73,26 @@ config BR2_ARM_CPU_HAS_THUMB2
 
 config BR2_ARM_CPU_ARMV4
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV5
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV6
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7M
 	bool
 
 config BR2_ARM_CPU_ARMV8A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 choice
 	prompt "Target Architecture Variant"
arch/Config.in.m68k +1 -1
index 1f7d944621..9fd22aaf1e 100644
@@ -26,7 +26,7 @@ choice
 config BR2_m68k_68040
 	bool "68040"
 	select BR2_m68k_m68k
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_m68k_cf5208
 	bool "5208"
arch/Config.in.riscv +10 -2
index 30bdcaa80b..b5e84389e0 100644
@@ -71,15 +71,23 @@ choice
 
 config BR2_RISCV_32
 	bool "32-bit"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_RISCV_64
 	bool "64-bit"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 endchoice
 
+config BR2_RISCV_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_RISCV_64
+	select BR2_USE_MMU
+	help
+	  Enable this option if your RISC-V core has a MMU (Memory
+	  Management Unit).
+
 choice
 	prompt "Target ABI"
 	default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
arch/Config.in.xtensa +10 -2
index 45ad2dc487..f9d5adb4c9 100644
@@ -5,11 +5,10 @@ choice
 
 config BR2_XTENSA_CUSTOM
 	bool "Custom Xtensa processor configuration"
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 config BR2_xtensa_fsf
 	bool "fsf - Default configuration"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 endchoice
 
@@ -41,6 +40,15 @@ config BR2_XTENSA_BIG_ENDIAN
 
 endchoice
 
+config BR2_XTENSA_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_XTENSA_CUSTOM
+	select BR2_USE_MMU
+	help
+	  Enable this option if your Xtensa core has a MMU (Memory
+	  Management Unit).
+
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_XTENSA_LITTLE_ENDIAN
 	default "BIG"		if BR2_xtensa_fsf || BR2_XTENSA_BIG_ENDIAN
configs/canaan_kd233_defconfig +1 -1
index 85b7b14fbd..278fb883bf 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/qemu_riscv64_nommu_virt_defconfig +1 -3
index 33fad50a3c..691cf31748 100644
@@ -1,13 +1,11 @@
 # Architecture
 BR2_riscv=y
 BR2_RISCV_64=y
+# BR2_RISCV_USE_MMU is not set
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
-# Toolchain
-# BR2_USE_MMU is not set
-
 # Busybox with hush
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
 
configs/qemu_xtensa_lx60_nommu_defconfig +1 -3
index f107b7e73b..4be1b66edc 100644
@@ -2,9 +2,7 @@
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
 BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
-
-# Toolchain
-# BR2_USE_MMU is not set
+# BR2_XTENSA_USE_MMU is not set
 
 # Use minimal busybox with hush and networking tools
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
configs/sipeed_maix_bit_defconfig +1 -1
index dbc5af4e74..b31bc1309b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_bit_sdcard_defconfig +1 -1
index 9f1c3a305f..4ad3b2e1db 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_defconfig +1 -1
index 0f30e8d38f..d071e5d380 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_sdcard_defconfig +1 -1
index fdbca11590..de79ff950b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_defconfig +1 -1
index 2054e49ae2..3055379db4 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_sdcard_defconfig +1 -1
index a16943608c..7338b0c09d 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_defconfig +1 -1
index a581ecbea5..50c59bd4ad 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_sdcard_defconfig +1 -1
index 7e627e5d15..b4f1994239 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
toolchain/Config.in +0 -7
index e6fabbfc74..5f79c07df0 100644
@@ -315,13 +315,6 @@ config BR2_TOOLCHAIN_EXTRA_LIBS
 config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
 	bool
 
-config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
-	default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY
-	help
-	  If your target has a MMU, you should say Y here.  If you
-	  are unsure, just say Y.
-
 config BR2_TARGET_OPTIMIZATION
 	string "Target Optimizations"
 	default ""
Signature · 6 lines
Damien Le Moal
Western Digital Research
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#9 lore raw

Re: [Buildroot] [PATCH v2 4/4] arch: rework MMU option handling and move to "Target architecture" menu

In reply to Thomas Petazzoni via buildroot

Thomas, All,

On 2022-07-26 18:39 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 7 lines

The MMU option is currently located in the "Toolchain" menu, but it doesn't make sense as it's really architecture related. In addition, the selection of MMU has an impact on the choice of binary format available, which is visible in the architecture menu.

Therefore, this commit moves the MMU option into the architecture menu.

[--SNIP--]

Quoted 3 lines

Since in fact only 2 architectures show a visible prompt for the MMU option (RISC-V and Xtensa), we move this option in arch/Config.in.riscv and arch/Config.in.xtensa.

I am not sure why you are removing a generic option in favour of two arch-specific options that behave exactly the same.

Why not just keep that:

config BR2_USE_MMU
bool "MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL default y if BR2_ARCH_HAS_MMU_OPTIONAL

This still achieves what you want:
- arch/variants that have a mandatory MMU can directly select BR2_USE_MMU as this patch does, and the prompt does not appear in that case;
- arch/variants that have no MMU don't select BR2_USE_MMU, and there is no prompt either
- arch/variants that have an optrional MMU select BR2_ARCH_HAS_MMU_OPTIONAL, BR2_USE_MMU is default y, and there is a prompt.

And then we drop one Kconfig knob (MMU_MANDATORY), and do not need to introduce two others (one for riscv and one for xtensa).

I.e. the case for arch-specific options is not clear to me...

Regards,
Yann E. MORIN.

Quoted 597 lines

Some walkthrough the commit:

- BR2_ARCH_HAS_MMU_MANDATORY and BR2_ARCH_HAS_MMU_OPTIONAL are removed as they are no longer needed

- BR2_USE_MMU becomes a hidden boolean

- All the places where we used to select BR2_ARCH_HAS_MMU_MANDATORY now select BR2_USE_MMU directly.

- Introduce BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU.

- All defconfigs that used "# BR2_USE_MMU is not set" are switched to using the new option.

All in all, this simplifies things quite a bit, and allows to have a good option ordering in the Target architecture menu.

This commit might raise a concern in terms of backward compatibility with existing configurations. The only configurations that will be broken by this change are RISC-V noMMU (which was very recently introduced) and Xtensa noMMU (which we can probably agree is not such a widely popular configuration).

---
Changes since v1:
- Make BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU default y to behave like BR2_USE_MMU used to
- Update the defconfigs that had "# BR2_USE_MMU is not set" to use the new option.

---
 arch/Config.in                            | 47 +++++++++++------------
 arch/Config.in.arm                        | 10 ++---
 arch/Config.in.m68k                       |  2 +-
 arch/Config.in.riscv                      | 12 +++++-
 arch/Config.in.xtensa                     | 12 +++++-
 configs/canaan_kd233_defconfig            |  2 +-
 configs/qemu_riscv64_nommu_virt_defconfig |  4 +-
 configs/qemu_xtensa_lx60_nommu_defconfig  |  4 +-
 configs/sipeed_maix_bit_defconfig         |  2 +-
 configs/sipeed_maix_bit_sdcard_defconfig  |  2 +-
 configs/sipeed_maix_dock_defconfig        |  2 +-
 configs/sipeed_maix_dock_sdcard_defconfig |  2 +-
 configs/sipeed_maix_go_defconfig          |  2 +-
 configs/sipeed_maix_go_sdcard_defconfig   |  2 +-
 configs/sipeed_maixduino_defconfig        |  2 +-
 configs/sipeed_maixduino_sdcard_defconfig |  2 +-
 toolchain/Config.in                       |  7 ----
 17 files changed, 59 insertions(+), 57 deletions(-)
arch/Config.in +22 -25
index 095036f1aa..1d38c7a065 100644
@@ -9,10 +9,7 @@ config BR2_KERNEL_64_USERLAND_32
 config BR2_SOFT_FLOAT
 	bool
 
-config BR2_ARCH_HAS_MMU_MANDATORY
-	bool
-
-config BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_USE_MMU
 	bool
 
 choice
@@ -23,7 +20,7 @@ choice
 
 config BR2_arcle
 	bool "ARC (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -31,7 +28,7 @@ config BR2_arcle
 
 config BR2_arceb
 	bool "ARC (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -49,7 +46,7 @@ config BR2_arm
 
 config BR2_armeb
 	bool "ARM (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  ARM is a 32-bit reduced instruction set computer (RISC)
 	  instruction set architecture (ISA) developed by ARM Holdings.
@@ -76,7 +73,7 @@ config BR2_aarch64_be
 config BR2_csky
 	bool "csky"
 	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
@@ -85,7 +82,7 @@ config BR2_csky
 
 config BR2_i386
 	bool "i386"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Intel i386 architecture compatible microprocessor
 	  http://en.wikipedia.org/wiki/I386
@@ -99,7 +96,7 @@ config BR2_m68k
 
 config BR2_microblazeel
 	bool "Microblaze AXI (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI
 	  bus based architecture (little endian)
@@ -108,7 +105,7 @@ config BR2_microblazeel
 
 config BR2_microblazebe
 	bool "Microblaze non-AXI (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB
 	  bus based architecture (non-AXI, big endian)
@@ -117,7 +114,7 @@ config BR2_microblazebe
 
 config BR2_mips
 	bool "MIPS (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -126,7 +123,7 @@ config BR2_mips
 
 config BR2_mipsel
 	bool "MIPS (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -136,7 +133,7 @@ config BR2_mipsel
 config BR2_mips64
 	bool "MIPS64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -146,7 +143,7 @@ config BR2_mips64
 config BR2_mips64el
 	bool "MIPS64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -155,7 +152,7 @@ config BR2_mips64el
 
 config BR2_nios2
 	bool "Nios II"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Nios II is a soft core processor from Altera Corporation.
 	  http://www.altera.com/
@@ -163,14 +160,14 @@ config BR2_nios2
 
 config BR2_or1k
 	bool "OpenRISC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  OpenRISC is a free and open processor for embedded system.
 	  http://openrisc.io
 
 config BR2_powerpc
 	bool "PowerPC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -180,7 +177,7 @@ config BR2_powerpc
 config BR2_powerpc64
 	bool "PowerPC64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -190,7 +187,7 @@ config BR2_powerpc64
 config BR2_powerpc64le
 	bool "PowerPC64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Little endian.
@@ -210,7 +207,7 @@ config BR2_riscv
 config BR2_s390x
 	bool "s390x"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  s390x is a big-endian architecture made by IBM.
 	  http://www.ibm.com/
@@ -218,7 +215,7 @@ config BR2_s390x
 
 config BR2_sh
 	bool "SuperH"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SuperH (or SH) is a 32-bit reduced instruction set computer
 	  (RISC) instruction set architecture (ISA) developed by
@@ -228,7 +225,7 @@ config BR2_sh
 
 config BR2_sparc
 	bool "SPARC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -239,7 +236,7 @@ config BR2_sparc
 config BR2_sparc64
 	bool "SPARC64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -250,7 +247,7 @@ config BR2_sparc64
 config BR2_x86_64
 	bool "x86_64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  x86-64 is an extension of the x86 instruction set (Intel i386
 	  architecture compatible microprocessor).
arch/Config.in.arm +5 -5
index eb71d70430..15f96c4239 100644
@@ -73,26 +73,26 @@ config BR2_ARM_CPU_HAS_THUMB2
 
 config BR2_ARM_CPU_ARMV4
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV5
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV6
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7M
 	bool
 
 config BR2_ARM_CPU_ARMV8A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 choice
 	prompt "Target Architecture Variant"
arch/Config.in.m68k +1 -1
index 1f7d944621..9fd22aaf1e 100644
@@ -26,7 +26,7 @@ choice
 config BR2_m68k_68040
 	bool "68040"
 	select BR2_m68k_m68k
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_m68k_cf5208
 	bool "5208"
arch/Config.in.riscv +10 -2
index 30bdcaa80b..b5e84389e0 100644
@@ -71,15 +71,23 @@ choice
 
 config BR2_RISCV_32
 	bool "32-bit"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_RISCV_64
 	bool "64-bit"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 endchoice
 
+config BR2_RISCV_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_RISCV_64
+	select BR2_USE_MMU
+	help
+	  Enable this option if your RISC-V core has a MMU (Memory
+	  Management Unit).
+
 choice
 	prompt "Target ABI"
 	default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
arch/Config.in.xtensa +10 -2
index 45ad2dc487..f9d5adb4c9 100644
@@ -5,11 +5,10 @@ choice
 
 config BR2_XTENSA_CUSTOM
 	bool "Custom Xtensa processor configuration"
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 config BR2_xtensa_fsf
 	bool "fsf - Default configuration"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 endchoice
 
@@ -41,6 +40,15 @@ config BR2_XTENSA_BIG_ENDIAN
 
 endchoice
 
+config BR2_XTENSA_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_XTENSA_CUSTOM
+	select BR2_USE_MMU
+	help
+	  Enable this option if your Xtensa core has a MMU (Memory
+	  Management Unit).
+
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_XTENSA_LITTLE_ENDIAN
 	default "BIG"		if BR2_xtensa_fsf || BR2_XTENSA_BIG_ENDIAN
configs/canaan_kd233_defconfig +1 -1
index 85b7b14fbd..278fb883bf 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/qemu_riscv64_nommu_virt_defconfig +1 -3
index 33fad50a3c..691cf31748 100644
@@ -1,13 +1,11 @@
 # Architecture
 BR2_riscv=y
 BR2_RISCV_64=y
+# BR2_RISCV_USE_MMU is not set
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
-# Toolchain
-# BR2_USE_MMU is not set
-
 # Busybox with hush
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
 
configs/qemu_xtensa_lx60_nommu_defconfig +1 -3
index f107b7e73b..4be1b66edc 100644
@@ -2,9 +2,7 @@
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
 BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
-
-# Toolchain
-# BR2_USE_MMU is not set
+# BR2_XTENSA_USE_MMU is not set
 
 # Use minimal busybox with hush and networking tools
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
configs/sipeed_maix_bit_defconfig +1 -1
index dbc5af4e74..b31bc1309b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_bit_sdcard_defconfig +1 -1
index 9f1c3a305f..4ad3b2e1db 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_defconfig +1 -1
index 0f30e8d38f..d071e5d380 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_sdcard_defconfig +1 -1
index fdbca11590..de79ff950b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_defconfig +1 -1
index 2054e49ae2..3055379db4 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_sdcard_defconfig +1 -1
index a16943608c..7338b0c09d 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_defconfig +1 -1
index a581ecbea5..50c59bd4ad 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_sdcard_defconfig +1 -1
index 7e627e5d15..b4f1994239 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
toolchain/Config.in +0 -7
index e6fabbfc74..5f79c07df0 100644
@@ -315,13 +315,6 @@ config BR2_TOOLCHAIN_EXTRA_LIBS
 config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
 	bool
 
-config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
-	default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY
-	help
-	  If your target has a MMU, you should say Y here.  If you
-	  are unsure, just say Y.
-
 config BR2_TARGET_OPTIMIZATION
 	string "Target Optimizations"
 	default ""
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#10 lore raw

Re: [Buildroot] [PATCH v2 4/4] arch: rework MMU option handling and move to "Target architecture" menu

Hello Yann,

Thanks for the review!

Quoted 2 lines · On Wed, 27 Jul 2022 10:30:20 +0200 "Yann E. MORIN" <[email protected]>…

I am not sure why you are removing a generic option in favour of two arch-specific options that behave exactly the same.

The motivation is explained in the commit log. Quoting it

================================================================
However, if we simply move it in arch/Config.in, it means that we would have the following order of options:

Target architecture
Target architecture variant
ABI
MMU
Binary format

But really, the MMU option should be right below the Target architecture variant, and the available ABIs derived from that.
================================================================

Quoted 16 lines

Why not just keep that:

config BR2_USE_MMU
bool "MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL default y if BR2_ARCH_HAS_MMU_OPTIONAL

This still achieves what you want:
- arch/variants that have a mandatory MMU can directly select BR2_USE_MMU as this patch does, and the prompt does not appear in that case;
- arch/variants that have no MMU don't select BR2_USE_MMU, and there is no prompt either
- arch/variants that have an optrional MMU select BR2_ARCH_HAS_MMU_OPTIONAL, BR2_USE_MMU is default y, and there is a prompt.

Quoted 4 lines

And then we drop one Kconfig knob (MMU_MANDATORY), and do not need to introduce two others (one for riscv and one for xtensa).

I.e. the case for arch-specific options is not clear to me...

See above :-)

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#11 lore raw

Re: [Buildroot] [PATCH v2 4/4] arch: rework MMU option handling and move to "Target architecture" menu

Thomas, All,

On 2022-07-27 11:22 +0200, Thomas Petazzoni spake thusly:

Quoted 9 lines
Quoted 2 lines · On Wed, 27 Jul 2022 10:30:20 +0200 "Yann E. MORIN" <[email protected]>…

I am not sure why you are removing a generic option in favour of two arch-specific options that behave exactly the same.

The motivation is explained in the commit log. Quoting it
================================================================
However, if we simply move it in arch/Config.in, it means that we would have the following order of options:

Quoted 5 lines

Target architecture
Target architecture variant
ABI
MMU
Binary format

Let me complete that for you, then:

... where variant and ABI are arch-specific, so we can't have a
generic option in-between, because a kconfig option can be given a single prompt (even conditional ones), and appears in the menuconfig at the place it was given its prompt.

OK, got it now. Thanks!

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#12 lore raw

Re: [Buildroot] [PATCH v2 4/4] arch: rework MMU option handling and move to "Target architecture" menu

In reply to Thomas Petazzoni via buildroot

Thomas, All,

On 2022-07-26 18:39 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 7 lines

The MMU option is currently located in the "Toolchain" menu, but it doesn't make sense as it's really architecture related. In addition, the selection of MMU has an impact on the choice of binary format available, which is visible in the architecture menu.

Therefore, this commit moves the MMU option into the architecture menu.

I slightly expanded on that after your reply.

[--SNIP--]

Quoted 5 lines

This commit might raise a concern in terms of backward compatibility with existing configurations. The only configurations that will be broken by this change are RISC-V noMMU (which was very recently introduced) and Xtensa noMMU (which we can probably agree is not such a widely popular configuration).

Indeed. People in this game know what to do and look for.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 573 lines

---
Changes since v1:
- Make BR2_RISCV_USE_MMU and BR2_XTENSA_USE_MMU default y to behave like BR2_USE_MMU used to
- Update the defconfigs that had "# BR2_USE_MMU is not set" to use the new option.

---
 arch/Config.in                            | 47 +++++++++++------------
 arch/Config.in.arm                        | 10 ++---
 arch/Config.in.m68k                       |  2 +-
 arch/Config.in.riscv                      | 12 +++++-
 arch/Config.in.xtensa                     | 12 +++++-
 configs/canaan_kd233_defconfig            |  2 +-
 configs/qemu_riscv64_nommu_virt_defconfig |  4 +-
 configs/qemu_xtensa_lx60_nommu_defconfig  |  4 +-
 configs/sipeed_maix_bit_defconfig         |  2 +-
 configs/sipeed_maix_bit_sdcard_defconfig  |  2 +-
 configs/sipeed_maix_dock_defconfig        |  2 +-
 configs/sipeed_maix_dock_sdcard_defconfig |  2 +-
 configs/sipeed_maix_go_defconfig          |  2 +-
 configs/sipeed_maix_go_sdcard_defconfig   |  2 +-
 configs/sipeed_maixduino_defconfig        |  2 +-
 configs/sipeed_maixduino_sdcard_defconfig |  2 +-
 toolchain/Config.in                       |  7 ----
 17 files changed, 59 insertions(+), 57 deletions(-)
arch/Config.in +22 -25
index 095036f1aa..1d38c7a065 100644
@@ -9,10 +9,7 @@ config BR2_KERNEL_64_USERLAND_32
 config BR2_SOFT_FLOAT
 	bool
 
-config BR2_ARCH_HAS_MMU_MANDATORY
-	bool
-
-config BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_USE_MMU
 	bool
 
 choice
@@ -23,7 +20,7 @@ choice
 
 config BR2_arcle
 	bool "ARC (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -31,7 +28,7 @@ config BR2_arcle
 
 config BR2_arceb
 	bool "ARC (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Synopsys' DesignWare ARC Processor Cores are a family of
 	  32-bit CPUs that can be used from deeply embedded to high
@@ -49,7 +46,7 @@ config BR2_arm
 
 config BR2_armeb
 	bool "ARM (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  ARM is a 32-bit reduced instruction set computer (RISC)
 	  instruction set architecture (ISA) developed by ARM Holdings.
@@ -76,7 +73,7 @@ config BR2_aarch64_be
 config BR2_csky
 	bool "csky"
 	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
@@ -85,7 +82,7 @@ config BR2_csky
 
 config BR2_i386
 	bool "i386"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Intel i386 architecture compatible microprocessor
 	  http://en.wikipedia.org/wiki/I386
@@ -99,7 +96,7 @@ config BR2_m68k
 
 config BR2_microblazeel
 	bool "Microblaze AXI (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. AXI
 	  bus based architecture (little endian)
@@ -108,7 +105,7 @@ config BR2_microblazeel
 
 config BR2_microblazebe
 	bool "Microblaze non-AXI (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Soft processor core designed for Xilinx FPGAs from Xilinx. PLB
 	  bus based architecture (non-AXI, big endian)
@@ -117,7 +114,7 @@ config BR2_microblazebe
 
 config BR2_mips
 	bool "MIPS (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -126,7 +123,7 @@ config BR2_mips
 
 config BR2_mipsel
 	bool "MIPS (little endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -136,7 +133,7 @@ config BR2_mipsel
 config BR2_mips64
 	bool "MIPS64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Big
 	  endian.
@@ -146,7 +143,7 @@ config BR2_mips64
 config BR2_mips64el
 	bool "MIPS64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  MIPS is a RISC microprocessor from MIPS Technologies. Little
 	  endian.
@@ -155,7 +152,7 @@ config BR2_mips64el
 
 config BR2_nios2
 	bool "Nios II"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  Nios II is a soft core processor from Altera Corporation.
 	  http://www.altera.com/
@@ -163,14 +160,14 @@ config BR2_nios2
 
 config BR2_or1k
 	bool "OpenRISC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  OpenRISC is a free and open processor for embedded system.
 	  http://openrisc.io
 
 config BR2_powerpc
 	bool "PowerPC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -180,7 +177,7 @@ config BR2_powerpc
 config BR2_powerpc64
 	bool "PowerPC64 (big endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Big endian.
@@ -190,7 +187,7 @@ config BR2_powerpc64
 config BR2_powerpc64le
 	bool "PowerPC64 (little endian)"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  PowerPC is a RISC architecture created by Apple-IBM-Motorola
 	  alliance. Little endian.
@@ -210,7 +207,7 @@ config BR2_riscv
 config BR2_s390x
 	bool "s390x"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  s390x is a big-endian architecture made by IBM.
 	  http://www.ibm.com/
@@ -218,7 +215,7 @@ config BR2_s390x
 
 config BR2_sh
 	bool "SuperH"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SuperH (or SH) is a 32-bit reduced instruction set computer
 	  (RISC) instruction set architecture (ISA) developed by
@@ -228,7 +225,7 @@ config BR2_sh
 
 config BR2_sparc
 	bool "SPARC"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -239,7 +236,7 @@ config BR2_sparc
 config BR2_sparc64
 	bool "SPARC64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  SPARC (from Scalable Processor Architecture) is a RISC
 	  instruction set architecture (ISA) developed by Sun
@@ -250,7 +247,7 @@ config BR2_sparc64
 config BR2_x86_64
 	bool "x86_64"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 	help
 	  x86-64 is an extension of the x86 instruction set (Intel i386
 	  architecture compatible microprocessor).
arch/Config.in.arm +5 -5
index eb71d70430..15f96c4239 100644
@@ -73,26 +73,26 @@ config BR2_ARM_CPU_HAS_THUMB2
 
 config BR2_ARM_CPU_ARMV4
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV5
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV6
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_ARM_CPU_ARMV7M
 	bool
 
 config BR2_ARM_CPU_ARMV8A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 choice
 	prompt "Target Architecture Variant"
arch/Config.in.m68k +1 -1
index 1f7d944621..9fd22aaf1e 100644
@@ -26,7 +26,7 @@ choice
 config BR2_m68k_68040
 	bool "68040"
 	select BR2_m68k_m68k
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_m68k_cf5208
 	bool "5208"
arch/Config.in.riscv +10 -2
index 30bdcaa80b..b5e84389e0 100644
@@ -71,15 +71,23 @@ choice
 
 config BR2_RISCV_32
 	bool "32-bit"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 config BR2_RISCV_64
 	bool "64-bit"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 endchoice
 
+config BR2_RISCV_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_RISCV_64
+	select BR2_USE_MMU
+	help
+	  Enable this option if your RISC-V core has a MMU (Memory
+	  Management Unit).
+
 choice
 	prompt "Target ABI"
 	default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD
arch/Config.in.xtensa +10 -2
index 45ad2dc487..f9d5adb4c9 100644
@@ -5,11 +5,10 @@ choice
 
 config BR2_XTENSA_CUSTOM
 	bool "Custom Xtensa processor configuration"
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 config BR2_xtensa_fsf
 	bool "fsf - Default configuration"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_USE_MMU
 
 endchoice
 
@@ -41,6 +40,15 @@ config BR2_XTENSA_BIG_ENDIAN
 
 endchoice
 
+config BR2_XTENSA_USE_MMU
+	bool "MMU support"
+	default y
+	depends on BR2_XTENSA_CUSTOM
+	select BR2_USE_MMU
+	help
+	  Enable this option if your Xtensa core has a MMU (Memory
+	  Management Unit).
+
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_XTENSA_LITTLE_ENDIAN
 	default "BIG"		if BR2_xtensa_fsf || BR2_XTENSA_BIG_ENDIAN
configs/canaan_kd233_defconfig +1 -1
index 85b7b14fbd..278fb883bf 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/qemu_riscv64_nommu_virt_defconfig +1 -3
index 33fad50a3c..691cf31748 100644
@@ -1,13 +1,11 @@
 # Architecture
 BR2_riscv=y
 BR2_RISCV_64=y
+# BR2_RISCV_USE_MMU is not set
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
-# Toolchain
-# BR2_USE_MMU is not set
-
 # Busybox with hush
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
 
configs/qemu_xtensa_lx60_nommu_defconfig +1 -3
index f107b7e73b..4be1b66edc 100644
@@ -2,9 +2,7 @@
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
 BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
-
-# Toolchain
-# BR2_USE_MMU is not set
+# BR2_XTENSA_USE_MMU is not set
 
 # Use minimal busybox with hush and networking tools
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config"
configs/sipeed_maix_bit_defconfig +1 -1
index dbc5af4e74..b31bc1309b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_bit_sdcard_defconfig +1 -1
index 9f1c3a305f..4ad3b2e1db 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_defconfig +1 -1
index 0f30e8d38f..d071e5d380 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_dock_sdcard_defconfig +1 -1
index fdbca11590..de79ff950b 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_defconfig +1 -1
index 2054e49ae2..3055379db4 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maix_go_sdcard_defconfig +1 -1
index a16943608c..7338b0c09d 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_defconfig +1 -1
index a581ecbea5..50c59bd4ad 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # Binary format
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
configs/sipeed_maixduino_sdcard_defconfig +1 -1
index 7e627e5d15..b4f1994239 100644
@@ -7,13 +7,13 @@ BR2_RISCV_ISA_CUSTOM_RVA=y
 BR2_RISCV_ISA_CUSTOM_RVF=y
 BR2_RISCV_ISA_CUSTOM_RVD=y
 BR2_RISCV_ISA_CUSTOM_RVC=y
+# BR2_RISCV_USE_MMU is not set
 BR2_RISCV_ABI_LP64D=y
 
 # Patches
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 # System
-# BR2_USE_MMU is not set
 BR2_BINFMT_FLAT=y
 BR2_BINFMT_FLAT_ONE=y
 # BR2_TARGET_ENABLE_ROOT_LOGIN is not set
toolchain/Config.in +0 -7
index e6fabbfc74..5f79c07df0 100644
@@ -315,13 +315,6 @@ config BR2_TOOLCHAIN_EXTRA_LIBS
 config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
 	bool
 
-config BR2_USE_MMU
-	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
-	default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY
-	help
-	  If your target has a MMU, you should say Y here.  If you
-	  are unsure, just say Y.
-
 config BR2_TARGET_OPTIMIZATION
 	string "Target Optimizations"
 	default ""
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#13 lore raw

Re: [Buildroot] [PATCH v2 4/4] arch: rework MMU option handling and move to "Target architecture" menu

Quoted 1 line · On Wed, 27 Jul 2022 11:43:17 +0200 "Yann E. MORIN" <[email protected]>…

Applied to master, thanks.

\o/ Thanks a lot!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#14 lore raw
In reply to Thomas Petazzoni via buildroot

Thomas, All,

On 2022-07-26 18:39 +0200, Thomas Petazzoni via buildroot spake thusly:

Quoted 10 lines

Even though that seems weird, the LP64F ABI is only supported when MMU support is enabled. Indeed, as per commit 9a51381cedc16e6d70cb85e1144f6e0fa89af69a ("package/uclibc: prevent config with unsupported RISC-V float ABI"), uClibc does not support LP64F. But uClibc is the only C library that support RISC-V 64-bit noMMU.

So the selection of LP64F and !MMU is impossible. Right now this selection causes a build failure as no C library is enabled.

Quoted 8 lines

This commit fixes this by ensuring we cannot use LP64F when MMU support is not available.

Fixes:

http://autobuild.buildroot.net/results/6320dcc655f1871eb8bf6a9689bddde7447385f5/

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 23 lines
---
 arch/Config.in.riscv | 1 +
 1 file changed, 1 insertion(+)
arch/Config.in.riscv +1 -0
index 288ed833eb..30bdcaa80b 100644
@@ -108,6 +108,7 @@ config BR2_RISCV_ABI_LP64
 config BR2_RISCV_ABI_LP64F
 	bool "lp64f"
 	depends on BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
+	depends on BR2_USE_MMU
 
 config BR2_RISCV_ABI_LP64D
 	bool "lp64d"
Signature · 6 lines
2.37.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#15 lore raw
In reply to Thomas Petazzoni via buildroot
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni via buildroot <[email protected]> writes:

Even though that seems weird, the LP64F ABI is only supported when MMU support is enabled. Indeed, as per commit 9a51381cedc16e6d70cb85e1144f6e0fa89af69a ("package/uclibc: prevent config with unsupported RISC-V float ABI"), uClibc does not support LP64F. But uClibc is the only C library that support RISC-V 64-bit noMMU.

So the selection of LP64F and !MMU is impossible. Right now this selection causes a build failure as no C library is enabled.

Quoted 8 lines

This commit fixes this by ensuring we cannot use LP64F when MMU support is not available.

Fixes:

http://autobuild.buildroot.net/results/6320dcc655f1871eb8bf6a9689bddde7447385f5/

Committed to 2022.05.x and 2022.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot