{"id":2223377,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2223377/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260415073425.72208-1-weijie.gao@mediatek.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260415073425.72208-1-weijie.gao@mediatek.com>","list_archive_url":null,"date":"2026-04-15T07:34:25","name":"[v2] common: spl: nand: improve u-boot offsets overriding","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e6a82334610cf20926032ef66a1a8f4d1868b98a","submitter":{"id":75269,"url":"http://patchwork.ozlabs.org/api/1.2/people/75269/?format=json","name":"Weijie Gao","email":"weijie.gao@mediatek.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260415073425.72208-1-weijie.gao@mediatek.com/mbox/","series":[{"id":499936,"url":"http://patchwork.ozlabs.org/api/1.2/series/499936/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=499936","date":"2026-04-15T07:34:25","name":"[v2] common: spl: nand: improve u-boot offsets overriding","version":2,"mbox":"http://patchwork.ozlabs.org/series/499936/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223377/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223377/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=mediatek.com header.i=@mediatek.com header.a=rsa-sha256\n header.s=dk header.b=uruDwqp6;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=quarantine dis=none) header.from=mediatek.com","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=mediatek.com header.i=@mediatek.com\n header.b=\"uruDwqp6\";\n\tdkim-atps=neutral","phobos.denx.de; dmarc=pass (p=quarantine dis=none)\n header.from=mediatek.com","phobos.denx.de;\n spf=pass smtp.mailfrom=weijie.gao@mediatek.com"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fwXwd1xj4z1yHM\n\tfor ; Wed, 15 Apr 2026 17:34:57 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 5650283B99;\n\tWed, 15 Apr 2026 09:34:48 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 463CB83D8A; Wed, 15 Apr 2026 09:34:46 +0200 (CEST)","from mailgw02.mediatek.com (unknown [210.61.82.184])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 6B644838BB\n for ; Wed, 15 Apr 2026 09:34:38 +0200 (CEST)","from mtkmbs14n1.mediatek.inc [(172.21.101.75)] by\n mailgw02.mediatek.com (envelope-from )\n (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256)\n with ESMTP id 1150067899; Wed, 15 Apr 2026 15:34:29 +0800","from mtkmbs11n1.mediatek.inc (172.21.101.185) by\n MTKMBS09N1.mediatek.inc (172.21.101.35) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.2562.29; Wed, 15 Apr 2026 15:34:28 +0800","from mcddlt001.gcn.mediatek.inc (10.19.240.15) by\n mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id\n 15.2.2562.29 via Frontend Transport; Wed, 15 Apr 2026 15:34:28 +0800"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,\n RCVD_IN_VALIDITY_RPBL_BLOCKED,RDNS_NONE,SPF_HELO_PASS,SPF_PASS,\n UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2","X-UUID":["89bc9736389d11f19a16598d5ca7f8ec-20260415","89bc9736389d11f19a16598d5ca7f8ec-20260415"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n d=mediatek.com;\n s=dk;\n h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From;\n bh=XHDTSAey44+6oN7m+4JdiS8bl8Z/TULRjbO+43wVjNM=;\n b=uruDwqp6+dAn7QoLGSV5Z6qIa3B+blnzCNGLkRnkl7ccLS+gPFE5l5iRLpBYo4fiyBDy5ExqER+tzZn+agjoCu60wGOx0QNeuTEbK5AFwG5e5FqALXlGtL5a0oZgjs03AsUdMWiiJEvyHfwgAhuBDN0IX7Ly8O6BFIzs5GvnELM=;","X-CID-P-RULE":"Release_Ham","X-CID-O-INFO":"VERSION:1.3.12, REQID:cd7884f5-9ce7-478a-ad2c-2ee59f505f51,\n IP:0,\n U\n RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION\n :release,TS:-5","X-CID-META":"VersionHash:e7bac3a, CLOUDID:9f1ee324-cb5c-4236-a89a-9a7fb20c9bc4,\n B\n ulkID:nil,BulkQuantity:0,Recheck:0,SF:102|836|865|888|898,TC:-5,Content:0|\n 15|50,EDM:-3,IP:nil,URL:0,File:130,RT:0,Bulk:nil,QS:nil,BEC:-1,COL:0,OSI:0\n ,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0","X-CID-BVR":"2,SSN|SDN","X-CID-BAS":"2,SSN|SDN,0,_","X-CID-FACTOR":"TF_CID_SPAM_SNR","X-CID-RHF":"D41D8CD98F00B204E9800998ECF8427E","From":"Weijie Gao ","To":"","CC":"GSS_MTK_Uboot_upstream , Tom Rini\n , Weijie Gao ","Subject":"[PATCH v2] common: spl: nand: improve u-boot offsets overriding","Date":"Wed, 15 Apr 2026 15:34:25 +0800","Message-ID":"<20260415073425.72208-1-weijie.gao@mediatek.com>","X-Mailer":"git-send-email 2.17.0","MIME-Version":"1.0","Content-Type":"text/plain","X-MTK":"N","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"This patch introduces spl_nand_get_uboot_raw_page_redund() to wrap the\nCONFIG_SYS_NAND_U_BOOT_OFFS_REDUND macro, similar as what\nspl_nand_get_uboot_raw_page() has already done.\n\nThe spl_nand_get_uboot_raw_page_redund() is defined to return int to allow\ndisabling loading redundant u-boot by returning a negative value.\nBy default if CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND equals\nCONFIG_SYS_NAND_U_BOOT_OFFS, spl_nand_get_uboot_raw_page_redund() will\nreturn -1.\n\nThis patch also replaces all references to CONFIG_SYS_NAND_U_BOOT_OFFS and\nCONFIG_SYS_NAND_U_BOOT_OFFS_REDUND with the return value of the two\nfunctions mentioned above.\n\nSigned-off-by: Weijie Gao \n---\n common/spl/spl_nand.c | 40 +++++++++++++++++++++++++++-------------\n 1 file changed, 27 insertions(+), 13 deletions(-)","diff":"diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c\nindex f449b31f594..755461dfa57 100644\n--- a/common/spl/spl_nand.c\n+++ b/common/spl/spl_nand.c\n@@ -18,21 +18,34 @@\n \n uint32_t __weak spl_nand_get_uboot_raw_page(void)\n {\n-\treturn CONFIG_SYS_NAND_U_BOOT_OFFS;\n+\treturn IF_ENABLED_INT(CONFIG_SYS_NAND_U_BOOT_LOCATIONS,\n+\t\t\t CONFIG_SYS_NAND_U_BOOT_OFFS);\n+}\n+\n+int __weak spl_nand_get_uboot_raw_page_redund(void)\n+{\n+\tif (IF_ENABLED_INT(CONFIG_SYS_NAND_U_BOOT_LOCATIONS,\n+\t\t\t CONFIG_SYS_NAND_U_BOOT_OFFS) ==\n+\t IF_ENABLED_INT(CONFIG_SYS_NAND_U_BOOT_LOCATIONS,\n+\t\t\t CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND))\n+\t\treturn -1;\n+\n+\treturn IF_ENABLED_INT(CONFIG_SYS_NAND_U_BOOT_LOCATIONS,\n+\t\t\t CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND);\n }\n \n #if defined(CONFIG_SPL_NAND_RAW_ONLY)\n static int spl_nand_load_image(struct spl_image_info *spl_image,\n \t\t\tstruct spl_boot_device *bootdev)\n {\n+\tu32 offs = spl_nand_get_uboot_raw_page();\n+\n \tnand_init();\n \n \tprintf(\"Loading U-Boot from 0x%08x (size 0x%08x) to 0x%08x\\n\",\n-\t CONFIG_SYS_NAND_U_BOOT_OFFS, CFG_SYS_NAND_U_BOOT_SIZE,\n-\t CFG_SYS_NAND_U_BOOT_DST);\n+\t offs, CFG_SYS_NAND_U_BOOT_SIZE, CFG_SYS_NAND_U_BOOT_DST);\n \n-\tnand_spl_load_image(spl_nand_get_uboot_raw_page(),\n-\t\t\t CFG_SYS_NAND_U_BOOT_SIZE,\n+\tnand_spl_load_image(offs, CFG_SYS_NAND_U_BOOT_SIZE,\n \t\t\t map_sysmem(CFG_SYS_NAND_U_BOOT_DST,\n \t\t\t\t CFG_SYS_NAND_U_BOOT_SIZE));\n \tspl_set_header_raw_uboot(spl_image);\n@@ -127,6 +140,7 @@ static int spl_nand_load_image_os(struct spl_image_info *spl_image,\n static int spl_nand_load_image(struct spl_image_info *spl_image,\n \t\t\t struct spl_boot_device *bootdev)\n {\n+\tu32 offs = spl_nand_get_uboot_raw_page();\n \tint err;\n \n #ifdef CONFIG_SPL_NAND_SOFTECC\n@@ -155,14 +169,14 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,\n #endif\n #endif\n \t/* Load u-boot */\n-\terr = spl_nand_load_element(spl_image, bootdev, spl_nand_get_uboot_raw_page());\n-#ifdef CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND\n-#if CONFIG_SYS_NAND_U_BOOT_OFFS != CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND\n-\tif (err)\n-\t\terr = spl_nand_load_element(spl_image, bootdev,\n-\t\t\t\t\t CONFIG_SYS_NAND_U_BOOT_OFFS_REDUND);\n-#endif\n-#endif\n+\terr = spl_nand_load_element(spl_image, bootdev, offs);\n+\tif (err) {\n+\t\tint offs_redund = spl_nand_get_uboot_raw_page_redund();\n+\n+\t\tif (offs_redund >= 0 && offs != offs_redund)\n+\t\t\terr = spl_nand_load_element(spl_image, bootdev,\n+\t\t\t\t\t\t offs_redund);\n+\t}\n \tnand_deselect();\n \treturn err;\n }\n","prefixes":["v2"]}