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

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Thomas, All,

On 2022-07-26 18:39 +0200, Thomas Petazzoni via buildroot spake thusly:
> 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 ...
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  arch/Config.in | 100 ++++++++++++++++++++++++-------------------------
>  1 file changed, 50 insertions(+), 50 deletions(-)
> 
> diff --git a/arch/Config.in b/arch/Config.in
> index 9135df9def..095036f1aa 100644
> --- a/arch/Config.in
> +++ b/arch/Config.in
> @@ -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
> -- 
> 2.37.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot