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>

diff --git a/Config.in.legacy b/Config.in.legacy
index 805d5a46cbd65d0517b2f19dfa750c71c8a157e1..3a283d9e7bcbc30a494421a2cae5cbcbeae9b976 100644 (file)
--- 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 88dbe18feeee3fef734e0a9b59dc96ee2d6dfac8..00b1f6853c94556718a64f29c305fa8a905bb2cb 100644 (file)
--- 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 3e98222b65554c3853b986d72b2e8fe6e735abd4..ec0c1bac51be24474074d5680abe8f1acc950790 100644 (file)
--- 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 998cd2aa6bf3e447ffa84cb93492b8ed68ab22a1..d19bc5431b39cccb8c21dc48a4bbc4d7ef93eb40 100644 (file)
--- 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