From 96436821e110d2de497ea584a3adf18e79be0b40 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Tue, 9 Jul 2019 13:14:29 -0700 Subject: vc-p-a2197-00-versal.conf:Add versal Tenzing +SE1 board configuration Add support to build images for vc-p-a2197-00-versal Tenzing board + SE1 board configuration vck190-versal.conf: Rename vc-e-a2197-00-versal to vck190-versal Rename vc-e-a2197-00-versal machine configuration to vck190-versal with required setting of board specific yocto variables needed for compilation of bootloader, kernel and device-tree. - linux-xlnx is the kernel provider - u-boot-xlnx is the u-boot provider Signed-off-by: Swagath Gadde Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Manjukumar Matha --- .../conf/machine/vc-p-a2197-00-versal.conf | 87 ++++++++++++++++++++++ meta-xilinx-bsp/conf/machine/vck190-versal.conf | 86 +++++++++++++++++++++ .../recipes-bsp/u-boot/u-boot-xlnx_2019.2.bb | 2 + 3 files changed, 175 insertions(+) create mode 100644 meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf create mode 100644 meta-xilinx-bsp/conf/machine/vck190-versal.conf diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf new file mode 100644 index 00000000..5cdfade2 --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf @@ -0,0 +1,87 @@ +#@TYPE: Machine +#@NAME: vc-p-a2197-versal +##@DESCRIPTION: Machine support for vc-p-a2197 versal . + +SOC_VARIANT ?= "s80" + +require conf/machine/include/tune-versal.inc +require conf/machine/include/machine-xilinx-overrides.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-qemu.inc + +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" + +UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" + +SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" +PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native" + +# Default SD image build onfiguration, use qemu-sd to pad +IMAGE_CLASSES += "image-types-xilinx-qemu" +IMAGE_FSTYPES += "wic.qemu-sd" +WKS_FILES ?= "sdimage-bootpart.wks" + +EXTRA_IMAGEDEPENDS += " \ + arm-trusted-firmware \ + virtual/boot-bin \ + virtual/bootloader \ + virtual/psm-firmware \ + virtual/plm \ + u-boot-zynq-scr \ + qemu-devicetrees \ + virtual/cdo \ +" + +IMAGE_BOOT_FILES += " \ + boot.bin \ + system.dtb \ + Image \ + boot.scr \ +" +# This machine has a QEMU model, runqemu setup: +IMAGE_CLASSES += "qemuboot-xilinx" +QB_MACHINE = "-M arm-generic-fdt" +QB_MEM = "-m 4096" +QB_DEFAULT_KERNEL = "none" +QB_NETWORK_DEVICE = "" +QB_KERNEL_CMDLINE_APPEND ?= "" +QB_NET = "none" + +QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd" +QB_OPT_APPEND_append_qemuboot-xilinx = " -boot mode=5" +QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" + +# Use the multiarch script instead of launching QEMU directly +# Use booti 80000 6000000 4000000 to launch +QB_SYSTEM_NAME_append = "-multiarch" + +QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" + +QB_OPT_APPEND_append_qemuboot-xilinx = " \ + -device loader,file=${DEPLOY_DIR_IMAGE}/Image,addr=0x80000 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.cpio.gz.u-boot,addr=0x6000000 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x4000000 \ + -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \ + -display none \ + -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \ + " + +# PLM instance args +QB_PLM_OPT = " \ + -M microblaze-fdt \ + -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \ + -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \ + -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \ + -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \ + -device loader,addr=0xF1110624,data=0x0,data-len=4 \ + -device loader,addr=0xF1110620,data=0x1,data-len=4 \ + -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \ + -display none \ + " +QB_OPT_APPEND_append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'" + diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf new file mode 100644 index 00000000..919902ea --- /dev/null +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf @@ -0,0 +1,86 @@ +#@TYPE: Machine +#@NAME: vck-versal +##@DESCRIPTION: Machine support for vck-versal . + +SOC_VARIANT ?= "s80" + +require conf/machine/include/tune-versal.inc +require conf/machine/include/machine-xilinx-overrides.inc +require conf/machine/include/machine-xilinx-default.inc +require conf/machine/include/machine-xilinx-qemu.inc + +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" + +UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" + +SERIAL_CONSOLE = "115200 ttyAMA0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx" +PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native" + +# Default SD image build onfiguration, use qemu-sd to pad +IMAGE_CLASSES += "image-types-xilinx-qemu" +IMAGE_FSTYPES += "wic.qemu-sd" +WKS_FILES ?= "sdimage-bootpart.wks" + +EXTRA_IMAGEDEPENDS += " \ + arm-trusted-firmware \ + virtual/boot-bin \ + virtual/bootloader \ + virtual/psm-firmware \ + virtual/plm \ + u-boot-zynq-scr \ + qemu-devicetrees \ + virtual/cdo \ +" + +IMAGE_BOOT_FILES += " \ + boot.bin \ + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ + Image \ + boot.scr \ +" +# This machine has a QEMU model, runqemu setup: +IMAGE_CLASSES += "qemuboot-xilinx" +QB_MACHINE = "-M arm-generic-fdt" +QB_MEM = "-m 4096" +QB_DEFAULT_KERNEL = "none" +QB_NETWORK_DEVICE = "" +QB_KERNEL_CMDLINE_APPEND ?= "" +QB_NET = "none" + +QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd" +QB_OPT_APPEND_append_qemuboot-xilinx = " -boot mode=5" +QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw" + +# Use the multiarch script instead of launching QEMU directly +# Use booti 80000 6000000 4000000 to launch +QB_SYSTEM_NAME_append = "-multiarch" + +QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none" + +QB_OPT_APPEND_append_qemuboot-xilinx = " \ + -device loader,file=${DEPLOY_DIR_IMAGE}/Image,addr=0x80000 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.cpio.gz.u-boot,addr=0x6000000 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/system.dtb,addr=0x4000000 \ + -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \ + -display none \ + -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \ + " + +# PLM instance args +QB_PLM_OPT = " \ + -M microblaze-fdt \ + -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \ + -device loader,addr=0xf0000000,data=0xba020004,data-len=4 \ + -device loader,addr=0xf0000004,data=0xb800fffc,data-len=4 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \ + -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \ + -device loader,addr=0xF1110624,data=0x0,data-len=4 \ + -device loader,addr=0xF1110620,data=0x1,data-len=4 \ + -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \ + -display none \ + " +QB_OPT_APPEND_append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'" diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.2.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.2.bb index f37b4a21..823ef544 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.2.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.2.bb @@ -27,5 +27,7 @@ HAS_PLATFORM_INIT ?= " \ xilinx_zynqmp_zcu1275_revA_config \ xilinx_zynqmp_zcu1275_revB_config \ xilinx_zynqmp_zc1254_revA_config \ + xilinx_zynqmp_p_a2197_00_revA_config \ + xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \ " -- cgit v1.2.3-54-g00ecf