hw/arm/aspeed: Various Kconfig fixes
cover hw/arm/aspeed: Various Kconfig fixes
Trivial fixes for binaries configured with:
$ echo CONFIG_ASPEED_SOC=y > configs/devices/aarch64-softmmu/aspeed.mak $ ./configure --with-devices-aarch64=aspeed --without-default-devices
Philippe Mathieu-Daudé (3):
hw/arm/aspeed: Add missing PCI_EXPRESS -> PCIE_PORT Kconfig dependency hw/arm/aspeed: Add missing Kconfig dependencies on required components hw/arm/aspeed: Add missing Kconfig dependencies on optional components
hw/arm/Kconfig | 6 +++++- hw/pci-host/Kconfig | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
Signature · 1 line
2.53.0
PATCH 1/3 hw/arm/aspeed: Add missing PCI_EXPRESS -> PCIE_PORT Kconfig dependency
Add the missing Kconfig dependency on PCIE_PORT to avoid the following runtime error:
Type 'aspeed.pcie-root-port' is missing its parent 'pcie-root-port-base'
No need to have ASPEED_SOC select PCI_EXPRESS since it is already selected by PCI_EXPRESS_ASPEED.
--- hw/arm/Kconfig | 1 - hw/pci-host/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
hw/arm/Kconfig +0 -1
@@ -557,7 +557,6 @@ config ASPEED_SOC select MAX31785 select FSI_APB2OPB_ASPEED select AT24C - select PCI_EXPRESS select PCI_EXPRESS_ASPEED config MPS2
hw/pci-host/Kconfig +1 -0
@@ -49,6 +49,7 @@ config PCI_I440FX config PCI_EXPRESS_ASPEED bool select PCI_EXPRESS + select PCIE_PORT config PCI_EXPRESS_Q35 bool
Signature · 1 line
2.53.0
PATCH 2/3 hw/arm/aspeed: Add missing Kconfig dependencies on required components
In reply to Philippe Mathieu-DaudéAdd various missing Kconfig dependencies of the Aspeed SoCs:
- USB EHCI (commit bfdd34f1caa "hw/arm: ast2400/ast2500: Wire up EHCI controllers")
- OR-IRQ (commit d831c5fd868 "aspeed/intc: Add AST2700 support")
- SDHCI (commit 2bea128c3d0 "hw/sd/aspeed_sdhci: New device" and f25c0ae1079 "aspeed/soc: Add AST2600 support")
This fixes the following runtime issues:
qemu-system-aarch64: unknown type 'platform-ehci-usb'
qemu-system-aarch64: unknown type 'or-irq'
qemu-system-aarch64: unknown type 'generic-sdhci'
--- hw/arm/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
hw/arm/Kconfig +3 -0
@@ -551,6 +551,7 @@ config ASPEED_SOC select TMP105 select TMP421 select EMC141X + select OR_IRQ select UNIMP select LED select PMBUS
@@ -558,6 +559,8 @@ config ASPEED_SOC select FSI_APB2OPB_ASPEED select AT24C select PCI_EXPRESS_ASPEED + select USB_EHCI_SYSBUS + select SDHCI config MPS2 bool
Signature · 1 line
2.53.0
PATCH 3/3 hw/arm/aspeed: Add missing Kconfig dependencies on optional components
In reply to Philippe Mathieu-DaudéAdd missing Kconfig optional dependencies to avoid the following runtime error:
qemu-system-aarch64: -device loader,force-raw=on,addr=0x400000000,file=./u-boot.bin: 'loader' is not a valid device model name
qemu-system-aarch64: -device e1000e,netdev=net1,bus=pcie.2: 'e1000e' is not a valid device model name
--- hw/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
hw/arm/Kconfig +2 -0
@@ -533,7 +533,9 @@ config ASPEED_SOC bool default y depends on TCG && ARM + imply GENERIC_LOADER imply PCI_DEVICES + imply E1000E_PCI_EXPRESS select DS1338 select FTGMAC100 select I2C
Signature · 1 line
2.53.0
Quoted 5 lines · Philippe Mathieu-Daudé
Trivial fixes for binaries configured with:
$ echo CONFIG_ASPEED_SOC=y > configs/devices/aarch64-softmmu/aspeed.mak $ ./configure --with-devices-aarch64=aspeed --without-default-devices
Quoted 9 lines
Philippe Mathieu-Daudé (3):
hw/arm/aspeed: Add missingPCI_EXPRESS->PCIE_PORTKconfigdependency hw/arm/aspeed: Add missingKconfigdependencies on required components hw/arm/aspeed: Add missingKconfigdependencies on optional componentshw/arm/Kconfig | 6 +++++- hw/pci-host/Kconfig | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
Applied to
https://github.com/legoater/qemu aspeed-next
Thanks,
C.