From f628c12b04fb1dffde35724f5dacb1c84ac9b735 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 11 May 2017 17:46:49 -0400 Subject: [PATCH] xtensa: rename SOC_SAMPLE_CONTROLLER SOC_SAMPLE_CONTROLLER option name is too generic, make it Xtensa specific to avoid confusion. Signed-off-by: Anas Nashif --- arch/xtensa/soc/sample_controller/Kconfig.defconfig | 2 +- arch/xtensa/soc/sample_controller/Kconfig.soc | 4 ++-- boards/xtensa/qemu_xtensa/Kconfig.board | 2 +- boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig | 2 +- boards/xtensa/xt-sim/Kconfig.board | 2 +- boards/xtensa/xt-sim/xt-sim_defconfig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/xtensa/soc/sample_controller/Kconfig.defconfig b/arch/xtensa/soc/sample_controller/Kconfig.defconfig index f03a2af3e43..b485d3c42b6 100644 --- a/arch/xtensa/soc/sample_controller/Kconfig.defconfig +++ b/arch/xtensa/soc/sample_controller/Kconfig.defconfig @@ -4,7 +4,7 @@ # Copyright (c) 2016 Cadence Design Systems, Inc. # SPDX-License-Identifier: Apache-2.0 -if SOC_SAMPLE_CONTROLLER +if SOC_XTENSA_SAMPLE_CONTROLLER config SOC string diff --git a/arch/xtensa/soc/sample_controller/Kconfig.soc b/arch/xtensa/soc/sample_controller/Kconfig.soc index 4a7ff712d7e..509823bd6c4 100644 --- a/arch/xtensa/soc/sample_controller/Kconfig.soc +++ b/arch/xtensa/soc/sample_controller/Kconfig.soc @@ -1,6 +1,6 @@ # Copyright (c) 2017 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -config SOC_SAMPLE_CONTROLLER - bool "sample_controller core" +config SOC_XTENSA_SAMPLE_CONTROLLER + bool "Xtensa sample_controller core" diff --git a/boards/xtensa/qemu_xtensa/Kconfig.board b/boards/xtensa/qemu_xtensa/Kconfig.board index 7a3cf02a6f1..dbcf9492341 100644 --- a/boards/xtensa/qemu_xtensa/Kconfig.board +++ b/boards/xtensa/qemu_xtensa/Kconfig.board @@ -5,4 +5,4 @@ config BOARD_QEMU_XTENSA bool "Xtensa emulation using Qemu" - depends on XTENSA + depends on SOC_XTENSA_SAMPLE_CONTROLLER diff --git a/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig b/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig index c678478bd96..c724df8e02c 100644 --- a/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig +++ b/boards/xtensa/qemu_xtensa/qemu_xtensa_defconfig @@ -1,6 +1,6 @@ CONFIG_MAIN_STACK_SIZE=2048 CONFIG_IPM_CONSOLE_STACK_SIZE=2048 CONFIG_XTENSA=y -CONFIG_SOC_SAMPLE_CONTROLLER=y CONFIG_BOARD_QEMU_XTENSA=y CONFIG_CONSOLE=y +CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y diff --git a/boards/xtensa/xt-sim/Kconfig.board b/boards/xtensa/xt-sim/Kconfig.board index 8b6d05876ec..a26fe11af38 100644 --- a/boards/xtensa/xt-sim/Kconfig.board +++ b/boards/xtensa/xt-sim/Kconfig.board @@ -5,4 +5,4 @@ config BOARD_SIMULATOR_XTENSA bool "Xtensa Development ISS" - depends on XTENSA + depends on SOC_XTENSA_SAMPLE_CONTROLLER diff --git a/boards/xtensa/xt-sim/xt-sim_defconfig b/boards/xtensa/xt-sim/xt-sim_defconfig index 4980ae753cd..75e5059dd46 100644 --- a/boards/xtensa/xt-sim/xt-sim_defconfig +++ b/boards/xtensa/xt-sim/xt-sim_defconfig @@ -1,6 +1,6 @@ CONFIG_MAIN_STACK_SIZE=2048 CONFIG_IPM_CONSOLE_STACK_SIZE=2048 CONFIG_XTENSA=y -CONFIG_SOC_SAMPLE_CONTROLLER=y CONFIG_SIMULATOR_XTENSA=y +CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER=y CONFIG_CONSOLE=y