diff -Nru flash-kernel-3.104ubuntu16/bootscript/arm64/bootscr.zynqmp flash-kernel-3.104ubuntu17/bootscript/arm64/bootscr.zynqmp --- flash-kernel-3.104ubuntu16/bootscript/arm64/bootscr.zynqmp 2023-01-19 08:48:53.000000000 +0100 +++ flash-kernel-3.104ubuntu17/bootscript/arm64/bootscr.zynqmp 2023-09-26 12:04:13.000000000 +0200 @@ -46,8 +46,15 @@ # 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 + + if test -n "$k24_starter"; then + else + echo "k24_starter not found." + setenv k24_starter "SMK-K24-" + fi + # 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 + if test "${card1_name}" = "SCK-KV-G" || test "${card1_name}" = "SCK-KR-G" || test "${card1_name}" = "SCK-KD-G"; then setenv kria 1 echo "Selecting DT for Kria boards" if test "${card1_name}" = "SCK-KV-G"; then @@ -65,6 +72,8 @@ elif test "${card1_rev}" = "A"; then boot_conf=#conf-smk-k26-revA-sck-kr-g-revA fi + elif test "${card1_name}" = "SCK-KD-G"; then + boot_conf=#conf-zynqmp-smk-kd-g-revA else # fallback dtb boot_conf=#conf-zynqmp-smk-k26-revA @@ -74,7 +83,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 +95,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 setexpr model gsub .*$k24_starter.* $model; 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.104ubuntu16/db/all.db flash-kernel-3.104ubuntu17/db/all.db --- flash-kernel-3.104ubuntu16/db/all.db 2023-01-19 08:48:53.000000000 +0100 +++ flash-kernel-3.104ubuntu17/db/all.db 2023-09-26 12:06:08.000000000 +0200 @@ -2316,6 +2316,16 @@ U-Boot-Script-Name: bootscr.sunxi Required-Packages: u-boot-tools +Machine: ZynqMP *K24* +Machine: ZynqMP *KD240* +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-kria.its +Required-Packages: u-boot-tools + Machine: ZynqMP *K26* Kernel-Flavors: xilinx-zynqmp Method: generic diff -Nru flash-kernel-3.104ubuntu16/debian/changelog flash-kernel-3.104ubuntu17/debian/changelog --- flash-kernel-3.104ubuntu16/debian/changelog 2023-01-19 08:48:53.000000000 +0100 +++ flash-kernel-3.104ubuntu17/debian/changelog 2023-09-26 12:18:48.000000000 +0200 @@ -1,3 +1,9 @@ +flash-kernel (3.104ubuntu17) jammy; urgency=medium + + * Add support for Xilinx Kria KD240 (LP: #2037407) + + -- Talha Can Havadar Tue, 26 Sep 2023 12:18:48 +0200 + flash-kernel (3.104ubuntu16) jammy; urgency=medium * Add support for Xilinx Versal VCK190 (LP: #2006558) @@ -97,7 +103,7 @@ * Add riscv64 support (LP: #1966219) * Add the following boards to db/all.db - - SiFive HiFive Unmatched A00 + - SiFive HiFive Unmatched A00 - BeagleV Starlight Beta -- Heinrich Schuchardt Tue, 08 Mar 2022 10:05:15 +0100 diff -Nru flash-kernel-3.104ubuntu16/its/arm64/image-kria.its flash-kernel-3.104ubuntu17/its/arm64/image-kria.its --- flash-kernel-3.104ubuntu16/its/arm64/image-kria.its 2023-01-19 08:48:53.000000000 +0100 +++ flash-kernel-3.104ubuntu17/its/arm64/image-kria.its 2023-09-26 12:17:13.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";