From patchwork Mon Mar 4 15:32:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3057 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D95C34275A for ; Mon, 4 Mar 2024 16:34:35 +0100 (CET) Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-51329001fe6sf3305881e87.1 for ; Mon, 04 Mar 2024 07:34:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709566474; cv=pass; d=google.com; s=arc-20160816; b=twodVK/3i3yJmrf5RHLcCv6l38rGB6A4YqkARrHkY73AhdnSGKI2RCTrA5PdKcI3D3 CZV9693lgpwclf0CxgFiDwDSQc7jU5fsCto3idNgBBd0Ohs89Kv9Ttm9I4eoHTw76W9X +15Vkdo86+ClXp4bMPdeABX7Qo0DtzlyDrMvWA+kkbqhIBSSOhFCw2RVriXuTdGtZCQV A9fz/FXg2Hs+SQ0Useji+d7Skw9KkGzlEMZqoVKrtdRHXjZTE/VSfE1mKFEFGdpVhEkQ xBqI39d00lNJ/ChewdvjWNs1oQo1mxEi2uY9AhywfFvVu+mEjYzmo45MC4NrGK8Wau3B T0Kw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3xtDcOW1BFiPBMlcUxxkC1bP1eFpsxMRj/VPewNdgGs=; fh=KA79YiQ/oYBQUi1cbd99m3IC5HnWQ2n5s96BIwqQZZU=; b=EBiPSrElyBUR8quTT0aDITvteY9pwz2rBUcf5RHmbbm0EKMbR5WHq77ml4ulGqDOY9 gNir52lCU5KGu6W0fxRK4fX8asOhbHlQR363uBR1PsV1qWRcGxDMQ5z5v9dON9cFCwJK F/xlclA3cEzW95ao+pr6UvmGrMLQzZ1OrV6AodhsRKruWAVoKmO7Ejzwt+4I6Je0GTp/ bDFpV6xzXXOKRKeiIwb3BzfujoV+nO3GAwy9v5r1qWwgSB47DynhybM81NLEcurX7xDd Z29HxyWpas4+31zhcqNuhnPTdVbZ9xJ9pw6QDjQGPXjBxsIgjJ9aKhMssYa2myuU5WNh DaSg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="otHbO6E/"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1709566474; x=1710171274; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3xtDcOW1BFiPBMlcUxxkC1bP1eFpsxMRj/VPewNdgGs=; b=HdlrA/CMJq2TRTxBpeUAlbhu0BFv+CX4Om3BB1zu1Gn5eoykVI4S+IqgeLBtTbRaiU lYzACXM/vidjsGqRcTJHCd0lGyNOnoFrTgAGYeCn4CabxQDHAr817+J5YU7sFSsJzy0K U5X7kh+kMK5PNDk5wAL6aUu43RV8h1w8h9Tbw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709566474; x=1710171274; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3xtDcOW1BFiPBMlcUxxkC1bP1eFpsxMRj/VPewNdgGs=; b=k8/uqTHNZPSAM6sjLEPCeFLBmcPtMZL0D5KI04X3WHF5/9XnWZOcNt04zgKg3v49uq ZfIktw82nCZv7z3anf6yxE1fzXigSHGqcTy5I7EvvJEHdBvbl2Q4kGZj0q7/AM5Dfa50 s75EdpfMSR+AJHHAvnMaw/Ue9ZdRU+xlAdqcLUr11c2JaJUlTEjwURTaf4gC9xPHy7a1 G14rYzS7d6+2x0M1MHgpAQvBC2YvPcrYhytUFY9YemTMRAQIS4t7YasLMLSVlX6QfFJN Uap8mOYvIMUPilkeINu1vVEa+9w2I0t4/Npy2VBMtfsL7yU4KBfgqJNvfoTaqLEhmWbZ pNYA== X-Forwarded-Encrypted: i=2; AJvYcCWg9SKpkxWvZRzppLysV6CQzX+KiYODswJpPFZb0D+1EZRJzQxXs8u60omvphHYs1JoZtJEOJhsQlSVb5MP/dzDSzts4BL82vr4k+cXFmLf601J2r78jG+kfW8TwA== X-Gm-Message-State: AOJu0YwK1HR0Eacpl3PJbU5n8SZ0SE6k7xPrCpV2C2U0ADeeAFUc6JsM aUPr7++RKkBjJC/y6TTFzdl2tiVYkYzEhl6M/T+ojBcMRQUJxSpqKxQPmCVur9MEgg== X-Google-Smtp-Source: AGHT+IExlC/XoRJ9vwFR0/9x+hsEiZVDmdVWeWVly3EzxQ73nSOr9N7BG9il6N4JvEiVt3rmceL1BQ== X-Received: by 2002:a05:6512:3114:b0:512:f307:71b0 with SMTP id n20-20020a056512311400b00512f30771b0mr6382802lfb.7.1709566474772; Mon, 04 Mar 2024 07:34:34 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:ac2:4e04:0:b0:513:3d90:b605 with SMTP id e4-20020ac24e04000000b005133d90b605ls377458lfr.2.-pod-prod-06-eu; Mon, 04 Mar 2024 07:34:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUAHL3Ku7461DYMN//uBxOjLqq4pcO2123s4yylH4qPKK/k9N1mDgTgz1zmgJ8DrIws/e16EhEnUod5Xa5q+NxSTSZGGJjEwKWrwI4KH6kcmZ/Q X-Received: by 2002:a19:f719:0:b0:512:fded:e674 with SMTP id z25-20020a19f719000000b00512fdede674mr5261257lfe.61.1709566473064; Mon, 04 Mar 2024 07:34:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709566473; cv=none; d=google.com; s=arc-20160816; b=nIGdwc1f4IBloj/3tA5QjhVOyfGwSkJNYf+SGGqIV+9le9ndd59jsEHmXU1qFOL8m4 qzENxFQncfBmIx4Rno8ocvdtTdj7ppUTBlKxjrjwcf4q0xnSP9O9YbDi+IK3m9l+Wyyy x+yTn+j7VFaBb1zfAvxZKBOiUW4rmXKF0nfQiumUaHX/L6BD3pNKSmr+Xh20d5Tj7dcG p6tZTI5oGX3nTF8hxNqf1x9DvArG3COjNwoGePtSEcs/W+aRVDK4FYGkt3oSRI45ahU3 MZrY0hkDtjmM+Ha+xR4c+s3r1GBCY57ji9JE8zaV/WqVPYs/75enwWvKkLk43vNGmVhI k8AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8NBuzEMB3K1oZGBWhz7xYBTAJH7ekJkyJDrjsik6awI=; fh=TFt9eH9naRKhHTJUc9CZDTTFYqjwbkHcmS3B3qfFI2A=; b=P7emcOoVmGEt6/u6S0iCPZy7PyOCJ3h6PjBLasVKySDxQULCUmtqV7YKVhALlGWLBB 2X0enD3LymKlf1wiprgw8LVRy5EkIr6AcxMPpyauaIJXRSccsMRJHQmkikAhbMpySr0C 7f+rlIYEbJxNaNhBfwjg0+7W7c18C9ec2QAy3z5SFKT8dSrKZIaP64YUBYoIZ1zkv2Tg o3dhnOK/VtEroNnGFd9VISNc9QPn7gJEqLb0Ik4MqhmZZOzqrTU8kxXQHipQYtXs6X8m 1ZMotH2ls2X6i9CqL9UOYMZc90GKLSL7DTTQ7tmT4WmXvZ37wSAxw8z8rGQH8hd1cRLb 1TIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="otHbO6E/"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id h3-20020ac24da3000000b005133f167b62sor922400lfe.11.2024.03.04.07.34.33 for (Google Transport Security); Mon, 04 Mar 2024 07:34:33 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWLHgwZQf86fT3oNNRBtbAymX78BzGy5qp/+naGXjfZsmDgOaxJdKRLXzwnq/16DEA7t9Kn3oohRGB7jisQes8xs3c4RijynquYX3vZ/uUxQzF4 X-Received: by 2002:a05:6512:3c95:b0:513:3e60:f463 with SMTP id h21-20020a0565123c9500b005133e60f463mr4846439lfv.62.1709566472688; Mon, 04 Mar 2024 07:34:32 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:72fe:558f:d55e:d423]) by smtp.gmail.com with ESMTPSA id sa20-20020a1709076d1400b00a4432543b21sm4936082ejc.198.2024.03.04.07.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:34:32 -0800 (PST) From: Dario Binacchi To: buildroot@buildroot.org Cc: Romain Naour , Alexander Sverdlin , Andreas Dannenberg , Yegor Yefremov , Xuanhao Shi , Anand Gadiyar , James Hilliard , Thomas Petazzoni , Dario Binacchi , michael@amarulasolutions.com, Asaf Kahlon , francois.perrad@gadz.org, linux-amarula@amarulasolutions.com, bryce@redpinelabs.com Subject: [PATCH v9 20/22] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 Date: Mon, 4 Mar 2024 16:32:51 +0100 Message-ID: <20240304153253.732708-21-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304153253.732708-1-dario.binacchi@amarulasolutions.com> References: <20240304153253.732708-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="otHbO6E/"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The 2024.01 version of U-Boot for the am64x-sk board has introduced two major changes: - The device tree k3-am642-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. Furthermore, ti-k3-r5-loader creates the following tiboot3.bin files: - GP -> tiboot3_am64x-gp-evm.bin - HS -> tiboot3_am64x_sr2-hs-evm.bin - HS_FS -> tiboot3_am64x_sr2-hs-fs-evm.bin The patch also allows you to identify the correct file based on the SEC_TYPE option. Signed-off-by: Dario Binacchi --- Changes in v9: - squashed with patch [v8,20/23] "package/ti-k3: fix BR2_PACKAGE_TI_K3_SOC setting for am64x SOC" - Update the commit message Added in v8 board/ti/am64x-sk/genimage.cfg | 7 ++++++- configs/ti_am64x_sk_defconfig | 13 +++++++------ package/ti-k3/Config.in | 3 ++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/board/ti/am64x-sk/genimage.cfg b/board/ti/am64x-sk/genimage.cfg index 26304fe98f99..88dff8fe23dc 100644 --- a/board/ti/am64x-sk/genimage.cfg +++ b/board/ti/am64x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am642-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 566cbbe4824f..9b92b645dd21 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,14 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/ti/common/am6xx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y @@ -24,19 +24,20 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" -BR2_TARGET_TI_K3_IMAGE_GEN=y +BR2_TARGET_TI_K3_BOOT_FIRMWARE=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in index b8545b7bca62..9c61f8880a15 100644 --- a/package/ti-k3/Config.in +++ b/package/ti-k3/Config.in @@ -43,7 +43,8 @@ config BR2_PACKAGE_TI_K3_SOC string default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X - default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X && BR2_PACKAGE_TI_K3_SECTYPE_GP + default "am64x_sr2" if BR2_PACKAGE_TI_K3_SOC_AM64X && !BR2_PACKAGE_TI_K3_SECTYPE_GP default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X config BR2_PACKAGE_TI_K3_SECTYPE