NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch/xtensa: get rid of an intermediate blind kconfig option

Browse Source 
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>
This commit is contained in:
Yann E. MORIN 2017-07-09 05:21:55 -07:00 committed by Thomas Petazzoni
parent b404b27d41
commit 15a96d1aaa
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Config.in.legacy
View File

@ -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

16
arch/Config.in.xtensa
View File

@ -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

3
configs/qemu_xtensa_lx60_defconfig
View File

@ -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

3
configs/qemu_xtensa_lx60_nommu_defconfig
View File

@ -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