diff options
| -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 |
