Improvements for switches in hw/cpu/Kconfig
Subsystems (2)
v2 cover Improvements for switches in hw/cpu/Kconfig
First patch fixes the problem that the file hw/cpu/Kconfig is currently ignored and the switches there are duplicated in hw/arm/.
The second patch introduces a proper config switch for the cpu-cluster device.
v2:
- Don't make core.c depend on the CPU_CLUSTER switch
- Added Philippe's Reviewed-bys
Thomas Huth (2):
hw: Fix problem with the A*MPCORE switches in the Kconfig files
hw: Add a Kconfig switch for the TYPE_CPU_CLUSTER device
hw/Kconfig | 1 + hw/arm/Kconfig | 18 +++--------------- hw/cpu/Kconfig | 15 ++++++++++++--- hw/cpu/meson.build | 3 ++- hw/riscv/Kconfig | 2 ++ 5 files changed, 20 insertions(+), 19 deletions(-)
Signature · 1 line
2.44.0
PATCH v2 1/2 hw: Fix problem with the A*MPCORE switches in the Kconfig files
A9MPCORE, ARM11MPCORE and A15MPCORE are defined twice, once in hw/cpu/Kconfig and once in hw/arm/Kconfig. This is only possible by accident, since hw/cpu/Kconfig is never included from hw/Kconfig. Fix it by declaring the switches only in hw/cpu/Kconfig (since the related files reside in the hw/cpu/ folder) and by making sure that the file hw/cpu/Kconfig is now properly included from hw/Kconfig.
--- hw/Kconfig | 1 + hw/arm/Kconfig | 15 --------------- hw/cpu/Kconfig | 12 +++++++++--- 3 files changed, 10 insertions(+), 18 deletions(-)
hw/Kconfig +1 -0
@@ -48,6 +48,7 @@ source watchdog/Kconfig # arch Kconfig source arm/Kconfig +source cpu/Kconfig source alpha/Kconfig source avr/Kconfig source cris/Kconfig
hw/arm/Kconfig +0 -15
@@ -678,21 +678,6 @@ config ZAURUS select NAND select ECC -config A9MPCORE - bool - select A9_GTIMER - select A9SCU # snoop control unit - select ARM_GIC - select ARM_MPTIMER - -config A15MPCORE - bool - select ARM_GIC - -config ARM11MPCORE - bool - select ARM11SCU - config ARMSSE bool select ARM_V7M
hw/cpu/Kconfig +9 -3
@@ -1,8 +1,14 @@ -config ARM11MPCORE - bool - config A9MPCORE bool + select A9_GTIMER + select A9SCU # snoop control unit + select ARM_GIC + select ARM_MPTIMER config A15MPCORE bool + select ARM_GIC + +config ARM11MPCORE + bool + select ARM11SCU
Signature · 1 line
2.44.0
PATCH v2 2/2 hw: Add a Kconfig switch for the TYPE_CPU_CLUSTER device
In reply to Thomas HuthThe cpu-cluster device is only needed for some few arm and riscv machines. Let's avoid compiling and linking it if it is not really necessary.
--- hw/arm/Kconfig | 3 +++ hw/cpu/Kconfig | 3 +++ hw/cpu/meson.build | 3 ++- hw/riscv/Kconfig | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-)
hw/arm/Kconfig +3 -0
@@ -485,6 +485,7 @@ config XLNX_ZYNQMP_ARM select AHCI select ARM_GIC select CADENCE + select CPU_CLUSTER select DDC select DPCD select SDHCI
@@ -503,6 +504,7 @@ config XLNX_VERSAL default y depends on TCG && AARCH64 select ARM_GIC + select CPU_CLUSTER select PL011 select CADENCE select VIRTIO_MMIO
@@ -688,6 +690,7 @@ config ARMSSE select CMSDK_APB_DUALTIMER select CMSDK_APB_UART select CMSDK_APB_WATCHDOG + select CPU_CLUSTER select IOTKIT_SECCTL select IOTKIT_SYSCTL select IOTKIT_SYSINFO
hw/cpu/Kconfig +3 -0
@@ -12,3 +12,6 @@ config A15MPCORE config ARM11MPCORE bool select ARM11SCU + +config CPU_CLUSTER + bool
hw/cpu/meson.build +2 -1
@@ -1,4 +1,5 @@ -system_ss.add(files('core.c', 'cluster.c')) +system_ss.add(files('core.c')) +system_ss.add(when: 'CONFIG_CPU_CLUSTER', if_true: files('cluster.c')) system_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c')) system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
hw/riscv/Kconfig +2 -0
@@ -9,6 +9,7 @@ config IBEX config MICROCHIP_PFSOC bool select CADENCE_SDHCI + select CPU_CLUSTER select MCHP_PFSOC_DMC select MCHP_PFSOC_IOSCB select MCHP_PFSOC_MMUART
@@ -68,6 +69,7 @@ config SIFIVE_E config SIFIVE_U bool select CADENCE + select CPU_CLUSTER select RISCV_ACLINT select SIFIVE_GPIO select SIFIVE_PDMA
Signature · 1 line
2.44.0
Quoted 3 lines · Thomas Huth
Thomas Huth (2):
hw: Fix problem with the A*MPCORE switches in theKconfigfiles
hw: Add aKconfigswitch for theTYPE_CPU_CLUSTERdevice
r~
Quoted 6 lines · Thomas Huth
First patch fixes the problem that the file hw/cpu/Kconfig is currently ignored and the switches there are duplicated in hw/arm/.
The second patch introduces a proper config switch for the cpu-cluster device.
Quoted 7 lines
v2:
- Don't makecore.cdepend on theCPU_CLUSTERswitch
- Added Philippe's Reviewed-bysThomas Huth (2):
hw: Fix problem with the A*MPCORE switches in theKconfigfiles
hw: Add aKconfigswitch for theTYPE_CPU_CLUSTERdevice
Thanks, series queued.