From: Jan Kiszka <[email protected]> Enable drivers needed for the Zynq UltraScale+ MPSoC on the Ultra96 board and map the new machine to the defconfig.
Signed-off-by: Jan Kiszka <[email protected]> --- recipes-kernel/linux/files/arm64_defconfig_4.19 | 20 ++++++++++++-------- recipes-kernel/linux/linux-jailhouse_4.19.inc | 3 ++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/recipes-kernel/linux/files/arm64_defconfig_4.19 b/recipes-kernel/linux/files/arm64_defconfig_4.19 index 614bfd1..e4828fe 100644 --- a/recipes-kernel/linux/files/arm64_defconfig_4.19 +++ b/recipes-kernel/linux/files/arm64_defconfig_4.19 @@ -1167,6 +1167,8 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # # Bus devices # +CONFIG_ARM_CCI=y +CONFIG_ARM_CCI400_COMMON=y CONFIG_BRCMSTB_GISB_ARB=y # CONFIG_HISILICON_LPC is not set CONFIG_QCOM_EBI2=y @@ -2460,7 +2462,7 @@ CONFIG_I2C_TEGRA_BPMP=y CONFIG_I2C_UNIPHIER_F=y # CONFIG_I2C_VERSATILE is not set # CONFIG_I2C_THUNDERX is not set -# CONFIG_I2C_XILINX is not set +CONFIG_I2C_XILINX=m # CONFIG_I2C_XLP9XX is not set CONFIG_I2C_RCAR=y @@ -2499,7 +2501,7 @@ CONFIG_SPI_ARMADA_3700=y # CONFIG_SPI_BCM2835 is not set # CONFIG_SPI_BCM2835AUX is not set CONFIG_SPI_BCM_QSPI=y -# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_BITBANG=m # CONFIG_SPI_CADENCE is not set # CONFIG_SPI_DESIGNWARE is not set # CONFIG_SPI_GPIO is not set @@ -2527,9 +2529,9 @@ CONFIG_SPI_S3C64XX=y # CONFIG_SPI_THUNDERX is not set # CONFIG_SPI_UNIPHIER is not set # CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set +CONFIG_SPI_XILINX=m # CONFIG_SPI_XLP is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set +CONFIG_SPI_ZYNQMP_GQSPI=m # # SPI Protocol Masters @@ -2689,7 +2691,7 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_XGENE_SB=y # CONFIG_GPIO_XILINX is not set # CONFIG_GPIO_XLP is not set -# CONFIG_GPIO_ZYNQ is not set +CONFIG_GPIO_ZYNQ=m # CONFIG_GPIO_ZX is not set # @@ -3865,7 +3867,7 @@ CONFIG_RTC_DRV_EFI=y # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_ZYNQMP is not set +CONFIG_RTC_DRV_ZYNQMP=m # CONFIG_RTC_DRV_CROS_EC is not set # @@ -3918,7 +3920,7 @@ CONFIG_TEGRA20_APB_DMA=y # CONFIG_TEGRA210_ADMA is not set # CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set -# CONFIG_XILINX_ZYNQMP_DMA is not set +CONFIG_XILINX_ZYNQMP_DMA=m # CONFIG_ZX_DMA is not set # CONFIG_MTK_HSDMA is not set CONFIG_QCOM_BAM_DMA=y @@ -4731,7 +4733,9 @@ CONFIG_PHY_TEGRA_XUSB=y # # Performance monitor support # -# CONFIG_ARM_CCI_PMU is not set +CONFIG_ARM_CCI_PMU=m +CONFIG_ARM_CCI400_PMU=y +CONFIG_ARM_CCI5xx_PMU=y # CONFIG_ARM_CCN is not set CONFIG_ARM_PMU=y CONFIG_ARM_PMU_ACPI=y diff --git a/recipes-kernel/linux/linux-jailhouse_4.19.inc b/recipes-kernel/linux/linux-jailhouse_4.19.inc index 6d8d0eb..7b59b82 100644 --- a/recipes-kernel/linux/linux-jailhouse_4.19.inc +++ b/recipes-kernel/linux/linux-jailhouse_4.19.inc @@ -15,7 +15,8 @@ python() { machine = d.getVar('MACHINE', True) if machine in ['qemu-amd64', 'nuc6cay']: machine = 'x86-64' - if machine in ['qemu-arm64', 'espressobin', 'macchiatobin', 'hikey620']: + if machine in ['qemu-arm64', 'espressobin', 'macchiatobin', 'hikey620', + 'ultra96']: machine = 'arm64' d.setVar('KERNEL_DEFCONFIG', machine + '_defconfig_4.19') } -- 2.16.4 -- 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]. For more options, visit https://groups.google.com/d/optout.
