diff -Nru flash-kernel-3.106ubuntu8/bootscript/arm64/bootscr.zynqmp flash-kernel-3.106ubuntu8.1/bootscript/arm64/bootscr.zynqmp --- flash-kernel-3.106ubuntu8/bootscript/arm64/bootscr.zynqmp 2022-09-01 14:37:25.000000000 +0000 +++ flash-kernel-3.106ubuntu8.1/bootscript/arm64/bootscr.zynqmp 2023-02-15 03:37:23.000000000 +0000 @@ -20,6 +20,10 @@ # Revision A/Z KV Carrier Card | smk-k26-revA-sck-kv-g-revA | # Revision B/1 KV Carrier Card | smk-k26-revA-sck-kv-g-revB | # +# Here is the Versal board support list: +# +# vck190 +# ################ @@UBOOT_ENV_EXTRA@@ @@ -69,11 +73,13 @@ echo "Kria DT: ${boot_conf}" fi - setenv bootargs "earlycon root=LABEL=writable rootwait" + setenv bootargs "root=LABEL=writable rootwait" if test "${card1_name}" = "SCK-KR-G" || test "${card1_name}" = "SCK-KV-G"; then - setenv bootargs "${bootargs} console=ttyPS1,115200 console=tty1 clk_ignore_unused uio_pdrv_genirq.of_id=generic-uio xilinx_tsn_ep.st_pcp=4" + setenv bootargs "${bootargs} earlycon console=ttyPS1,115200 console=tty1 clk_ignore_unused uio_pdrv_genirq.of_id=generic-uio xilinx_tsn_ep.st_pcp=4" + elif test "${board_name}" = "versal"; then + setenv bootargs "${bootargs} earlycon=pl011,mmio32,0xFF000000,115200n8 console=ttyAMA0 clk_ignore_unused" else - setenv bootargs "${bootargs} console=ttyPS0,115200 console=tty1 uio_pdrv_genirq.of_id=generic-uio" + setenv bootargs "${bootargs} earlycon console=ttyPS0,115200 console=tty1 uio_pdrv_genirq.of_id=generic-uio" fi echo "Configuring the cma value based on the board type" @@ -87,12 +93,18 @@ cma="700M" elif setexpr model_test gsub '.*106.*' 106; then cma="1200M" - else - # zcu102, zcu111 + elif setexpr model_test gsub '.*102.*' 102 || setexpr model_test gsub '.*111.*' 111; then cma="1000M" + # Versal's dtb files has included the default CMA value. + # The bootargs will take precedence. So, please remove the commented-out code when you want to set it + elif setexpr model_test gsub '.*vck190.*' vck190; then + #cma="600M" + echo "The CMA value is not being set by U-boot for this board - the value will be set by Linux" + fi + if test -n $cma; then + echo "cma=${cma}" + setenv bootargs "${bootargs} cma=${cma}" fi - echo "cma=${cma}" - setenv bootargs "${bootargs} cma=${cma}" # Get custom values from /etc/default/flash-kernel setenv bootargs "@@LINUX_KERNEL_CMDLINE_DEFAULTS@@ ${bootargs} @@LINUX_KERNEL_CMDLINE@@" diff -Nru flash-kernel-3.106ubuntu8/db/all.db flash-kernel-3.106ubuntu8.1/db/all.db --- flash-kernel-3.106ubuntu8/db/all.db 2022-09-22 09:53:07.000000000 +0000 +++ flash-kernel-3.106ubuntu8.1/db/all.db 2023-02-15 03:37:23.000000000 +0000 @@ -2300,6 +2300,15 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools +Machine: Xilinx Versal vck190* +Kernel-Flavors: xilinx-zynqmp +Method: generic +Boot-Script-Path: /boot/firmware/boot.scr.uimg +U-Boot-Script-Name: bootscr.zynqmp +Boot-FIT-Path: /boot/firmware/image.fit +Boot-ITS-File-Name: image-zcu.its +Required-Packages: u-boot-tools + Machine: Xunlong Orange Pi 2 Kernel-Flavors: armmp armmp-lpae Boot-Script-Path: /boot/boot.scr diff -Nru flash-kernel-3.106ubuntu8/debian/changelog flash-kernel-3.106ubuntu8.1/debian/changelog --- flash-kernel-3.106ubuntu8/debian/changelog 2022-10-17 12:46:14.000000000 +0000 +++ flash-kernel-3.106ubuntu8.1/debian/changelog 2023-02-15 03:37:23.000000000 +0000 @@ -1,3 +1,10 @@ +flash-kernel (3.106ubuntu8.1) kinetic; urgency=medium + + * Backport a patch from lunar to kinetic (LP: #2006558) + - Add support for Xilinx Versal VCK190 + + -- Ethan Hsieh Wed, 15 Feb 2023 11:37:23 +0800 + flash-kernel (3.106ubuntu8) kinetic; urgency=medium * Fix remaining reference to FK_FORCE_CONTAINER (LP: #1955353) diff -Nru flash-kernel-3.106ubuntu8/its/arm64/image-zcu.its flash-kernel-3.106ubuntu8.1/its/arm64/image-zcu.its --- flash-kernel-3.106ubuntu8/its/arm64/image-zcu.its 2022-09-01 14:36:11.000000000 +0000 +++ flash-kernel-3.106ubuntu8.1/its/arm64/image-zcu.its 2023-02-15 03:37:23.000000000 +0000 @@ -37,9 +37,9 @@ }; configurations { - default = "zcu"; - zcu { - description = "Boot Ubuntu on zcu board"; + default = "conf-zcu-vck"; + conf-zcu-vck { + description = "Boot Ubuntu on zcu/vck boards"; kernel = "kernel-1"; ramdisk = "ramdisk-1"; hash-1 {