Explorar o código

package/elf2flt: Remove Config.in.host

There is no need to have configuration files direbtly set the
BR2_PACKAGE_HOST_ELF2FLT option. The need for the elf2flt utility is
automatically determined by gcc build in package/gcc/gcc.mk according to
the BR2_BINFMT_FLAT option.

Accordingly, we can remove the file package/elf2flt/Config.in.host to
get rid of the BR2_PACKAGE_HOST_ELF2FLT option. BR2_STRIP_strip
dependency on this option is replaced with a dependency on
BR2_BINFMT_ELF.

To stay consistent with the fact that elf2flt supports only the arm, sh,
sparc, xtensa and riscv-64 architectures, a dependency on these
architectures is added to the BR2_BINFMT_FLAT option in arch/Config.in.

Board configuration files setting the BR2_PACKAGE_HOST_ELF2FLT option
are also updated.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Damien Le Moal %!s(int64=3) %!d(string=hai) anos
pai
achega
9db5eb258c

+ 1 - 1
Config.in

@@ -432,7 +432,7 @@ config BR2_ENABLE_RUNTIME_DEBUG
 config BR2_STRIP_strip
 config BR2_STRIP_strip
 	bool "strip target binaries"
 	bool "strip target binaries"
 	default y
 	default y
-	depends on !BR2_PACKAGE_HOST_ELF2FLT
+	depends on BR2_BINFMT_ELF
 	help
 	help
 	  Binaries and libraries in the target filesystem will be
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the normal 'strip' command. This allows to save
 	  stripped using the normal 'strip' command. This allows to save

+ 1 - 0
arch/Config.in

@@ -384,6 +384,7 @@ config BR2_BINFMT_ELF
 
 
 config BR2_BINFMT_FLAT
 config BR2_BINFMT_FLAT
 	bool "FLAT"
 	bool "FLAT"
+	depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa || BR2_RISCV_64
 	depends on !BR2_USE_MMU
 	depends on !BR2_USE_MMU
 	help
 	help
 	  FLAT binary is a relatively simple and lightweight executable
 	  FLAT binary is a relatively simple and lightweight executable

+ 0 - 1
configs/qemu_riscv64_nommu_virt_defconfig

@@ -6,7 +6,6 @@ BR2_RISCV_64=y
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches"
 
 
 # Toolchain
 # Toolchain
-BR2_PACKAGE_HOST_ELF2FLT=y
 # BR2_USE_MMU is not set
 # BR2_USE_MMU is not set
 
 
 # Busybox with hush
 # Busybox with hush

+ 0 - 1
configs/qemu_xtensa_lx60_nommu_defconfig

@@ -4,7 +4,6 @@ BR2_XTENSA_CUSTOM=y
 BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
 BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
 
 
 # Toolchain
 # Toolchain
-BR2_PACKAGE_HOST_ELF2FLT=y
 # BR2_USE_MMU is not set
 # BR2_USE_MMU is not set
 
 
 # Use minimal busybox with hush and networking tools
 # Use minimal busybox with hush and networking tools

+ 0 - 13
package/elf2flt/Config.in.host

@@ -1,13 +0,0 @@
-config BR2_PACKAGE_HOST_ELF2FLT
-	bool "Enable elf2flt support?"
-	depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa || BR2_RISCV_64
-	depends on !BR2_USE_MMU
-	help
-	  uCLinux uses a Binary Flat format commonly known as BFLT. It
-	  is a relatively simple and lightweight executable format
-	  based on the original a.out format.
-
-	  This option compiles the required tools and makes the required
-	  modifications on your toolchain (linker).
-
-	  https://github.com/uclinux-dev/elf2flt

+ 0 - 1
toolchain/toolchain-buildroot/Config.in

@@ -89,5 +89,4 @@ source "package/uclibc/Config.in"
 source "package/glibc/Config.in"
 source "package/glibc/Config.in"
 source "package/binutils/Config.in.host"
 source "package/binutils/Config.in.host"
 source "package/gcc/Config.in.host"
 source "package/gcc/Config.in.host"
-source "package/elf2flt/Config.in.host"
 endif
 endif