Only in /tmp/s8Fbvd_27I/flash-kernel-3.107ubuntu3: .lgd-nfy0 diff -Nru flash-kernel-3.107ubuntu3/bootscript/arm64/bootscr.zynqmp flash-kernel-3.107ubuntu4~ppa02/bootscript/arm64/bootscr.zynqmp --- flash-kernel-3.107ubuntu3/bootscript/arm64/bootscr.zynqmp 2023-06-21 16:32:29.000000000 +0200 +++ flash-kernel-3.107ubuntu4~ppa02/bootscript/arm64/bootscr.zynqmp 2023-09-26 12:18:48.000000000 +0200 @@ -19,15 +19,36 @@ # Revision B/1 KR Carrier Card | smk-k26-revA-sck-kr-g-revB | # 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 | +# Revision A KD Carrier Card | smk-k24-revA-sck-kd-g-revA | # # Here is the Versal board support list: # # vck190 # +# +# Variables expected to be in the environment: +# +# Variable | Description | +# :------------- | :------------------------------------------------------------------------------------ | +# card1_name | Holds the information about the carrier card configuration (utilized for Kria family) | +# boot_targets | Includes the list of devices that can be used to look for image boot | +# +# +# Local Variables: +# +# Variable | Description | +# :-------------- | :------------------------------------------------------------------------------------ | +# kria | Holds the information about the type of the board in Kria family. | \ +# | Possible values when it is initialized: "KD", "KR", "KV" | ################ @@UBOOT_ENV_EXTRA@@ +# Legacy KV260 U-Boot was not eliminating a space at the end of the card1_name variable +# e.g. card1_name is "SCK-KV-G ", not "SCK-KV-G" +# Force drop of the extra space character by setenv for backward compatibility +setenv card1_name $card1_name + for boot_target in ${boot_targets}; do if test "${boot_target}" = "jtag" ; then @@ -42,29 +63,35 @@ fpga load 0 0x10000000 $filesize fi - # Legacy KV260 U-Boot was not eliminating a space at the end of the card1_name variable - # e.g. card1_name is "SCK-KV-G ", not "SCK-KV-G" - # Force drop of the extra space character by setenv for backward compatibility - setenv card1_name $card1_name # Check for KR/KV260 board and choose the proper device tree - if test "${card1_name}" = "SCK-KV-G" || test "${card1_name}" = "SCK-KR-G"; then - setenv kria 1 + if test "${card1_name}" = "SCK-KV-G" || test "${card1_name}" = "SCK-KR-G" || test "${card1_name}" = "SCK-KD-G"; then echo "Selecting DT for Kria boards" if test "${card1_name}" = "SCK-KV-G"; then + setenv kria "KV" if test "${card1_rev}" = "Z" || test "${card1_rev}" = "A"; then # revA dtb also supports revZ boards boot_conf=#conf-smk-k26-revA-sck-kv-g-revA - elif test "${card1_rev}" = "B" || test "${card1_rev}" = "1"; then - # revB dtb also supports rev1 boards + elif test "${card1_rev}" = "B" || test "${card1_rev}" = "1" || test "${card1_rev}" = "2"; then + # revB dtb also supports rev1 and rev2 boards + boot_conf=#conf-smk-k26-revA-sck-kv-g-revB + else + # fallback to the latest dtb boot_conf=#conf-smk-k26-revA-sck-kv-g-revB fi elif test "${card1_name}" = "SCK-KR-G"; then + setenv kria "KR" if test "${card1_rev}" = "B" || test "${card1_rev}" = "1"; then # revB dtb also supports rev1 dtb boot_conf=#conf-smk-k26-revA-sck-kr-g-revB elif test "${card1_rev}" = "A"; then boot_conf=#conf-smk-k26-revA-sck-kr-g-revA + else + # fallback to the latest dtb + boot_conf=#conf-smk-k26-revA-sck-kr-g-revB fi + elif test "${card1_name}" = "SCK-KD-G"; then + boot_conf=#conf-zynqmp-smk-kd-g-revA + setenv kria "KD" else # fallback dtb boot_conf=#conf-zynqmp-smk-k26-revA @@ -74,7 +101,7 @@ fi setenv bootargs "root=LABEL=writable rootwait" - if test "${card1_name}" = "SCK-KR-G" || test "${card1_name}" = "SCK-KV-G"; then + if test "${card1_name}" = "SCK-KR-G" || test "${card1_name}" = "SCK-KV-G" || test "${card1_name}" = "SCK-KD-G"; then 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" @@ -86,8 +113,11 @@ fdt addr $fdtcontroladdr # For ZCU: ZynqMP ZCU1* Rev* # For Kria: ZynqMP K26 Rev* + # For Kria: ZynqMP K24 Rev* fdt get value model_test / model - if test -n $kria; then + if test $kria = "KD"; then + cma="512M" + elif test -n $kria; then cma="1000M" elif setexpr model_test gsub '.*104.*' 104; then cma="700M" diff -Nru flash-kernel-3.107ubuntu3/db/all.db flash-kernel-3.107ubuntu4~ppa02/db/all.db --- flash-kernel-3.107ubuntu3/db/all.db 2023-11-10 08:39:34.000000000 +0100 +++ flash-kernel-3.107ubuntu4~ppa02/db/all.db 2023-09-26 12:18:48.000000000 +0200 @@ -2480,7 +2480,10 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools +Machine: ZynqMP SMK-K26 Rev1/B/A Machine: ZynqMP *K26* +Machine: ZynqMP *K24* +Machine: ZynqMP *KD240* Kernel-Flavors: xilinx-zynqmp Method: generic Boot-Script-Path: /boot/firmware/boot.scr.uimg diff -Nru flash-kernel-3.107ubuntu3/debian/changelog flash-kernel-3.107ubuntu4~ppa02/debian/changelog --- flash-kernel-3.107ubuntu3/debian/changelog 2023-11-10 08:39:34.000000000 +0100 +++ flash-kernel-3.107ubuntu4~ppa02/debian/changelog 2023-09-26 12:18:48.000000000 +0200 @@ -1,3 +1,10 @@ +flash-kernel (3.107ubuntu4) noble; urgency=medium + + * Add support for Xilinx Kria KD240 (LP: #2037407) + - Fix minor issues in bootscr.zynqmp + + -- Talha Can Havadar Tue, 26 Sep 2023 12:18:48 +0200 + flash-kernel (3.107ubuntu3) noble; urgency=medium * Use LC_ALL= instead of LANG= for consistency (LP: #2007827) diff -Nru flash-kernel-3.107ubuntu3/its/arm64/image-kria.its flash-kernel-3.107ubuntu4~ppa02/its/arm64/image-kria.its --- flash-kernel-3.107ubuntu3/its/arm64/image-kria.its 2023-06-21 16:32:29.000000000 +0200 +++ flash-kernel-3.107ubuntu4~ppa02/its/arm64/image-kria.its 2023-09-26 12:18:48.000000000 +0200 @@ -88,6 +88,17 @@ algo = "sha1"; }; }; + fdt-smk-k24-revA-sck-kd-g-revA.dtb { + description = "Flattened device tree blob - smk-k24-revA-sck-kd-g-revA"; + data = /incbin/("/lib/firmware/@@KERNEL_VERSION@@/device-tree/xilinx/smk-k24-revA-sck-kd-g-revA.dtb"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + load = <0x44000000>; + hash-1 { + algo = "sha1"; + }; + }; }; configurations { @@ -100,6 +111,15 @@ hash-1 { algo = "sha1"; }; + }; + conf-zynqmp-smk-kd-g-revA { + description = "Boot Ubuntu on Kria KD SOM"; + kernel = "kernel-1"; + ramdisk = "ramdisk-1"; + fdt = "fdt-smk-k24-revA-sck-kd-g-revA.dtb"; + hash-1 { + algo = "sha1"; + }; }; conf-smk-k26-revA-sck-kr-g-revA { description = "Boot Ubuntu on kria SOM";