Re: [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES

[Laurent Vivier]

Le 21/02/2021 à 23:56, Philippe Mathieu-Daudé a écrit :
> 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>
> ---
>  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 196ac91fa29..b95e8958514 100644
> --- a/hw/char/meson.build
> +++ b/hw/char/meson.build
> @@ -8,8 +8,8 @@
>  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 53cba115690..b2c4c085af9 100644
> --- a/hw/intc/meson.build
> +++ b/hw/intc/meson.build
> @@ -14,7 +14,7 @@
>  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 20c36edc402..518c84ed508 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 be343f68fed..52723f34c42 100644
> --- a/hw/timer/meson.build
> +++ b/hw/timer/meson.build
> @@ -19,7 +19,7 @@
>  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'))
> 

Applied to my trivial-patches branch.

Thanks,
Laurent