From: Jan Kiszka <[email protected]> Add support for a qemu-arm target to the so far orangepi-zero only kernel config. This requires lifting the number of CPUs to 8, enabling vexpress in order to get pl011 UART and turning on a couple of virtio drivers.
Signed-off-by: Jan Kiszka <[email protected]> --- ...pi-zero_defconfig_5.4 => armhf_defconfig_5.4} | 16 ++++++++++++---- recipes-kernel/linux/linux-jailhouse_5.4.inc | 1 - 2 files changed, 12 insertions(+), 5 deletions(-) rename recipes-kernel/linux/files/{orangepi-zero_defconfig_5.4 => armhf_defconfig_5.4} (96%) diff --git a/recipes-kernel/linux/files/orangepi-zero_defconfig_5.4 b/recipes-kernel/linux/files/armhf_defconfig_5.4 similarity index 96% rename from recipes-kernel/linux/files/orangepi-zero_defconfig_5.4 rename to recipes-kernel/linux/files/armhf_defconfig_5.4 index 4895867..fafdebb 100644 --- a/recipes-kernel/linux/files/orangepi-zero_defconfig_5.4 +++ b/recipes-kernel/linux/files/armhf_defconfig_5.4 @@ -30,8 +30,8 @@ CONFIG_ARCH_SUNXI=y # CONFIG_MACH_SUN6I is not set # CONFIG_MACH_SUN7I is not set # CONFIG_MACH_SUN9I is not set +CONFIG_ARCH_VEXPRESS=y CONFIG_ARM_ERRATA_430973=y -CONFIG_ARM_ERRATA_720789=y CONFIG_ARM_ERRATA_754322=y CONFIG_ARM_ERRATA_754327=y CONFIG_ARM_ERRATA_764369=y @@ -45,6 +45,7 @@ CONFIG_ARM_ERRATA_852421=y CONFIG_ARM_ERRATA_852423=y CONFIG_SMP=y CONFIG_HAVE_ARM_ARCH_TIMER=y +CONFIG_NR_CPUS=8 CONFIG_ARM_PSCI=y # CONFIG_ARM_MODULE_PLTS is not set # CONFIG_ATAGS is not set @@ -70,13 +71,17 @@ CONFIG_CFG80211_DEBUGFS=y CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=y CONFIG_MAC80211_LEDS=y +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_PCI_HOST_GENERIC=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_OF_OVERLAY=y +CONFIG_VIRTIO_BLK=y CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set # CONFIG_NET_VENDOR_AGERE is not set @@ -150,6 +155,9 @@ CONFIG_SERIAL_8250_NR_UARTS=8 CONFIG_SERIAL_8250_RUNTIME_UARTS=8 CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y @@ -157,15 +165,12 @@ CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_SUN6I=y CONFIG_GPIO_SYSFS=y -CONFIG_POWER_RESET=y -CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y CONFIG_MFD_SUN4I_GPADC=m CONFIG_MFD_AXP20X_I2C=y CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y # CONFIG_HID_A4TECH is not set # CONFIG_HID_APPLE is not set @@ -201,6 +206,9 @@ CONFIG_UIO=y CONFIG_UIO_IVSHMEM=y CONFIG_VIRT_DRIVERS=y CONFIG_JAILHOUSE_DBGCON=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_MMIO=y # CONFIG_SUN8I_A23_CCU is not set # CONFIG_SUN8I_A33_CCU is not set # CONFIG_SUN8I_A83T_CCU is not set diff --git a/recipes-kernel/linux/linux-jailhouse_5.4.inc b/recipes-kernel/linux/linux-jailhouse_5.4.inc index 5b4bb19..c703839 100644 --- a/recipes-kernel/linux/linux-jailhouse_5.4.inc +++ b/recipes-kernel/linux/linux-jailhouse_5.4.inc @@ -12,7 +12,6 @@ require recipes-kernel/linux/linux-custom.inc KERNEL_DEFCONFIG = "${DISTRO_ARCH}_defconfig_5.4" -KERNEL_DEFCONFIG_orangepi-zero = "orangepi-zero_defconfig_5.4" KERNEL_DEFCONFIG_rpi4 = "rpi4_defconfig_5.4" SRC_URI += " \ -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/eb957011838a308c856a34d130ee707a1009cec6.1618866389.git.jan.kiszka%40siemens.com.
