From patchwork Sat Mar 30 16:02:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3072 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7805340CB3 for ; Sat, 30 Mar 2024 17:03:05 +0100 (CET) Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-516a368df47sf99551e87.2 for ; Sat, 30 Mar 2024 09:03:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711814585; cv=pass; d=google.com; s=arc-20160816; b=jYTUPBG5PqDYcV73PgSZwzmk+sqWQhQAUFyQ2XGYYm6PJzQZtaXjxKQvvLH4EXQa4f 8CJ1bTt/eQwbCm/zfslBcaIk0QkiYjwOKaUDXEN/TLryJ6sxR0MELrY/Kci2x/yfzKaq 8kYrioZlWkNCEGoWuAmmUQ4JgBZXe2FwnStmdYxYpAVFd1lgESBNAEpEH7P7NkZ+pvYh Dfu/igWCDXAFw+VSTs0qcl54dljyj53fmzsSTj1Qn4KRH/nawzbCkMNTme/FIZEgk7Ez k3vwrNaafn3YQsgyx5EFBuccWAG8ymQ4H0ykn0k239od8+46y1jbeVw6TscYsmGLMOP6 bhdQ== 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=8RyjaKerJRYph5fYiw/j3/cdlh6d1unxpjAEa1SPGfI=; fh=lf+lm5BHy7MyuqxobKx5T0W5SY62M28nu0aR2w4t6is=; b=fAE8qfp7NSJaPP+z60DxolYmckale6SuXhR3ELBOKwnq1GkDNEwSII4+ZBj5VQ5wqE 64fp8M2FjZZghf+suZpe1yhIzVF5fYMotfkT3LXAkJOwppmV7CYEMvZrDze2+ezYRxGr w65wx1DloN43g/Q+1fCpm5jEGA7VXQ0+zWF/4VCcyvwK7cgOlBCHk0kf7TMkJegA6YNZ MWGqTiS/Iz5x+y+wRdQNfor/AbHRRlm5pj4anXaOxNybeor3RYwuV0Kz199uBdjSohbJ bRFi2QsklihWFeIC3OI87JdWq4jn1Vzj5VF3X7wjgUyfN7Rr5BCbSDap7J941G0eOWNI 9TNg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=X+ZA+35U; 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=1711814585; x=1712419385; 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=8RyjaKerJRYph5fYiw/j3/cdlh6d1unxpjAEa1SPGfI=; b=JaDj3PHpgaZcxxap5vMQRjYPzlFX8AWyi+G0a2YRmjAD3dnwobBOm/QUeBHeb+GO2K /HZJQ7GtE/w9ugbTO032KAyt18tsjajQP7erlv5fj6zd4oa8yE+TKPSkjmtHphu/0AiY uXMDnIjH7858RIVo0S0Mc8wWzpkhYSXQRlulY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711814585; x=1712419385; 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=8RyjaKerJRYph5fYiw/j3/cdlh6d1unxpjAEa1SPGfI=; b=sqhQlOzLKitfXnkGo5T62HWh4z9bua5zjphzu1u7LgM5JQrZgiHeRmY8mWJ6aSkbsA Nggr2qh13NQo+v3REEFHLMV5qSOOrZ2APioSnDio0w6WnaE058koKDXJQYmV3m0WtNJ+ +mZUs28UHXt9c8RzWS1N/l3msGE0OQOR0kzJFLrksa+E1oNPqm1IxnaXOpnO37iH53W7 AKhaLdwoLOnI+lv2bb3ZoqTh9ZwCz56QdNZKOgk4oI55zkcB7dSrGmQv1d2X3cNSXoEu 8OHd/bi/DAOagk4xmoeC7Uxsw2k0VL7w/tJbYSsmUt8olYNzAslyAgYoGhh5oDrudYSl JbFg== X-Forwarded-Encrypted: i=2; AJvYcCXxT+m06QGnVln5jj7cIxlFcCV4ibBW0Zfca5ZWr6LDKSA8tTCybkXSTruw0h57DHkwqeTQB+ItN+/yJAQnJwNzlH/UKH1cnojBBFhF8cyOtlmfhB7k5Nf9RtAnhQ== X-Gm-Message-State: AOJu0YxTuNp0GClHqfPGjROCZMr0kHO+gFSWls5rNYJXNHFSvk0fzM5X ootgQS8pjmueCt52+VeWBWRRyzp4dy4t0ZMpKJvgom8aauLT7wM9ibsk5uwpjGI84g== X-Google-Smtp-Source: AGHT+IGN9Q0gDK9o44w/GVNgUuiNVYUGvfIntrqrhBPUVCcQzCSBDLxNU/a6Cq12MlVvnK1ydZVPrg== X-Received: by 2002:a19:6919:0:b0:513:c54d:d4a with SMTP id e25-20020a196919000000b00513c54d0d4amr4025963lfc.5.1711814584886; Sat, 30 Mar 2024 09:03:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:3d17:b0:515:bb46:8dd0 with SMTP id d23-20020a0565123d1700b00515bb468dd0ls657754lfv.0.-pod-prod-07-eu; Sat, 30 Mar 2024 09:03:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1aM/wPRjzqiui2uDB3WWtUBckmx/emlyUulooK4r4TCIobN9H28Tqds5imDaCllcBkAxTRoMVqe2Z6G9kHTEHEAAcT5rOQw+8KVCPMvzvyJsj X-Received: by 2002:a05:6512:20a:b0:513:30fb:d64 with SMTP id a10-20020a056512020a00b0051330fb0d64mr3914675lfo.44.1711814583080; Sat, 30 Mar 2024 09:03:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711814583; cv=none; d=google.com; s=arc-20160816; b=jbVkt8eahuLbaFBsRxHFb2InIqtpq9VH7iPbmW9kObHR5o227fzB1yf9iEiXrA9DlK HXHWEMKMAcZpNkCk8XMagSD7fTAy2NAeZbFacUJfLpJw1f7GSWAqWCErSx4FtgY5ci9h ZRCy+qPk77db8CaC+2kZodXaF59XkenBb52Awbfegb3uTwd2yWZMhbFusll8+gtfxKoy JHhZT5074/qhr9F6NdidX7KsiC9SHkGBCWGw+67oRZ6QY/RE1xzTSdGwsr15YbUgDwUM mfzdp6/W8JLbLKDU5O4keHApU8Mznew3ewPH5+CPwCoXpvVXee++86iGoe3StNJZ3wUd s+0A== 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=YxvvVcy6ShVKE63MsRrZeO1dFpKzH0nbG8hP8xbIMJU=; fh=Cg4xBJMU/Tb/owhcj3ItPUdbwYqeA6wE4nuloYARAx8=; b=BwVsBbnqfj6CD8nI313vgJ+ErSCYo/CwGRFUmk6Jje4QzfKV8sxiXkh4Od2S54vUWU /r5XgZcf1My5lGbi7Djiv+rg261EWXUuyZy6+PQcS2xWKJbLfsqNtpa6kJmvbC/pPt6S SndoaWKjhqt8Oct28iblfqCtKrmSFtxC6H7+n8uzFxvku0jylWqHZ8EMSSJFxcvO4BqY LOjcZpl7mRwoNNsof5B52b/b/f9Z9YmXYQbEe9lDPwXvy4QaIhbmiXR99Wk3dnMm1LMY D9T1j+0MZ8TeCsSaxgALMc/lV7GMv/e0mgA0asqpa5tdOQccbZxccWhZwZ+q25oE89vj JJgQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=X+ZA+35U; 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 n2-20020a056512310200b00513a0abdf43sor1303352lfb.31.2024.03.30.09.03.03 for (Google Transport Security); Sat, 30 Mar 2024 09:03:03 -0700 (PDT) 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; AJvYcCWOaDbcbw301itGdXMwsFFwFhXWm2dr0EJGO/782M859GJEmG4zTK20yJf6uI+6NA34bEEKd3HwdJ/TUqyu/2aw0S/oPGnO/IijymAqVf/HeyT1 X-Received: by 2002:a05:6512:3d0a:b0:516:1a1e:164f with SMTP id d10-20020a0565123d0a00b005161a1e164fmr2383708lfv.41.1711814582767; Sat, 30 Mar 2024 09:03:02 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-87-8-99-67.retail.telecomitalia.it. [87.8.99.67]) by smtp.gmail.com with ESMTPSA id f13-20020a056402004d00b0056c633354c6sm2127107edu.45.2024.03.30.09.03.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Mar 2024 09:03:02 -0700 (PDT) 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, "Yann E . Morin" Subject: [PATCH v10 11/12] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 Date: Sat, 30 Mar 2024 17:02:43 +0100 Message-ID: <20240330160244.3214733-12-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240330160244.3214733-1-dario.binacchi@amarulasolutions.com> References: <20240330160244.3214733-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=X+ZA+35U; 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 Signed-off-by: Dario Binacchi --- board/ti/am64x-sk/genimage.cfg | 7 ++++++- .../patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 -- configs/ti_am64x_sk_defconfig | 14 +++++++------- package/ti-k3/Config.in | 3 ++- 4 files changed, 15 insertions(+), 11 deletions(-) delete mode 100644 board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash 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/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash deleted file mode 100644 index 2a5c99c459f2..000000000000 --- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index a19cf6f85572..9b92b645dd21 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,15 +1,14 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y -BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" -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 @@ -25,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