From 9724eab2328f5de9621942c8cff30b45a76643c8 Mon Sep 17 00:00:00 2001 From: Bryan Brattlof Date: Thu, 8 Aug 2024 15:35:13 -0500 Subject: [PATCH] configs/ti_am62x_sk: bump tfa, uboot and linux version Bump to the latest versions of tfa, uboot and the linux kernel to pull in the latest fixes and features for the am62x-sk reference board Signed-off-by: Bryan Brattlof Signed-off-by: Thomas Petazzoni --- .../arm-trusted-firmware.hash | 2 +- ...-clk-Adding-support-for-non-contiguo.patch | 75 ------------------- board/ti/am62x-sk/patches/linux/linux.hash | 2 +- .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 +- configs/ti_am62x_sk_defconfig | 6 +- 5 files changed, 6 insertions(+), 82 deletions(-) delete mode 100644 board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch mode change 100644 => 120000 board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash index d68ac4bd30..8b77e1f165 100644 --- a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 d7194687d13335f832a48c1b87ad4f15ffb983365ca2aba4afda57843fb01cb6 arm-trusted-firmware-lts-v2.10.4-git4.tar.gz +sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz diff --git a/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch b/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch deleted file mode 100644 index 788b6439d8..0000000000 --- a/board/ti/am62x-sk/patches/linux/0001-clk-keystone-sci-clk-Adding-support-for-non-contiguo.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 750cdf4cb6791c45d479ed73a97728100394fb32 Mon Sep 17 00:00:00 2001 -From: Udit Kumar -Date: Tue, 13 Feb 2024 13:56:40 +0530 -Subject: [PATCH] clk: keystone: sci-clk: Adding support for non contiguous - clocks -X-Developer-Signature: v=1; a=openpgp-sha256; l=1876; i=bb@ti.com; - h=from:subject; bh=CKSvD6FpqwRzx8blynhoCEc3XUR5TlwjFJdcgjQwpgg=; - b=owNCWmg5MUFZJlNZHYzOLwAAZP/////7puP/r7v/9q9s+8t7wa8/97UZO//d+XvPsvfv2/+wA - RsYHaQAAAAAAAAGg09IPUGmgAaAANBoAAAGmnqAPU9Q0DQ0HqMQDQ8ptTeqeogaABoPU0NAPUAA - 0GgDJ6gANAAMg0GmgNGgDEGh6jR6h6hp6mgepoPU2oDTIGho0IaHqA00yDQNBoGTRoDTRkAZNAD - AmTIBkGjIGmQyAZDRkAaANAYIxBk0DQAAHODcFn1CAGBsJeG8ZtU3FQCBdLH7LjDIouHeAszY1j - AFkqjaWIFXEVi8NV3giRplb1JjCYunXimTaK06SgQRYsUGRSbKOVQP2t1LlAYS93QjOMWF6CHXK - 69KzHyBDpXR2mHAAkHcHX0X3SAYJkxPElwJ1ZnHK1RfDKRfJcRQKzxnryM+4x2mCxpIFIIjpVLk - nItd1Vl1SEF2QiWZIYV4b0lawcUqLGgTQZ0+qpJ5QORYrvPXE4DR89JlJYBU4DjxAoyACH6KN0o - AiaknqZTfMwmF8iREpU4SgDEVun3X3OFlkBp3hBO+Ynb12GJoLSFBSz9IWE2ooLKFalh5XJMZfl - +GthEEOnlrMQHOF8qCr+JAKqXEqSrwLGuEIMFbnGEjJYruo4ENGOmGVlkvW+kLRp5ibCXAAcDMM - TPOUZ/i7kinChIDsZnF4A== -X-Developer-Key: i=bb@ti.com; a=openpgp; - fpr=D3D177E40A38DF4D1853FEEF41B90D5D71D56CE0 - -Most of clocks and their parents are defined in contiguous range, -But in few cases, there is gap in clock numbers[0]. -Driver assumes clocks to be in contiguous range, and add their clock -ids incrementally. - -New firmware started returning error while calling get_freq and is_on -API for non-available clock ids. - -In this fix, driver checks and adds only valid clock ids. - -[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html -Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present. - -Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks") -Signed-off-by: Udit Kumar -Reviewed-by: Nishanth Menon -Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ad3ac13c6ec318b43e769cc9ffde67528e58e555 -Signed-off-by: Bryan Brattlof ---- - drivers/clk/keystone/sci-clk.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c -index 35fe197dd303c..eb2ef44869b23 100644 ---- a/drivers/clk/keystone/sci-clk.c -+++ b/drivers/clk/keystone/sci-clk.c -@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - struct sci_clk *sci_clk, *prev; - int num_clks = 0; - int num_parents; -+ bool state; - int clk_id; - const char * const clk_names[] = { - "clocks", "assigned-clocks", "assigned-clock-parents", NULL -@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider) - clk_id = args.args[1] + 1; - - while (num_parents--) { -+ /* Check if this clock id is valid */ -+ ret = provider->ops->is_auto(provider->sci, -+ sci_clk->dev_id, clk_id, &state); -+ -+ if (ret) { -+ clk_id++; -+ continue; -+ } -+ - sci_clk = devm_kzalloc(dev, - sizeof(*sci_clk), - GFP_KERNEL); - -base-commit: 9fbb5fcb41e7e96fb8769a9f5a12a35a984c23bd --- -2.43.2 - diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash index 5e9df51ecd..53eb143894 100644 --- a/board/ti/am62x-sk/patches/linux/linux.hash +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 19b31956d229b5b9ca5671fa1c74320179682a3d8d00fc86794114b21da86039 linux-6.8.12.tar.xz +sha256 774698422ee54c5f1e704456f37c65c06b51b4e9a8b0866f34580d86fef8e226 linux-6.10.tar.xz diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash deleted file mode 100644 index fe9b4f53dc..0000000000 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f u-boot-2024.07.tar.bz2 diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 120000 index 0000000000..b89e91d3e8 --- /dev/null +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1 @@ +../uboot/uboot.hash \ No newline at end of file diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f56669c24f..e11b803b73 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y