From 9db5eb258cf492567bac33a33cb606f14045639d Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Wed, 20 Jul 2022 11:45:25 +0900 Subject: [PATCH] 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in | 2 +- arch/Config.in | 1 + configs/qemu_riscv64_nommu_virt_defconfig | 1 - configs/qemu_xtensa_lx60_nommu_defconfig | 1 - package/elf2flt/Config.in.host | 13 ------------- toolchain/toolchain-buildroot/Config.in | 1 - 6 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 package/elf2flt/Config.in.host diff --git a/Config.in b/Config.in index 52c3c4b4c8..af9052d32b 100644 --- a/Config.in +++ b/Config.in @@ -432,7 +432,7 @@ config BR2_ENABLE_RUNTIME_DEBUG config BR2_STRIP_strip bool "strip target binaries" default y - depends on !BR2_PACKAGE_HOST_ELF2FLT + depends on BR2_BINFMT_ELF help Binaries and libraries in the target filesystem will be stripped using the normal 'strip' command. This allows to save diff --git a/arch/Config.in b/arch/Config.in index 366ce71f3a..26293d4986 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -384,6 +384,7 @@ config BR2_BINFMT_ELF config BR2_BINFMT_FLAT bool "FLAT" + depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa || BR2_RISCV_64 depends on !BR2_USE_MMU help FLAT binary is a relatively simple and lightweight executable diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig index bfee9e710a..33fad50a3c 100644 --- a/configs/qemu_riscv64_nommu_virt_defconfig +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -6,7 +6,6 @@ BR2_RISCV_64=y BR2_GLOBAL_PATCH_DIR="board/riscv/nommu/patches" # Toolchain -BR2_PACKAGE_HOST_ELF2FLT=y # BR2_USE_MMU is not set # Busybox with hush diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 44fb81bd74..f107b7e73b 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/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" # Toolchain -BR2_PACKAGE_HOST_ELF2FLT=y # BR2_USE_MMU is not set # Use minimal busybox with hush and networking tools diff --git a/package/elf2flt/Config.in.host b/package/elf2flt/Config.in.host deleted file mode 100644 index 2bab0095c2..0000000000 --- a/package/elf2flt/Config.in.host +++ /dev/null @@ -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 diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 11566c27ff..56343daee7 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -89,5 +89,4 @@ source "package/uclibc/Config.in" source "package/glibc/Config.in" source "package/binutils/Config.in.host" source "package/gcc/Config.in.host" -source "package/elf2flt/Config.in.host" endif