[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/22] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES
From: |
Laurent Vivier |
Subject: |
[PULL 19/22] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES |
Date: |
Wed, 10 Mar 2021 22:45:01 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
We want to be able to use the 'LM32' config for architecture
specific features. As CONFIG_LM32 is only used to select
peripherals, rename it CONFIG_LM32_DEVICES.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210221225626.2589247-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/char/meson.build | 4 ++--
hw/intc/meson.build | 2 +-
hw/lm32/Kconfig | 4 ++--
hw/timer/meson.build | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/char/meson.build b/hw/char/meson.build
index afe9a0af88c1..7ba38dbd965f 100644
--- a/hw/char/meson.build
+++ b/hw/char/meson.build
@@ -8,8 +8,8 @@ softmmu_ss.add(when: 'CONFIG_IMX', if_true:
files('imx_serial.c'))
softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_juart.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_uart.c'))
softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c'))
softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index b3d9345a0d2e..8df3656419e3 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -14,7 +14,7 @@ softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true:
files('heathrow_pic.c'))
softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c',
'i8259.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_pic.c'))
softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c'))
diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index 20c36edc402c..518c84ed5084 100644
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -1,4 +1,4 @@
-config LM32
+config LM32_DEVICES
bool
select PTIMER
@@ -14,5 +14,5 @@ config MILKYMIST
config LM32_EVR
bool
- select LM32
+ select LM32_DEVICES
select PFLASH_CFI02
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
index 26c2701fd78f..a2372629f001 100644
--- a/hw/timer/meson.build
+++ b/hw/timer/meson.build
@@ -19,7 +19,7 @@ softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c'))
softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c',
'i8254.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_timer.c'))
softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.c'))
softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
--
2.29.2
- [PULL 09/22] fuzz-test: remove unneccessary debugging flags, (continued)
- [PULL 09/22] fuzz-test: remove unneccessary debugging flags, Laurent Vivier, 2021/03/10
- [PULL 10/22] exec/memory: Use struct Object typedef, Laurent Vivier, 2021/03/10
- [PULL 11/22] virtio-gpu: Adjust code space style, Laurent Vivier, 2021/03/10
- [PULL 04/22] target/hexagon/gen_tcg_funcs: Fix a typo, Laurent Vivier, 2021/03/10
- [PULL 12/22] ui: Replace the word 'whitelist', Laurent Vivier, 2021/03/10
- [PULL 18/22] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards, Laurent Vivier, 2021/03/10
- [PULL 14/22] seccomp: Replace the word 'blacklist', Laurent Vivier, 2021/03/10
- [PULL 13/22] scripts/tracetool: Replace the word 'whitelist', Laurent Vivier, 2021/03/10
- [PULL 17/22] qemu-common.h: Update copyright string to 2021, Laurent Vivier, 2021/03/10
- [PULL 15/22] qemu-options: Replace the word 'blacklist', Laurent Vivier, 2021/03/10
- [PULL 19/22] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES,
Laurent Vivier <=
- [PULL 16/22] tests/fp/fp-test: Replace the word 'blacklist', Laurent Vivier, 2021/03/10
- Re: [PULL 00/22] Trivial branch for 6.0 patches, Laurent Vivier, 2021/03/10
- Re: [PULL 00/22] Trivial branch for 6.0 patches, Peter Maydell, 2021/03/12