From patchwork Fri Mar 1 13:36:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3033 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2449F3F057 for ; Fri, 1 Mar 2024 14:36:51 +0100 (CET) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a43f3f8d7d8sf160217366b.3 for ; Fri, 01 Mar 2024 05:36:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709300211; cv=pass; d=google.com; s=arc-20160816; b=mAkPdxZSVof+h42l70Wr8h9gWjROaOY/gu5L29Mm/v45ezYJIwJD0JrX9DLIbwLsMW p3PiMMU5EYI2Kjy80ybFRVqVRWkZy4ML9PmS6Tb3crKJWAT35/8zn74bsF7lK0USWp1V Ozq45vBcHnFsTUU2BoXRozsc8Macd5E5u+OHtdWlp1Qknru5rXWpjyxepjK2hpnHTom6 ooJdZ8r73A6KiuZFf5wj0j9Ddw/w9D9AqBRBSTGL1WvWveMT7QPHWu+VOLZtiJ4Meamd enJSXszJfMthdCRHM31UEq0JHgvL4zXXGbdUKRMZkQm+xPK1+ZZ+fqQz32dslvdIBbTw VO2g== 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=9YgYjCK3mDsjsbJcL55pzbZ8xJMqHweuUlozX0Tad8k=; fh=Z9kePigCV4Svg8IAmCUCdTx1IjnKproqVu6+6/xGgxg=; b=lguPGsg11lhj6vxpGzYh/Pyl3/VX48m0/NppI6YSLyXDBbilPBflUQ4IgSja9ZSuxu wi69gY3rknbtco7SWZn00iNGfEYWvkxx8UMAj4BYolAeBqupYVn6yQ1Ls3gxnaFTWCOg 8wvU+g07ZWRIQ5C1vllKE3TaoM10+xEJnnjEJI+BDuQVfaGccH39mp8A4RVFHk8k3qQl VJmSHPHWrL1+TAqYSxzoHe15B7kSl/VLIvB1HfE7/Z5LYf9JitTk1IiuILMmkv6ABqkK 9csi51YiS7Mt3Gtk1p1ru+moApQrjLExmJRf+2/TIFU1uslKb240trB3GRpEg2vUJtBT 4ZVw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Tf5F+9De; 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=1709300211; x=1709905011; 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=9YgYjCK3mDsjsbJcL55pzbZ8xJMqHweuUlozX0Tad8k=; b=T1kcMBbvNRsWgbMtY3Ep4vnu6yTQ3KNxfrxiaUt7RnPYwTn4JVETNx89vEnYvRzEA4 Qx/EUgDr7EG9uJyOHCeSDd8HxzFv4dGYTHbyJfS6mEB749y6M3zRODDL8JAZzBRvXIJI yNpEulG6lT9pjxu3P1pSQpA4uLLs7OeLIoRS4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709300211; x=1709905011; 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=9YgYjCK3mDsjsbJcL55pzbZ8xJMqHweuUlozX0Tad8k=; b=GwVHdiPgBC2Odi2b3DVahfdgVh0DG/SPIo915Lsp6LNXyN5zWORID/LtwAh0fBa6zK G82EvX1Pe18HCT3+m1wMOsyK1xDlTpW8DoRWXvOu1l2CwJ4RhgFlB6wMe+Ss5Z44LP+T 6MD6AC08lbcqNeGsL+4SiRGyhXmuXcN5exH6i1erqwgX2UVqI+WM56w2ZqUNsgkY6YNh htXeITqGnEw8NNdkU/YzhCUH70KdCOxk00IrhTvcjvVNPdjR2vysaQ0+CogVqYfxVIAo t1DBlLud8xbCM4q7QjBW3fr3CJo9VaRFTI0INdoOdK4zFy16/l+GzzZs626eqAO17/Hk Samg== X-Forwarded-Encrypted: i=2; AJvYcCXdU3hG+eDyS0SmG8buvvjneqU7GMfevPMYunsjJtJNwAbN/vMddpmDPpg4bJrOKuO4GQ4qlbKBgiebHcheQYrUvepa9DXyBZrlE3KspJ9YsQwJ98R4Y4pR7GtQtw== X-Gm-Message-State: AOJu0YyT/CI1S76IW5p7FS6p4eGbeuvddVLOC36g6WX4NWeFJdRBHy3Q tzIsl89dfIPN4knrzyz/w1jg+xJ0TIelQ1oswbUm3i2IuFwhDPJ8haErKKIcVVh2WA== X-Google-Smtp-Source: AGHT+IGTl3ig7S2v1pvI02swt0pvI4wxMg06IvDYDPgYE1EKNrqun7ssJaT/yo/yEJ9gGUMikqWV/g== X-Received: by 2002:aa7:c3d5:0:b0:566:b924:23e9 with SMTP id l21-20020aa7c3d5000000b00566b92423e9mr1512061edr.20.1709300210960; Fri, 01 Mar 2024 05:36:50 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:f27:b0:566:a1b7:c657 with SMTP id i39-20020a0564020f2700b00566a1b7c657ls25631eda.2.-pod-prod-04-eu; Fri, 01 Mar 2024 05:36:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVAUhYFh8FjNWkQS/Dg8yV9m7tP5rehjiwTnhmOM+aViFXfTLBsrhgQ0E7RGGk+YIfzjZ3msvCSnXkxjCa1Q7X/0XQdwJU5blr5rz4dNdH8WGOZ X-Received: by 2002:aa7:c508:0:b0:565:9fc8:8f35 with SMTP id o8-20020aa7c508000000b005659fc88f35mr1123519edq.42.1709300209463; Fri, 01 Mar 2024 05:36:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709300209; cv=none; d=google.com; s=arc-20160816; b=qtSpnvYhYqLDnYYV3vz5N1jvRnh9nBy4sVcVvoZsWUNCTFOjtTGrXEBvl0EGdpaOW2 IG3BkOfce4rMjgBrE9+F9Cii1InyUC0ENZKtsv4VWhTGr2NyD+y4XGaq4ZB3fJVhqMRr sjrIbqo1BrxmzhVnKculGe2PIvygav3FnbkNofwvBn0wFyRdrJJdYpq6HklBBZz21HUH 32de271Ww+EPAYtw3Nzr6MkIOn5KjhxrDjGlAigdqgIOJ6+fWBhqueIMyTpCPyttT/6m t+3e+C8TpP8yTd8T41RbHKcgYURHA5Of+lH+UIhO1Stjk2j9oFQyzzxRuNNXWcwAd13Z WGIQ== 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=gEE0XGHabXzaMn2xtNoxEcq2/77ioPiDg56IX6gjtRA=; fh=yFrz7XWKrMAifRajlh0cqmoX1MRcJ9OlnNn5fS01WCM=; b=W1EW65tccAHrQhnLOo+avQwsqzL7D9eQopl1Yim3dN90tE14b19Ovc2Yz5TwTOi7D2 +kS/y0vSlVMJa6/2yyp0x4xpcZp1SaKqLZAHVBxrL2zPmWqNIuOD0bp0vMAHXKep0Zne Pl/p4E9ZuKz9BmRJEbqjmi4tUT6DEnbt0y1606OkieqLKgT832lM4+Hr1iN20PJW4Z0C 8oA27ays8x5T+hdUQ+/aE7rpRKxfAXt/5LocvfuetH95e/FORZmlrY7r8zUxoG/JPs9v i5vzoCrUoNbU2UiCjpHdr8De5aC40Kf5O4dfwtgBOUOAEOcCwkH5MvcPEBETieJVB/c7 6pEA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Tf5F+9De; 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 x10-20020a50ba8a000000b00566aba4f77esor1373080ede.9.2024.03.01.05.36.49 for (Google Transport Security); Fri, 01 Mar 2024 05:36:49 -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; AJvYcCVgpztr8VpKXNU6OEVeFlJwWIMhTaFXsdIuTvKkWsbX+ot1FthRivjG+lVvLVC+UGNLTWZQDfUvqIxglBDo/xtkvrPERQtezUpXUfe0ZGsNBCXn X-Received: by 2002:aa7:c508:0:b0:565:9fc8:8f35 with SMTP id o8-20020aa7c508000000b005659fc88f35mr1123511edq.42.1709300209171; Fri, 01 Mar 2024 05:36:49 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6474:ebbf:5260:58bc:42cc:9d46]) by smtp.gmail.com with ESMTPSA id q28-20020a056402033c00b005659ea1caf0sm1566608edw.6.2024.03.01.05.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:36:48 -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 v8 21/23] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 Date: Fri, 1 Mar 2024 14:36:18 +0100 Message-ID: <20240301133620.3547430-22-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240301133620.3547430-1-dario.binacchi@amarulasolutions.com> References: <20240301133620.3547430-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=Tf5F+9De; 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. Signed-off-by: Dario Binacchi --- Added in v8 Signed-off-by: Dario Binacchi --- board/ti/am64x-sk/genimage.cfg | 7 ++++++- configs/ti_am64x_sk_defconfig | 13 +++++++------ 2 files changed, 13 insertions(+), 7 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