Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2229353/?format=api
{ "id": 2229353, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2229353/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20260428064952.3965-8-chen.huei.lok@altera.com/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/1.1/projects/18/?format=api", "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 }, "msgid": "<20260428064952.3965-8-chen.huei.lok@altera.com>", "date": "2026-04-28T06:49:51", "name": "[v2,7/8] arch: arm: dts: n5x: switch to using upstream Linux DT config", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": false, "hash": "5badf79b2be5902b150456d9e7adf76739089aa5", "submitter": { "id": 92584, "url": "http://patchwork.ozlabs.org/api/1.1/people/92584/?format=api", "name": "Chen Huei Lok", "email": "chen.huei.lok@altera.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20260428064952.3965-8-chen.huei.lok@altera.com/mbox/", "series": [ { "id": 501776, "url": "http://patchwork.ozlabs.org/api/1.1/series/501776/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=501776", "date": "2026-04-28T06:49:44", "name": "socfpga: n5x: Update Boot Support for N5X", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/501776/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2229353/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2229353/checks/", "tags": {}, "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=altera.com header.i=@altera.com header.a=rsa-sha256\n header.s=selector2 header.b=T0prTSXf;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)", "phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=altera.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=altera.com header.i=@altera.com header.b=\"T0prTSXf\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=altera.com", "phobos.denx.de;\n spf=pass smtp.mailfrom=chen.huei.lok@altera.com", "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=altera.com;" ], "Received": [ "from phobos.denx.de (phobos.denx.de [85.214.62.61])\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 4g4XPr0zkQz1yHX\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 28 Apr 2026 17:39:28 +1000 (AEST)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 365848468A;\n\tTue, 28 Apr 2026 09:38:11 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 8D6C584150; Tue, 28 Apr 2026 08:50:40 +0200 (CEST)", "from CH1PR05CU001.outbound.protection.outlook.com\n (mail-northcentralusazlp170100001.outbound.protection.outlook.com\n [IPv6:2a01:111:f403:c105::1])\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 70AD983A91\n for <u-boot@lists.denx.de>; Tue, 28 Apr 2026 08:50:37 +0200 (CEST)", "from IA3PR03MB8021.namprd03.prod.outlook.com (2603:10b6:208:502::17)\n by BL4PR03MB8038.namprd03.prod.outlook.com (2603:10b6:208:58d::8)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.26; Tue, 28 Apr\n 2026 06:50:34 +0000", "from IA3PR03MB8021.namprd03.prod.outlook.com\n ([fe80::3016:b672:c683:f7ad]) by IA3PR03MB8021.namprd03.prod.outlook.com\n ([fe80::3016:b672:c683:f7ad%4]) with mapi id 15.20.9846.025; Tue, 28 Apr 2026\n 06:50:34 +0000" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,\n SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2", "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=fFpjIBOZDjF83iIzOxz/eAsP952C3A4lsgXDycDz4enkBskmIMpnJBx2YhNxzGsYq5GHvuTpu1KxsyZ4AdXUCwOFwsmNyt/1S63DuSR4rtiJrI5nqsnPFT8GkFzatJo/tEL75cTPgGed46ybiJPPuMXqFCMspDV/ruUPj4QetKxNwfT6yMST0ns7ZAPxyMHjXX5Ig1J/N3cMNkdXPmCOm8126wDDjEwC6YIXzbMDGoiTN+7Mm34d4QgnbygVP+HN4c/werRywgL4ytv/VetDIvvDXAeaJfVQhobsaNCdLx7T9gCoTmzzP55z7/MH4NKaYfsMW4bKkDR2oE20yc8dOQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=uPD2BbfsQsfmwnwRckj1t1XyKVSrKw+nBq7KF3Z+q2k=;\n b=RgoVilRe/CfnIJZ3Wbefs6VGzu/lq8P3d3vu4EmeRavsjuls+yQ0lWNO0ORQm1mJ9cURewjW5YcC2pH/+Ag2STLw7E8mhHZw34Z0tOfkWK40GF3eggxo7+vI+zr1Cr4347EARAY8qOF44yk53wgGYgdvVGEQ4OVBu7aT8j3nV3uNpZYKPO6MR9Pga6vYiw2ZZhFuQCy3EnCQxHfCRbPXXdpmFXjQyDCIkHM1V2t3qElkaRDbwIZrCCfkPf1m6dv06wgf1zXIsz+QWdS3367YThjRWtGwKdJDL7ChXmUFNWo4riqGQtM29L+9k3Of7HFc0kN9EhwUDGwUQBSDACAO8w==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=altera.com; dmarc=pass action=none header.from=altera.com;\n dkim=pass header.d=altera.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=altera.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=uPD2BbfsQsfmwnwRckj1t1XyKVSrKw+nBq7KF3Z+q2k=;\n b=T0prTSXfifA5QwFwPn48rIiw0dcbpHxpzeO2c/hu1nY7L026kDgfgYCKV3CpSyh0DVIRTSFLiact2/JKZtDJEpoc4xT9xDdd6+3UYoU8QMqxvd0qKrys42zWx+XvAD9BU1zet9lh9KJR1zXOFqQmnTp+OvxIF2qUvH6KP8sVb4DXytYujSF6L4l7cLaU6/El+h+FjhbSWOYZyr2CzZNtNJATVM4sybEtan5oU9k5/bsw5rc7XlQSTFBQ5VSYShr3NSarEJFxoj2PdqWpJ9oqXuuWh/XRaw80YMlydVAMucWkoJIFbenPYl35jKTM53jGv9VV0TcTN04xc5KFLX3NdQ==", "From": "Chen Huei Lok <chen.huei.lok@altera.com>", "To": "u-boot@lists.denx.de", "Cc": "Tien Fong Chee <tien.fong.chee@altera.com>, Tom Rini <trini@konsulko.com>,\n Marek Vasut <marex@denx.de>,\n Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>,\n Chen Huei Lok <chen.huei.lok@altera.com>,\n Alif Zakuan Yuslaimi <alif.zakuan.yuslaimi@altera.com>,\n Dinesh Maniyam <dinesh.maniyam@altera.com>,\n Boon Khai Ng <boon.khai.ng@altera.com>,\n Kok Kiang Hea <kok.kiang.hea@altera.com>", "Subject": "[PATCH v2 7/8] arch: arm: dts: n5x: switch to using upstream Linux DT\n config", "Date": "Tue, 28 Apr 2026 14:49:51 +0800", "Message-ID": "<20260428064952.3965-8-chen.huei.lok@altera.com>", "X-Mailer": "git-send-email 2.43.7", "In-Reply-To": "<20260428064952.3965-1-chen.huei.lok@altera.com>", "References": "<20260428064952.3965-1-chen.huei.lok@altera.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SJ0PR03CA0258.namprd03.prod.outlook.com\n (2603:10b6:a03:3a0::23) To IA3PR03MB8021.namprd03.prod.outlook.com\n (2603:10b6:208:502::17)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "IA3PR03MB8021:EE_|BL4PR03MB8038:EE_", "X-MS-Office365-Filtering-Correlation-Id": "cacd9bea-3f1a-4f06-4a92-08dea4f27274", "X-MS-Exchange-AtpMessageProperties": "SA", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;\n ARA:13230040|366016|1800799024|376014|56012099003|18002099003|22082099003|55112099003;", "X-Microsoft-Antispam-Message-Info": "\n tQ9978KePzsioaPCe5HFiLYkrdi1ENO2EA3D48M15m4uIhXCXQe/sNMlwpOsDhZo8oN/vZerAlBt8Dezc5h50PyE+/qSeCryYNl2PNnxhg8yqK6jesGNjnb2MbCXNCqsngPfZUKMhKBtzgw3rZ5QWN96zCydQx6z4F+WcYGG2xg7dwft6GkIoSzMu+nXMjfR8+cD4J3egt0KdUmFK+OYSGoUF3J4tm39yDyeqISBS0Ko2Gdq0SDsVhbRwx2k+eUiI2BKkNlvkmKGm2eMmopyktlo7bejlwfJU100ZyRyiodwotaqKAn9v8uQI4oKAqlSJ+f/IeMOf9EJOh6Tsv4Xsloy+Uz7BCKFkZ38fBzAG7qoLP0gJrH+dWF77D+4ibpaet8dWmXP/LteXLF5dHh/mFGUtJeppMI2npxAF9f1MpGD1XVNUF4yh/b6YKpbNkLQsLORzV6kuDjmQsBpmOiDqda5PcaJlapQ0dvz1A0vYWtCUVEYjqTix2X+p2d2/lLq9ucriNF+vFUwfEzOKf8CExy6xs/g8IPLaBcswgc8RCQssPKhtClKiHX8WXWQnnLO3kcPzujjT93obspXMdJeXiGZb1gsMJkJK7O0IB43OTPFg8WUDmrh3M2AeNRhcrrrY8G+mKV8L6k4J5w8HtLNcy4+TyMmY41NxZlVXIWfWzDnab66Nl+Hm7Sv4zIZBsauuK7De430K4+lUJ2IiTFPPH4NU/4yJNEZ0Vpp5Yx/sPI=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:IA3PR03MB8021.namprd03.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(366016)(1800799024)(376014)(56012099003)(18002099003)(22082099003)(55112099003);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n IkXPMiZhfggk+oMnj2tGnR6gFnwf1bOT+TNUZ2ezPAn0t4KRC2ebpoeMc5Jjthg5oBs+MFZ2Osywujw4ETMc/vlBIcAd8h1V6Ktvp6tmfswuTfK99iA+mRTl+1+zs1EOKXhOdn3rOhzebNqvD7rmTJM2jxeoF2cGyvEuylzAtnCby/02KmFzZtwXIqfaMiiZWj1Ju5N3l5zTfdL+Ce7aXCZdtnrRijIY9Ao+qQI6qLPGpzkVw86e5jCg0dFMiQG/VFUJRVOSDbuKoj6dDJF46moaDD+hT2huDTqDK4jZ7FC238ntROAbFrxuxJ0Q/pOSVck4XYUlmhu33KDAdMW+HpEbUnPQfy9oiKqcYUxKw0If4mFz30NyJvMJx0WygzYlxLRF30N9nc3lfVt0UBNRGjYo9xn/m3BnhvAheEApsUbxtPGK1X2NpmciZTDQNbLHN2tFG8AFNCf1mLi/u0mioyp4FbsjZAIG/XNvEX9tKYniIjezvGsHr9RedBWzy0ZGpJ++zj1NH2E9fNL0pVuWo4gTLmt3yLfKlWQ1y9wiyzqkPPuqJeevLdLpuEISaWLjoR9UR+NYCbWCuIGZPutmYkwVs0ftA+W5L7Rz96dsv/h9ollfcwug2HBdLJpErF9gLTkH73N3AJ49bmR7Eof02uPPfmgZIkaKUAc8I+YBR4kmGlQCYl+VGD0rMPOlQNPI2UB4uMJ91M/80HbAUBQABzqvYAX4L6OAvNforrF4tezFu9eC8qrRwxiFfxf8BZt65fMZboOX2wxiW41wqJS+4Yyr6bhqPcGwSGOOjCFKmZAbgUsY80qw6oWn/Fwb2OLn/JVNLdVj5efRDYrzmjvyPOgW4xuigW2CSgvf3lsq4j7rI/fMxGGR6Utu/ubA2oIE1F/D2Lu4tHtg+9sKU76lT7Z02d/inQl2l0Io5TJTv3q6UVyXkeFbCL47tDcweq9VH2dYjb3tFBbLdwzwmd7/JCd+PStW5TgG4u0Gm5J/N+d1xmm56OD6ILhnrhOOi4pqNhKI19fFUjEzVH5vcwRajr84DUSagOdEevtHo8WSDDOuSy5fr/m0IRDOFlN2C3+zx3HbM5t+7Gp5S6AgPetRzWbBvsupNQfUlt3EVkzGF9TSfi8AuJ16uIXFdVlnBgIq/Z5g7JZwlSsN40v52pe7lrvxpQL9jgsEmswUbMi45uaJMpdKg6/qIRY3m/jG8LBdJ1oxdJsxmAsvoCjukIqY51kCWLS80fCr6UyxOSd5pDiad/uFNXkrXcqoOyVhjFSrscawmVIoISnWehEB82UOX+t9i8BkrGIp9ez3e3NOsDtBSZeYcTs5ee8R6OwZdcR/3LX91DjmE8QvqPbPguhCVh9jBq7fRvu5XacoI8sDXrZDg63ktcn6RffdjSzOkWuEw4lbGZ5+QOtLukInlw8UtRJH7CcOa6et1/G2MVHc4lPQapcGt36+biaUUFJTZ5ezvshNxAOs/4CEsmCUbMwa+cz0NAI0/2ic/+NxaBgRGO9sntPqTRuEK6iBo5fvf58R00JaIFG1e3j1fAD4qxPtyJ/yirGFuTJb345JByYEv6f/F4yyWqiNiPvjznJSwt5Stg9BlTR1i88sPoDnzx+vtLtQWKsiDM5rw7QnokdjwG7H/cPwYfTUEmyLFTSXlkoPySk9Y5+PYRjdJ5T5/YWaX7fqvL1F2FEL6lQEyQFBAMhE2ZEqjWwR7cT+ZqmlqHFTMjEFB2HZnI5G57byhxIF0ScEyNg9lEFfeaT7R3ZrelU=", "X-OriginatorOrg": "altera.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n cacd9bea-3f1a-4f06-4a92-08dea4f27274", "X-MS-Exchange-CrossTenant-AuthSource": "IA3PR03MB8021.namprd03.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "28 Apr 2026 06:50:34.5955 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "fbd72e03-d4a5-4110-adce-614d51f2077a", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n So2IbmQ7pnsa8NfxZMI3wfY3G3zQtL1hslAroF1LdgCyDJdRZnjFhMF1WgNfcqcYwd3RyRPG2jTXVtLoAlIJ8NBydKnSYTJa/k7ybEcqH84=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BL4PR03MB8038", "X-Mailman-Approved-At": "Tue, 28 Apr 2026 09:38:07 +0200", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.8 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "Migrate the legacy n5x platform to use the upstream Linux device tree\nconfiguration. This helps reduce maintenance overhead and aligns U-Boot\nwith the Linux kernel's DTS hierarchy and naming conventions.\n\nThis change improves consistency between U-Boot and Linux by removing\ncustom/legacy DTS handling and instead relying on the standardized\ndefinitions provided by the upstream Linux DTS.\n\nSigned-off-by: Chen Huei Lok <chen.huei.lok@altera.com>\n---\n arch/arm/dts/Makefile | 1 -\n arch/arm/dts/socfpga_n5x-u-boot.dtsi | 17 +++++++++++++++--\n arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi | 13 ++++++-------\n configs/socfpga_n5x_defconfig | 3 ++-\n 4 files changed, 23 insertions(+), 11 deletions(-)", "diff": "diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile\nindex e79cfb4b633..86c6b4f465e 100644\n--- a/arch/arm/dts/Makefile\n+++ b/arch/arm/dts/Makefile\n@@ -460,7 +460,6 @@ dtb-$(CONFIG_ARCH_SOCFPGA) +=\t\t\t\t\\\n \tsocfpga_cyclone5_vining_fpga.dtb\t\t\\\n \tsocfpga_cyclone5_ac501soc.dtb\t\t\t\\\n \tsocfpga_cyclone5_ac550soc.dtb\t\t\t\\\n-\tsocfpga_n5x_socdk.dtb\t\t\t\t\\\n \tsocfpga_stratix10_socdk.dtb\n \n dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb\t\\\ndiff --git a/arch/arm/dts/socfpga_n5x-u-boot.dtsi b/arch/arm/dts/socfpga_n5x-u-boot.dtsi\nindex dbfd2abfd59..16b92ef48f4 100644\n--- a/arch/arm/dts/socfpga_n5x-u-boot.dtsi\n+++ b/arch/arm/dts/socfpga_n5x-u-boot.dtsi\n@@ -10,7 +10,13 @@\n #include <dt-bindings/clock/n5x-clock.h>\n \n /{\n-\tmemory {\n+\taliases {\n+\t\tspi0 = &qspi;\n+\t\ti2c0 = &i2c1;\n+\t};\n+\n+\tmemory@0 {\n+\t\tdevice_type = \"memory\";\n \t\t#address-cells = <2>;\n \t\t#size-cells = <2>;\n \t\tbootph-all;\n@@ -121,6 +127,14 @@\n \n &qspi {\n \tbootph-all;\n+\tcompatible = \"cdns,qspi-nor\";\n+\tflash0: flash@0 {\n+\t};\n+};\n+\n+&flash0 {\n+\t#address-cells = <1>;\n+\t#size-cells = <1>;\n };\n \n &rst {\n@@ -200,7 +214,6 @@\n \n &usb0 {\n \tclocks = <&clkmgr N5X_USB_CLK>;\n-\tdisable-over-current;\n \tbootph-all;\n };\n \ndiff --git a/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi\nindex 1f7e31bcae3..1bed87c1231 100644\n--- a/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi\n+++ b/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi\n@@ -8,12 +8,11 @@\n #include \"socfpga_n5x-u-boot.dtsi\"\n \n /{\n-\taliases {\n-\t\tspi0 = &qspi;\n-\t\ti2c0 = &i2c1;\n+\tchosen {\n+\t\tu-boot,spl-boot-order = &mmc;\n \t};\n \n-\tmemory {\n+\tmemory@0 {\n \t\t/*\n \t\t * Memory type: DDR4 (non-interleaving mode)\n \t\t * 16GB\n@@ -38,10 +37,10 @@\n };\n \n &flash0 {\n-\tcompatible = \"jedec,spi-nor\";\n-\tspi-tx-bus-width = <4>;\n-\tspi-rx-bus-width = <4>;\n \tbootph-all;\n+\tcdns,page-size = <256>;\n+\tcdns,block-size = <16>;\n+\t/delete-property/ cdns,read-delay;\n };\n \n &gmac0 {\ndiff --git a/configs/socfpga_n5x_defconfig b/configs/socfpga_n5x_defconfig\nindex 17dc55aa41a..8ad6316bce4 100644\n--- a/configs/socfpga_n5x_defconfig\n+++ b/configs/socfpga_n5x_defconfig\n@@ -10,7 +10,8 @@ CONFIG_SF_DEFAULT_MODE=0x2003\n CONFIG_ENV_SIZE=0x1000\n CONFIG_ENV_OFFSET=0x200\n CONFIG_DM_GPIO=y\n-CONFIG_DEFAULT_DEVICE_TREE=\"socfpga_n5x_socdk\"\n+CONFIG_DEFAULT_DEVICE_TREE=\"intel/socfpga_n5x_socdk\"\n+CONFIG_OF_UPSTREAM=y\n CONFIG_DM_RESET=y\n CONFIG_SPL_STACK=0xffe3f000\n CONFIG_SPL_TEXT_BASE=0xFFE00000\n", "prefixes": [ "v2", "7/8" ] }