diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-07-09 05:21:55 -0700 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-09 15:39:24 +0200 |
| commit | 15a96d1aaad32434bd63918ebdc09dd6468c630f (patch) | |
| tree | b3290d2d76f5564bdc3c977b9402988b62d02481 | |
| parent | b404b27d419bdca7da15c6bdad2c8a1e48f2cbad (diff) | |
| download | buildroot-15a96d1aaad32434bd63918ebdc09dd6468c630f.tar.gz buildroot-15a96d1aaad32434bd63918ebdc09dd6468c630f.zip | |
arch/xtensa: get rid of an intermediate blind kconfig option
It is not needed to have an intermediate blind option, we can just
hide the prompt behind the same dependency as the non-blind symbol.
Update our qemu-xtensa defconfig acordingly (note: it was using
different values for both options, which is not possible; the blind
option was just set to the non-blind one in the .config).
Also remove an unneeded empty default for the BR2_XTENSA_OVERLAY_DIR
string option (strings are empty by default).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | Config.in.legacy | 11 | ||||
| -rw-r--r-- | arch/Config.in.xtensa | 16 | ||||
| -rw-r--r-- | configs/qemu_xtensa_lx60_defconfig | 3 | ||||
| -rw-r--r-- | configs/qemu_xtensa_lx60_nommu_defconfig | 3 |
4 files changed, 19 insertions, 14 deletions
diff --git a/Config.in.legacy b/Config.in.legacy index 805d5a46cb..3a283d9e7b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -145,6 +145,17 @@ endif ############################################################################### comment "Legacy options removed in 2017.08" +config BR2_XTENSA_CUSTOM_NAME + string "The BR2_XTENSA_CUSTOM_NAME option has been renamed" + help + The BR2_XTENSA_CUSTOM_NAME option has been renamed + to BR2_XTENSA_CORE_NAME. + +config BR2_XTENSA_CUSTOM_NAME_WRAP + bool + default y if BR2_XTENSA_CUSTOM_NAME != "" + select BR2_LEGACY + config BR2_PACKAGE_HOST_MKE2IMG bool "host mke2img has been removed" select BR2_LEGACY diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index 88dbe18fee..00b1f6853c 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -2,30 +2,26 @@ choice prompt "Target Architecture Variant" depends on BR2_xtensa default BR2_xtensa_fsf + config BR2_XTENSA_CUSTOM select BR2_ARCH_HAS_MMU_OPTIONAL bool "Custom Xtensa processor configuration" + config BR2_xtensa_fsf select BR2_ARCH_HAS_MMU_MANDATORY bool "fsf - Default configuration" + endchoice -config BR2_XTENSA_CUSTOM_NAME - string "Custom Xtensa processor configuration name" - depends on BR2_XTENSA_CUSTOM - default "" +config BR2_XTENSA_CORE_NAME + string "Custom Xtensa processor configuration name" if BR2_XTENSA_CUSTOM + default BR2_XTENSA_CUSTOM_NAME if BR2_XTENSA_CUSTOM_NAME != "" # legacy help Name given to a custom Xtensa processor configuration. -config BR2_XTENSA_CORE_NAME - string - default BR2_XTENSA_CUSTOM_NAME if BR2_XTENSA_CUSTOM - default "" if BR2_xtensa_fsf - config BR2_XTENSA_OVERLAY_DIR string "Overlay directory for custom configuration" depends on BR2_XTENSA_CUSTOM - default "" help Provide the directory path that contains the overlay file for a custom processor configuration. The path is relative diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 3e98222b65..ec0c1bac51 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -1,8 +1,7 @@ # Architecture BR2_xtensa=y BR2_XTENSA_CUSTOM=y -BR2_XTENSA_CUSTOM_NAME="dc233c" -BR2_XTENSA_CORE_NAME="lx60" +BR2_XTENSA_CORE_NAME="dc233c" BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60" # System diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 998cd2aa6b..d19bc5431b 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -1,8 +1,7 @@ # Architecture BR2_xtensa=y BR2_XTENSA_CUSTOM=y -BR2_XTENSA_CUSTOM_NAME="dc233c" -BR2_XTENSA_CORE_NAME="lx60" +BR2_XTENSA_CORE_NAME="dc233c" BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60" # Toolchain |
