From patchwork Sun Jul 20 15:03:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4217 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9862140B4B for ; Sun, 20 Jul 2025 17:03:46 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-612c96649b0sf2086642a12.3 for ; Sun, 20 Jul 2025 08:03:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1753023826; cv=pass; d=google.com; s=arc-20240605; b=ec82WrC/VFmOX8GHIniYvS+NnFbm8Ts9x+syJ4w+w3Ihwwp2mHYmuMIgNRwNUIyDpo Q0nUY77K+IbIJO2k9jv0Nm0Cqyf706wqjr+zVYVUtFhsIG+nqoLlFsdwMdLY/jGsk6kd xW9vkmsWfDnxyZ5yNaL6a6s0ubyyk2CDDdf9FvSM88bHpklIZ6d8paCxs59nQtWhQn7Y hH1jxoeD1wt4ZvqbghsDQfhUmCNr9qBWaS4/cUN1n8U1b7r8pNCNnQUSuUKuVDsE4spm 7MNu/tmQyOIqsn87Nq3qGZ2exZhQO6UOfgkfXEHXBCnhVxBcnAMyc8Sj1ddY3YT+qV5G mNhA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=Goj3h0Qk8F3xkfP1s8A4mCsdBdXoELlH9Bq/DER1tr4=; fh=aP6eA0SISHUSNNNK+KQJexL11Vrrw1HKhQ2UB3gLKTo=; b=lwg2PnwWvnGyIr+yNU+lPdCumNUtQYNpVmCg4sKX2noSVhWr24fuG6SHsUZVX64SNP L/VAsrEnroJ5q0bdj3w+GOkB25PebrYNSSavDMqevZQohYsM5n0ZBqhdP6TEDRzYTg/s fv5lColfZzTbjifS5BNTlYZyJz/1BB30zzYXCCgvVlFgqrue8twveb4CR9KRxmZ1IWy+ +99b5vSE3EnUWvqWdIQU4s/1b1kikcUiswGk796ua5aZre8+qONt4mTAYTx2KgdIpcHq NW96kYeydGQLKMgWlRPQEzGxN8yoUKxapiu+kgTvlWlipe68shBCmE6e/qewd2/PhZZH 3egg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bY9DD4dz; 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; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1753023826; x=1753628626; 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:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=Goj3h0Qk8F3xkfP1s8A4mCsdBdXoELlH9Bq/DER1tr4=; b=Z8YqSyadDi8U9O8F8XoZO/s61HRHQwCd+Rpj5PqWqGTSHa8gjtyXSBr7GwuzY/aVT1 +Sij/OqdPN/zDOTEsTVrvLmSIT4GjM9TvRSN4XfxByFlreJ6eUA3OqM3M4od37j0zmty oZPQRSB0FlQ7AVlwywEq8hnKPRei+hU8QcSoo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753023826; x=1753628626; 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 :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Goj3h0Qk8F3xkfP1s8A4mCsdBdXoELlH9Bq/DER1tr4=; b=HyratILE18PQfxLEuHCtN/NPU25cRzBVGw+ctXaXTVj9ecd7lEuSnwPzFZNjnOfHgr yifVP/o2q89FkjmryoZRQSf9dhHIWjhJqJINmHMTQqFqOeI9FQ5e/k1Br8MXXd0lzv7i J/PzKoxy9LhfBSwEtrehmV2JYfAaLWhP4DX5/Or3jnzjFgZF83DzcbP4ER9HuOQxMvvu 5UsQ6Ns46nD11KvsU8mxrdIgHQ93SOiOTyzSirQpMmZCAXKlF09PUtPf8Ng9GC2VnB86 ukjXu+/t2L8KzneAZHYcDPZx5SizwXbHbVkkvudmRIjI9kVIb49lSiZfLrSu8Ax5feZI njKg== X-Forwarded-Encrypted: i=2; AJvYcCVSTeXIe01eXgQOfCMO6416J/b+sw0OeBaJmOEwmxf6dnJ2lI2ueC/5r0ZmGlvsl/+zIGprvF7J6ZsZS0cL@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzRw5bJH4vnJjv+FJ928uTIlGlFLSvfL3NAIlZEoBvQRtBYoaTy zrRqZaQepVNMEiqNLxeTY5pUcNMiapo7n7E9s7Mx/KL0Rgzo1IjA77vCbOBSyImQOHpLjw== X-Google-Smtp-Source: AGHT+IG4njo1Zz5QTpwKjd/VcaImutktu0BGwCkWMmGiFEhR0vdIFbQ21Tj+iEuNEy6/2G2CEc5xdw== X-Received: by 2002:a05:6402:40d4:b0:612:b723:4d95 with SMTP id 4fb4d7f45d1cf-612b7234f2emr11726168a12.30.1753023825780; Sun, 20 Jul 2025 08:03:45 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZc8myzvd5yEV+qYP0ukquMRtAKItvXcpEVHY0fkhoLUFg== Received: by 2002:a05:6402:1eca:b0:60c:3c0f:3040 with SMTP id 4fb4d7f45d1cf-612a0a6f22als3595695a12.2.-pod-prod-03-eu; Sun, 20 Jul 2025 08:03:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCURvnt9TBw407M8ztaHVt5IyfXf7PFpFk8mFgzncH/ahIBK1LmJNSeYSwLTINx0fuhY7trN7ce99I+4FNms@amarulasolutions.com X-Received: by 2002:a17:906:c9d3:b0:ae9:928d:f285 with SMTP id a640c23a62f3a-aec4fc88bc1mr1032916366b.55.1753023823240; Sun, 20 Jul 2025 08:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1753023823; cv=none; d=google.com; s=arc-20240605; b=UNLiSVM2j/A6VJEdwEVZxmlboRtrIywUfmrlnwkC2t14LG/HptbHYY0N/ZsGf6NVyh lbxvbyyh3WNmaMAFMVy6wkJx/6gQcAF2isF3G5DeQJWdgw7dAiYL7Qe4DUn4JxizRbB7 Bz9KSzh+hJJII95fz7QBY/7b/yItMV1FJLvwKbHT0LrCcIXYxRbrYgbQjltKLMmKAJGP kvLVMm01tafg6VWiemFbttgs6l78DKogl+5hu/MucegcMPPAJ/FblOaDfIhLUr7BlvbL PnEgjohWSVcC/t0ffqB88QzjDbtTBpGb3GDFe1r4a+nmxblzWl+X5NY8thD3glbHmsRT jyag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=FRjs9hsfS6W79WKnrEiHl6utq8cz9m88uqv9nYNqoTM=; fh=Ds2RCR0skYjJU5z5wnhTjhldgyw5k989/W3zDDkMsnQ=; b=YmwGkrj6qCHf+sNhEXDexA5YjBMkPvC3hZHo3YhVV5KkYk6FFmxlhIq60ISuAT7UMV BMcFNtC70b6jBoC7G+T0wPyZ7ExFFL1Lbdb5NOkNkZlHAQmrnzKCOWdGhtE/zwTZRxcS RQKaw9HOnxkeizD/M4E927CpqykLrkWTkk0uDJeNJmDoV7vdM3bsTWky7EBct9xWd8bI CKeRq+5IADgJFIEWvWqB5a1KrqX4+ZocMWL6JqujGebrHAcK4B5BDUcbvoITP8VpkKbm 7zsH+TuralMIAAxBvHo7O1yLnj8gWkDWde18QDb7IJL5sVR681K0zpthozvflL6VMk/P zUdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=bY9DD4dz; 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; dara=pass header.i=@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 a640c23a62f3a-aeccef52759sor189324766b.9.2025.07.20.08.03.43 for (Google Transport Security); Sun, 20 Jul 2025 08:03:43 -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; AJvYcCV2wUWE+W3CXk151FyD5tpEgI7gwpPOpqvMSMFfmn/C8s/9rt1ZMkOpXlohNiuijsqBTN8sP0S18pZzG0CS@amarulasolutions.com X-Gm-Gg: ASbGncsjPClml8sPMOAvytm+hyGDfAKn0okHSyjTF4vyavNUEs5cq6bSjW5Ld5O9YLy Qc04SCWC7ONFOxXY/F86Qk4D5ZIc47T/6TOsVNJyEmca9rD9QgwclhOoc+X0FclgvngjeseDQp9 FhlKRtIQy3DgnBoTPTesuWZG/caAoQgrIUxWXaPp2BcUMqHVXQjtcP3H2bCBDFFg9tsEak2m0lg wTSmcCPnXZ10UM9mpzyXIU6UTcMwZgVMDK0J+tXqXfLNM96Y2ctRCs2IX/mEJxPrWBKO0XrjDk3 F8pS4600Ua815y+DzNK6L87JJGWzZa457c4l0EUfmZ+cVvZV/A6PPFriE11Qr3NCorEru5XhtcY Tsp2Y5WdFryzTpe2NcYqswwkUj1tn1E2wUGtMX1+tiESEA3XafvWQ7ZVBxBMZePQ7YCoe6l3h0S U8qTXv7MqsK9DZR8d/vohvXfo9XTCpJsZwO1MxXXLLEoig53oAiU1pFZRXog== X-Received: by 2002:a17:907:501e:b0:ae3:8c9b:bd61 with SMTP id a640c23a62f3a-aec4fa438c3mr839609466b.12.1753023822435; Sun, 20 Jul 2025 08:03:42 -0700 (PDT) Received: from dario-ThinkPad-P14s-Gen-5.homenet.telecomitalia.it (host-87-5-95-99.retail.telecomitalia.it. [87.5.95.99]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6c7c7ebdsm502705366b.37.2025.07.20.08.03.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Jul 2025 08:03:41 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Dario Binacchi , Michael Trimarchi , linux-amarula@amarulasolutions.com Subject: [PATCH 1/1] configs/imx8mn_bsh_smm_s2[_pro]: bump Linux to 6.12.39 and U-Boot to 2025.07 Date: Sun, 20 Jul 2025 17:03:33 +0200 Message-ID: <20250720150333.2644053-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 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=bY9DD4dz; 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; dara=pass header.i=@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 patch bumps the Linux kernel to version 6.12.39 and U-Boot to version 2025.07. The patches applied to U-Boot by Buildroot have been removed, as they are included in version 2025.07. The patch has been tested on both boards. Signed-off-by: Dario Binacchi --- .../patches/linux/linux.hash | 2 +- ...arm-imx-imx8m-soc-fix-the-macro-name.patch | 45 ----- ...mx8m-soc-replace-ifdef-by-IS_ENABLED.patch | 178 ------------------ ...ig-support-U-Boot-load-from-raw-NAND.patch | 49 ----- ...l_imx_romapi-support-raw-NAND-sector.patch | 42 ----- ...bsh_smm_s2-load-U-Boot-from-raw-NAND.patch | 32 ---- .../patches/uboot/uboot.hash | 2 +- configs/imx8mn_bsh_smm_s2_defconfig | 4 +- configs/imx8mn_bsh_smm_s2_pro_defconfig | 4 +- 9 files changed, 6 insertions(+), 352 deletions(-) delete mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0001-arm-imx-imx8m-soc-fix-the-macro-name.patch delete mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0002-arm-imx-imx8m-soc-replace-ifdef-by-IS_ENABLED.patch delete mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0003-spl-Kconfig-support-U-Boot-load-from-raw-NAND.patch delete mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0004-imx-spl_imx_romapi-support-raw-NAND-sector.patch delete mode 100644 board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0005-configs-imx8mn_bsh_smm_s2-load-U-Boot-from-raw-NAND.patch diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash index 0add29fcf09d..839b62862a60 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/linux/linux.hash @@ -1,2 +1,2 @@ # From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749 linux-6.12.23.tar.xz +sha256 6e562502a8fd11639f558e43b74f0df0d85fa85e60f5332acb275a75a35f5345 linux-6.12.39.tar.xz diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0001-arm-imx-imx8m-soc-fix-the-macro-name.patch b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0001-arm-imx-imx8m-soc-fix-the-macro-name.patch deleted file mode 100644 index 6d53dddfb89e..000000000000 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0001-arm-imx-imx8m-soc-fix-the-macro-name.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f7cddc4c6f4e4da57c6500cd0d88ea06e937b239 Mon Sep 17 00:00:00 2001 -From: Michael Trimarchi -Date: Thu, 15 May 2025 17:09:51 +0200 -Subject: [PATCH] arm: imx: imx8m: soc: fix the macro name - -The function arch_spl_mmc_get_uboot_raw_sector() was never compiled, -even when the option CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION was -enabled. So rename the macro SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION to -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION. - -Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") -Signed-off-by: Michael Trimarchi -Signed-off-by: Dario Binacchi -Reviewed-by: Quentin Schulz -Reviewed-by: Peng Fan -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/f7cddc4c6f4e4da57c6500cd0d88ea06e937b239 ---- - arch/arm/mach-imx/imx8m/soc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c -index 567e8e9e81a0..806adcf145fa 100644 ---- a/arch/arm/mach-imx/imx8m/soc.c -+++ b/arch/arm/mach-imx/imx8m/soc.c -@@ -791,7 +791,7 @@ int boot_mode_getprisec(void) - #endif - - #if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) --#ifdef SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION -+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION - #define IMG_CNTN_SET1_OFFSET GENMASK(22, 19) - unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, - unsigned long raw_sect) -@@ -826,7 +826,7 @@ unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, - - return raw_sect; - } --#endif /* SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION */ -+#endif /* CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION */ - #endif - - bool is_usb_boot(void) --- -2.43.0 - diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0002-arm-imx-imx8m-soc-replace-ifdef-by-IS_ENABLED.patch b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0002-arm-imx-imx8m-soc-replace-ifdef-by-IS_ENABLED.patch deleted file mode 100644 index 5f57c69481ab..000000000000 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0002-arm-imx-imx8m-soc-replace-ifdef-by-IS_ENABLED.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 4c82eeab9840983693791117aa75f7bd7fbc805b Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Thu, 15 May 2025 17:09:52 +0200 -Subject: [PATCH] arm: imx: imx8m: soc: replace ifdef by IS_ENABLED() - -Standardize on using the IS_ENABLED macro. - -Signed-off-by: Dario Binacchi -Reviewed-by: Peng Fan -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/4c82eeab9840983693791117aa75f7bd7fbc805b ---- - arch/arm/mach-imx/imx8m/soc.c | 40 +++++++++++++++++------------------ - 1 file changed, 20 insertions(+), 20 deletions(-) - -diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c -index 806adcf145fa..3cdb71a25284 100644 ---- a/arch/arm/mach-imx/imx8m/soc.c -+++ b/arch/arm/mach-imx/imx8m/soc.c -@@ -38,7 +38,7 @@ - - DECLARE_GLOBAL_DATA_PTR; - --#if defined(CONFIG_IMX_HAB) -+#if IS_ENABLED(CONFIG_IMX_HAB) - struct imx_fuse const imx_sec_config_fuse = { - .bank = 1, - .word = 3, -@@ -52,7 +52,7 @@ struct imx_fuse const imx_field_return_fuse = { - - int timer_init(void) - { --#ifdef CONFIG_XPL_BUILD -+#if IS_ENABLED(CONFIG_XPL_BUILD) - struct sctr_regs *sctr = (struct sctr_regs *)SYSCNT_CTRL_BASE_ADDR; - unsigned long freq = readl(&sctr->cntfid0); - -@@ -110,7 +110,7 @@ void set_wdog_reset(struct wdog_regs *wdog) - setbits_le16(&wdog->wcr, WDOG_WDT_MASK | WDOG_WDZST_MASK); - } - --#ifdef CONFIG_ARMV8_PSCI -+#if IS_ENABLED(CONFIG_ARMV8_PSCI) - #define PTE_MAP_NS PTE_BLOCK_NS - #else - #define PTE_MAP_NS 0 -@@ -700,11 +700,11 @@ int arch_cpu_init(void) - return 0; - } - --#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -+#if IS_ENABLED(CONFIG_IMX8MN) || IS_ENABLED(CONFIG_IMX8MP) - struct rom_api *g_rom_api = (struct rom_api *)0x980; - #endif - --#if defined(CONFIG_IMX8M) -+#if IS_ENABLED(CONFIG_IMX8M) - #include - int imx8m_detect_secondary_image_boot(void) - { -@@ -790,8 +790,8 @@ int boot_mode_getprisec(void) - } - #endif - --#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) --#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION -+#if IS_ENABLED(CONFIG_IMX8MN) || IS_ENABLED(CONFIG_IMX8MP) -+#if IS_ENABLED(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION) - #define IMG_CNTN_SET1_OFFSET GENMASK(22, 19) - unsigned long arch_spl_mmc_get_uboot_raw_sector(struct mmc *mmc, - unsigned long raw_sect) -@@ -834,7 +834,7 @@ bool is_usb_boot(void) - return get_boot_device() == USB_BOOT; - } - --#ifdef CONFIG_OF_SYSTEM_SETUP -+#if IS_ENABLED(CONFIG_OF_SYSTEM_SETUP) - bool check_fdt_new_path(void *blob) - { - const char *soc_path = "/soc@0"; -@@ -880,7 +880,7 @@ add_status: - return 0; - } - --#ifdef CONFIG_IMX8MQ -+#if IS_ENABLED(CONFIG_IMX8MQ) - bool check_dcss_fused(void) - { - struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; -@@ -1026,7 +1026,7 @@ int disable_vpu_nodes(void *blob) - return -EPERM; - } - --#ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE -+#if IS_ENABLED(CONFIG_IMX8MN_LOW_DRIVE_MODE) - static int low_drive_gpu_freq(void *blob) - { - static const char *nodes_path_8mn[] = { -@@ -1311,7 +1311,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) - "/cpus/cpu@3", - }; - --#ifdef CONFIG_IMX8MQ -+#if IS_ENABLED(CONFIG_IMX8MQ) - int i = 0; - int rc; - int nodeoff; -@@ -1387,7 +1387,7 @@ usb_modify_speed: - if (is_imx8md()) - disable_cpu_nodes(blob, nodes_path, 2, 4); - --#elif defined(CONFIG_IMX8MM) -+#elif IS_ENABLED(CONFIG_IMX8MM) - if (is_imx8mml() || is_imx8mmdl() || is_imx8mmsl()) - disable_vpu_nodes(blob); - -@@ -1396,10 +1396,10 @@ usb_modify_speed: - else if (is_imx8mms() || is_imx8mmsl()) - disable_cpu_nodes(blob, nodes_path, 3, 4); - --#elif defined(CONFIG_IMX8MN) -+#elif IS_ENABLED(CONFIG_IMX8MN) - if (is_imx8mnl() || is_imx8mndl() || is_imx8mnsl()) - disable_gpu_nodes(blob); --#ifdef CONFIG_IMX8MN_LOW_DRIVE_MODE -+#if IS_ENABLED(CONFIG_IMX8MN_LOW_DRIVE_MODE) - else { - int ldm_gpu = low_drive_gpu_freq(blob); - -@@ -1415,7 +1415,7 @@ usb_modify_speed: - else if (is_imx8mns() || is_imx8mnsl() || is_imx8mnus()) - disable_cpu_nodes(blob, nodes_path, 3, 4); - --#elif defined(CONFIG_IMX8MP) -+#elif IS_ENABLED(CONFIG_IMX8MP) - if (is_imx8mpul()) { - /* Disable GPU */ - disable_gpu_nodes(blob); -@@ -1471,7 +1471,7 @@ void reset_cpu(void) - } - #endif - --#if defined(CONFIG_ARCH_MISC_INIT) -+#if IS_ENABLED(CONFIG_ARCH_MISC_INIT) - int arch_misc_init(void) - { - if (IS_ENABLED(CONFIG_FSL_CAAM)) { -@@ -1487,8 +1487,8 @@ int arch_misc_init(void) - } - #endif - --#if defined(CONFIG_XPL_BUILD) --#if defined(CONFIG_IMX8MQ) || defined(CONFIG_IMX8MM) || defined(CONFIG_IMX8MN) -+#if IS_ENABLED(CONFIG_XPL_BUILD) -+#if IS_ENABLED(CONFIG_IMX8MQ) || IS_ENABLED(CONFIG_IMX8MM) || IS_ENABLED(CONFIG_IMX8MN) - bool serror_need_skip = true; - - void do_error(struct pt_regs *pt_regs) -@@ -1523,7 +1523,7 @@ void do_error(struct pt_regs *pt_regs) - #endif - #endif - --#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -+#if IS_ENABLED(CONFIG_IMX8MN) || IS_ENABLED(CONFIG_IMX8MP) - enum env_location arch_env_get_location(enum env_operation op, int prio) - { - enum boot_device dev = get_boot_device(); -@@ -1571,7 +1571,7 @@ enum env_location arch_env_get_location(enum env_operation op, int prio) - - #endif - --#ifdef CONFIG_IMX_BOOTAUX -+#if IS_ENABLED(CONFIG_IMX_BOOTAUX) - const struct rproc_att hostmap[] = { - /* aux core , host core, size */ - { 0x00000000, 0x007e0000, 0x00020000 }, --- -2.43.0 - diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0003-spl-Kconfig-support-U-Boot-load-from-raw-NAND.patch b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0003-spl-Kconfig-support-U-Boot-load-from-raw-NAND.patch deleted file mode 100644 index 4e8ade441a5e..000000000000 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0003-spl-Kconfig-support-U-Boot-load-from-raw-NAND.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8acea298bb82c38b20855cd46a46b9e418dc1fb0 Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Tue, 20 May 2025 10:54:16 +0200 -Subject: [PATCH] spl: Kconfig: support U-Boot load from raw NAND - -Commit 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") breaks -the boot of the BSH SMM S2 board. As stated in the commit itself, "Some -boards use this value even though MMC is not enabled in SPL, for example -imx8mn_bsh_smm_s2". - -Support load of the U-Boot image from raw NAND sector. This is equivalent -to load from MMC raw sector. - -Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") -Signed-off-by: Dario Binacchi -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/8acea298bb82c38b20855cd46a46b9e418dc1fb0 ---- - common/spl/Kconfig | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/common/spl/Kconfig b/common/spl/Kconfig -index aa3a85eea54d..77cf04d38ed0 100644 ---- a/common/spl/Kconfig -+++ b/common/spl/Kconfig -@@ -974,6 +974,21 @@ config SPL_NAND_SUPPORT - This enables the drivers in drivers/mtd/nand/raw as part of an SPL - build. - -+config SPL_NAND_RAW_U_BOOT_USE_SECTOR -+ bool "NAND raw mode: by sector" -+ depends on SPL_NAND_SUPPORT -+ select SPL_LOAD_BLOCK -+ help -+ Use sector number for specifying U-Boot location on NAND in -+ raw mode. -+ -+config SPL_NAND_RAW_U_BOOT_SECTOR -+ hex "Address on the NAND to load U-Boot from" -+ depends on SPL_NAND_RAW_U_BOOT_USE_SECTOR -+ help -+ Address on the NAND to load U-Boot from, when the NAND is being used -+ in raw mode. Units: NAND disk sectors (1 sector = 512 bytes). -+ - config SPL_NAND_RAW_ONLY - bool "Support to boot only raw u-boot.bin images" - depends on SPL_NAND_SUPPORT --- -2.43.0 - diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0004-imx-spl_imx_romapi-support-raw-NAND-sector.patch b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0004-imx-spl_imx_romapi-support-raw-NAND-sector.patch deleted file mode 100644 index cc35a76f88ec..000000000000 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0004-imx-spl_imx_romapi-support-raw-NAND-sector.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 24d98fa63bbcb21988e4e822f11686319502fb1f Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Tue, 20 May 2025 10:54:17 +0200 -Subject: [PATCH] imx: spl_imx_romapi: support raw NAND sector - -Commit 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") breaks -the boot of the BSH SMM S2 board. As stated in the dropped comment, "Some -boards use this value even though MMC is not enabled in SPL, for example -imx8mn_bsh_smm_s2". - -Support load of the U-Boot image from raw NAND sector. - -Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") -Signed-off-by: Dario Binacchi -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/24d98fa63bbcb21988e4e822f11686319502fb1f ---- - arch/arm/mach-imx/spl_imx_romapi.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/spl_imx_romapi.c -index 3982f4cca184..b7008df8e35a 100644 ---- a/arch/arm/mach-imx/spl_imx_romapi.c -+++ b/arch/arm/mach-imx/spl_imx_romapi.c -@@ -35,12 +35,10 @@ ulong __weak spl_romapi_get_uboot_base(u32 image_offset, u32 rom_bt_dev) - { - u32 sector = 0; - -- /* -- * Some boards use this value even though MMC is not enabled in SPL, for -- * example imx8mn_bsh_smm_s2 -- */ --#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR -+#if IS_ENABLED(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR) - sector = CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR; -+#elif IS_ENABLED(CONFIG_SPL_NAND_RAW_U_BOOT_USE_SECTOR) -+ sector = CONFIG_SPL_NAND_RAW_U_BOOT_SECTOR; - #endif - - return image_offset + sector * 512 - 0x8000; --- -2.43.0 - diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0005-configs-imx8mn_bsh_smm_s2-load-U-Boot-from-raw-NAND.patch b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0005-configs-imx8mn_bsh_smm_s2-load-U-Boot-from-raw-NAND.patch deleted file mode 100644 index 61eccd51ff7c..000000000000 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/0005-configs-imx8mn_bsh_smm_s2-load-U-Boot-from-raw-NAND.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dce71922df352b0eb1b6cc3d40c374ad80a7d6c5 Mon Sep 17 00:00:00 2001 -From: Dario Binacchi -Date: Tue, 20 May 2025 10:54:18 +0200 -Subject: [PATCH] configs: imx8mn_bsh_smm_s2: load U-Boot from raw NAND - -Commit 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") breaks -the boot of the BSH SMM S2 board. Add options to load U-Boot from raw NAND -sector. - -Fixes: 2a00d73d081a ("spl: mmc: Try to clean up raw-mode options") -Signed-off-by: Dario Binacchi -Upstream: https://source.denx.de/u-boot/u-boot/-/commit/dce71922df352b0eb1b6cc3d40c374ad80a7d6c5 ---- - configs/imx8mn_bsh_smm_s2_defconfig | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig -index 9ffcd3b221c3..1c11d4705419 100644 ---- a/configs/imx8mn_bsh_smm_s2_defconfig -+++ b/configs/imx8mn_bsh_smm_s2_defconfig -@@ -47,6 +47,8 @@ CONFIG_SPL_DMA=y - CONFIG_SPL_I2C=y - CONFIG_SPL_MTD=y - CONFIG_SPL_NAND_SUPPORT=y -+CONFIG_SPL_NAND_RAW_U_BOOT_USE_SECTOR=y -+CONFIG_SPL_NAND_RAW_U_BOOT_SECTOR=0x300 - CONFIG_SPL_NAND_BASE=y - CONFIG_SPL_NAND_IDENT=y - CONFIG_SPL_POWER=y --- -2.43.0 - diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash index 80ea21b7cb4c..440526977bd9 100644 --- a/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash +++ b/board/bsh/common/imx8mn-bsh-smm-s2/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 0b1334fc90e0..662aea69deb1 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -6,7 +6,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2/post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.23" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.39" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -28,7 +28,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/imx8mn_bsh_smm_s2_pro_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig index b00dd03b6995..f1e9d0c0a151 100644 --- a/configs/imx8mn_bsh_smm_s2_pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.23" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.39" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -29,7 +29,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30a60 BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_bsh_smm_s2pro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y