Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1613423/?format=api
{ "id": 1613423, "url": "http://patchwork.ozlabs.org/api/patches/1613423/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20220405131237.405-3-pali@kernel.org/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/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, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20220405131237.405-3-pali@kernel.org>", "list_archive_url": null, "date": "2022-04-05T13:12:31", "name": "[2/8] powerpc: mpc85xx: Remove duplicate u-boot-nand.lds", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "cb2eecb5e71313d0630dbc11817da5be5cafb874", "submitter": { "id": 78810, "url": "http://patchwork.ozlabs.org/api/people/78810/?format=api", "name": "Pali Rohár", "email": "pali@kernel.org" }, "delegate": { "id": 87636, "url": "http://patchwork.ozlabs.org/api/users/87636/?format=api", "username": "priyankajain", "first_name": "Priyanka", "last_name": "Jain", "email": "priyanka.jain@nxp.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20220405131237.405-3-pali@kernel.org/mbox/", "series": [ { "id": 293592, "url": "http://patchwork.ozlabs.org/api/series/293592/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=293592", "date": "2022-04-05T13:12:33", "name": "powerpc: mpc85xx: Fix and cleanup mpc85xx code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/293592/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1613423/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1613423/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=mKzFGv/Y;\n\tdkim-atps=neutral", "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=<UNKNOWN>)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org", "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=kernel.org header.i=@kernel.org header.b=\"mKzFGv/Y\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org", "phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org" ], "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 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4KXp7H3kzJz9sCD\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 5 Apr 2022 23:16:11 +1000 (AEST)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 8404C83BE4;\n\tTue, 5 Apr 2022 15:15:00 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id 7818F83BDB; Tue, 5 Apr 2022 15:14:38 +0200 (CEST)", "from dfw.source.kernel.org (dfw.source.kernel.org\n [IPv6:2604:1380:4641:c500::1])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 8819683BBE\n for <u-boot@lists.denx.de>; Tue, 5 Apr 2022 15:14:16 +0200 (CEST)", "from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by dfw.source.kernel.org (Postfix) with ESMTPS id 01E0161868;\n Tue, 5 Apr 2022 13:14:15 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPSA id 1AC03C385A2;\n Tue, 5 Apr 2022 13:14:14 +0000 (UTC)", "by pali.im (Postfix)\n id 8FF904A23; Tue, 5 Apr 2022 15:14:11 +0200 (CEST)" ], "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,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,\n SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no\n version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1649164454;\n bh=2TnBz90lO85FmbIs7yWNoRDsoeVitmUBf1ECLau91PE=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=mKzFGv/Y6w5daUe2U+LmV/HALFLn1FbZjuM0Vt6OR+A/+JsTTxw8YtvpCrjqKqLYe\n wFxm/tGPmAJhjCL3rkHFHu5UJ+6tE1DRr1QcZnrcpZJMcailPFZhnunLtXkSvMwcbq\n D0SQjw2vbEAJeESYtkyrhKG2dk3fCLLXAlndpG89VOTC8Zvr0Bld1od2ncjmPLU2le\n v+VidRh2Y3gjWJlr3DSuCQgBUrawGSQM/tgXMXi6aBEa3jkYUqV1I2IBfEnkq1mgrO\n M7StVPWVTTRRXjo1MOga6pkhlfTi8jcqrpiMgQ2BCDJS47g2DAfoiHC7tz9qc6KPB2\n +XQHoWpKXVC5w==", "From": "=?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>", "To": "Priyanka Jain <priyanka.jain@nxp.com>, Qiang Zhao <qiang.zhao@nxp.com>,\n Shengzhou Liu <Shengzhou.Liu@nxp.com>, Alexander Graf <agraf@csgraf.de>,\n Bin Meng <bmeng.cn@gmail.com>, Wolfgang Denk <wd@denx.de>,\n Sinan Akman <sinan@writeme.com>", "Cc": "u-boot@lists.denx.de", "Subject": "[PATCH 2/8] powerpc: mpc85xx: Remove duplicate u-boot-nand.lds", "Date": "Tue, 5 Apr 2022 15:12:31 +0200", "Message-Id": "<20220405131237.405-3-pali@kernel.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20220405131237.405-1-pali@kernel.org>", "References": "<20220405131237.405-1-pali@kernel.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "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.5 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "It looks like that mpc85xx linker script u-boot-nand.lds provides same\nfunctionality as default mpc85xx linker script u-boot.lds when config\noption CONFIG_SYS_MPC85XX_NO_RESETVEC is defined.\n\nSo adjust include config files for NAND defconfigs to define\nCONFIG_SYS_MPC85XX_NO_RESETVEC and use default mpc85xx linker script\nu-boot.lds. And finally remove duplicate u-boot-nand.lds linker script.\n\nSigned-off-by: Pali Rohár <pali@kernel.org>\n---\n arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 97 ------------------------\n configs/P1010RDB-PA_36BIT_NAND_defconfig | 2 -\n configs/P1010RDB-PA_NAND_defconfig | 2 -\n configs/P1010RDB-PB_36BIT_NAND_defconfig | 2 -\n configs/P1010RDB-PB_NAND_defconfig | 2 -\n configs/P1020RDB-PC_36BIT_NAND_defconfig | 2 -\n configs/P1020RDB-PC_NAND_defconfig | 2 -\n configs/P1020RDB-PD_NAND_defconfig | 2 -\n configs/P2020RDB-PC_36BIT_NAND_defconfig | 2 -\n configs/P2020RDB-PC_NAND_defconfig | 2 -\n configs/T1024RDB_NAND_defconfig | 2 -\n configs/T1042D4RDB_NAND_defconfig | 2 -\n configs/T2080QDS_NAND_defconfig | 2 -\n configs/T2080RDB_NAND_defconfig | 2 -\n configs/T2080RDB_revD_NAND_defconfig | 2 -\n include/configs/P1010RDB.h | 4 +\n include/configs/T102xRDB.h | 3 +\n include/configs/T104xRDB.h | 3 +\n include/configs/T208xQDS.h | 3 +\n include/configs/T208xRDB.h | 3 +\n include/configs/p1_p2_rdb_pc.h | 4 +\n 21 files changed, 20 insertions(+), 125 deletions(-)\n delete mode 100644 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds", "diff": "diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\ndeleted file mode 100644\nindex 75b0285e4e51..000000000000\n--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\n+++ /dev/null\n@@ -1,97 +0,0 @@\n-/* SPDX-License-Identifier: GPL-2.0+ */\n-/*\n- * Copyright 2009-2012 Freescale Semiconductor, Inc.\n- */\n-\n-#include \"config.h\"\n-\n-#ifndef CONFIG_SYS_MONITOR_LEN\n-#define CONFIG_SYS_MONITOR_LEN\t0x80000\n-#endif\n-\n-OUTPUT_ARCH(powerpc)\n-/* Do we need any of these for elf?\n- __DYNAMIC = 0; */\n-PHDRS\n-{\n- text PT_LOAD;\n- bss PT_LOAD;\n-}\n-\n-SECTIONS\n-{\n- /* Read-only sections, merged into text segment: */\n- . = + SIZEOF_HEADERS;\n- .interp : { *(.interp) }\n- .text :\n- {\n- *(.text*)\n- } :text\n- _etext = .;\n- PROVIDE (etext = .);\n- .rodata :\n- {\n- *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))\n- } :text\n-\n- /* Read-write section, merged into data segment: */\n- . = (. + 0x00FF) & 0xFFFFFF00;\n- _erotext = .;\n- PROVIDE (erotext = .);\n- .reloc :\n- {\n- _GOT2_TABLE_ = .;\n- KEEP(*(.got2))\n- KEEP(*(.got))\n- _FIXUP_TABLE_ = .;\n- KEEP(*(.fixup))\n- }\n- __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;\n- __fixup_entries = (. - _FIXUP_TABLE_) >> 2;\n-\n- .data :\n- {\n- *(.data*)\n- *(.sdata*)\n- }\n- _edata = .;\n- PROVIDE (edata = .);\n-\n- . = .;\n-\n- .u_boot_list : {\n-\tKEEP(*(SORT(.u_boot_list*)));\n- }\n-\n- . = .;\n- __start___ex_table = .;\n- __ex_table : { *(__ex_table) }\n- __stop___ex_table = .;\n-\n- . = ALIGN(256);\n- __init_begin = .;\n- .text.init : { *(.text.init) }\n- .data.init : { *(.data.init) }\n- . = ALIGN(256);\n- __init_end = .;\n- _end = .;\n-\n- .bootpg ADDR(.text) - 0x1000 :\n- {\n- KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg))\n- } :text = 0xffff\n-\n- . = ADDR(.text) + CONFIG_SYS_MONITOR_LEN;\n-\n- __bss_start = .;\n- .bss (NOLOAD) :\n- {\n- *(.sbss*)\n- *(.bss*)\n- *(COMMON)\n- } :bss\n-\n- . = ALIGN(4);\n- __bss_end = . ;\n- PROVIDE (end = .);\n-}\ndiff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig\nindex 314d73a8ae1e..d9887d78ad2f 100644\n--- a/configs/P1010RDB-PA_36BIT_NAND_defconfig\n+++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig\n@@ -15,8 +15,6 @@ CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_P1010RDB_PA=y\n CONFIG_PHYS_64BIT=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\n CONFIG_OF_BOARD_SETUP=y\ndiff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig\nindex fde12ea861b6..1b25ea97f70a 100644\n--- a/configs/P1010RDB-PA_NAND_defconfig\n+++ b/configs/P1010RDB-PA_NAND_defconfig\n@@ -14,8 +14,6 @@ CONFIG_SPL_DRIVERS_MISC=y\n CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_P1010RDB_PA=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\n CONFIG_OF_BOARD_SETUP=y\ndiff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig\nindex f6dfc16edef3..cfc9c6da9514 100644\n--- a/configs/P1010RDB-PB_36BIT_NAND_defconfig\n+++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig\n@@ -15,8 +15,6 @@ CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_P1010RDB_PB=y\n CONFIG_PHYS_64BIT=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\n CONFIG_OF_BOARD_SETUP=y\ndiff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig\nindex be614b85b725..4df93a73f519 100644\n--- a/configs/P1010RDB-PB_NAND_defconfig\n+++ b/configs/P1010RDB-PB_NAND_defconfig\n@@ -14,8 +14,6 @@ CONFIG_SPL_DRIVERS_MISC=y\n CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_P1010RDB_PB=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\n CONFIG_OF_BOARD_SETUP=y\ndiff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig\nindex a8bc420f638e..641862c7d05f 100644\n--- a/configs/P1020RDB-PC_36BIT_NAND_defconfig\n+++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig\n@@ -15,8 +15,6 @@ CONFIG_MPC85xx=y\n # CONFIG_CMD_ERRATA is not set\n CONFIG_TARGET_P1020RDB_PC=y\n CONFIG_PHYS_64BIT=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig\nindex 3a41738eede4..45414d4d467c 100644\n--- a/configs/P1020RDB-PC_NAND_defconfig\n+++ b/configs/P1020RDB-PC_NAND_defconfig\n@@ -14,8 +14,6 @@ CONFIG_SPL=y\n CONFIG_MPC85xx=y\n # CONFIG_CMD_ERRATA is not set\n CONFIG_TARGET_P1020RDB_PC=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig\nindex bc277c600d01..be048d6b4ae1 100644\n--- a/configs/P1020RDB-PD_NAND_defconfig\n+++ b/configs/P1020RDB-PD_NAND_defconfig\n@@ -14,8 +14,6 @@ CONFIG_SPL=y\n CONFIG_MPC85xx=y\n # CONFIG_CMD_ERRATA is not set\n CONFIG_TARGET_P1020RDB_PD=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig\nindex 3f3d30f2f132..4dec31dd6f16 100644\n--- a/configs/P2020RDB-PC_36BIT_NAND_defconfig\n+++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig\n@@ -15,8 +15,6 @@ CONFIG_MPC85xx=y\n # CONFIG_CMD_ERRATA is not set\n CONFIG_TARGET_P2020RDB=y\n CONFIG_PHYS_64BIT=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig\nindex 73e8a5c5714c..ac47534286be 100644\n--- a/configs/P2020RDB-PC_NAND_defconfig\n+++ b/configs/P2020RDB-PC_NAND_defconfig\n@@ -14,8 +14,6 @@ CONFIG_SPL=y\n CONFIG_MPC85xx=y\n # CONFIG_CMD_ERRATA is not set\n CONFIG_TARGET_P2020RDB=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig\nindex 20ded48a3515..982075f9458b 100644\n--- a/configs/T1024RDB_NAND_defconfig\n+++ b/configs/T1024RDB_NAND_defconfig\n@@ -14,8 +14,6 @@ CONFIG_SPL_DRIVERS_MISC=y\n CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_T1024RDB=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig\nindex a755d9c70296..5ef496a4bafb 100644\n--- a/configs/T1042D4RDB_NAND_defconfig\n+++ b/configs/T1042D4RDB_NAND_defconfig\n@@ -11,8 +11,6 @@ CONFIG_SPL_DRIVERS_MISC=y\n CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_T1042D4RDB=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig\nindex 1b6ef8aaa1f2..261c8ecc8630 100644\n--- a/configs/T2080QDS_NAND_defconfig\n+++ b/configs/T2080QDS_NAND_defconfig\n@@ -16,8 +16,6 @@ CONFIG_SPL_DRIVERS_MISC=y\n CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_T2080QDS=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig\nindex 1c55d30b5e18..523226a4aaa4 100644\n--- a/configs/T2080RDB_NAND_defconfig\n+++ b/configs/T2080RDB_NAND_defconfig\n@@ -17,8 +17,6 @@ CONFIG_SPL_DRIVERS_MISC=y\n CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_T2080RDB=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig\nindex ae924b18173f..5e0ee9c0616d 100644\n--- a/configs/T2080RDB_revD_NAND_defconfig\n+++ b/configs/T2080RDB_revD_NAND_defconfig\n@@ -18,8 +18,6 @@ CONFIG_SPL=y\n CONFIG_MPC85xx=y\n CONFIG_TARGET_T2080RDB=y\n CONFIG_T2080RDB_REV_D=y\n-CONFIG_SYS_CUSTOM_LDSCRIPT=y\n-CONFIG_SYS_LDSCRIPT=\"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds\"\n CONFIG_MP=y\n CONFIG_FIT=y\n CONFIG_FIT_VERBOSE=y\ndiff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h\nindex 106d1e6a4b7e..9b79e19764fc 100644\n--- a/include/configs/P1010RDB.h\n+++ b/include/configs/P1010RDB.h\n@@ -81,6 +81,10 @@\n #define CONFIG_SYS_NAND_U_BOOT_SIZE\t(128 << 10)\n #define CONFIG_SYS_NAND_U_BOOT_DST\t0xD0000000\n #define CONFIG_SYS_NAND_U_BOOT_START\t0xD0000000\n+#else\n+#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR\n+#define CONFIG_SYS_MPC85XX_NO_RESETVEC\n+#endif\n #endif\n #define CONFIG_SPL_PAD_TO\t0x20000\n #define CONFIG_TPL_PAD_TO\t0x20000\ndiff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h\nindex d24cfce8b3b9..9782af2039f1 100644\n--- a/include/configs/T102xRDB.h\n+++ b/include/configs/T102xRDB.h\n@@ -41,6 +41,9 @@\n #define CONFIG_SYS_NAND_U_BOOT_SIZE\t(768 << 10)\n #define CONFIG_SYS_NAND_U_BOOT_DST\t0x30000000\n #define CONFIG_SYS_NAND_U_BOOT_START\t0x30000000\n+#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR\n+#define CONFIG_SYS_MPC85XX_NO_RESETVEC\n+#endif\n #endif\n \n #ifdef CONFIG_SPIFLASH\ndiff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h\nindex 9433f14227bb..1159d508ff7e 100644\n--- a/include/configs/T104xRDB.h\n+++ b/include/configs/T104xRDB.h\n@@ -40,6 +40,9 @@\n #endif\n #define CONFIG_SYS_NAND_U_BOOT_DST\t0x30000000\n #define CONFIG_SYS_NAND_U_BOOT_START\t0x30000000\n+#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR\n+#define CONFIG_SYS_MPC85XX_NO_RESETVEC\n+#endif\n #endif\n \n #ifdef CONFIG_SPIFLASH\ndiff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h\nindex a41f9f0d9b83..43ae78b388f5 100644\n--- a/include/configs/T208xQDS.h\n+++ b/include/configs/T208xQDS.h\n@@ -44,6 +44,9 @@\n #define CONFIG_SYS_NAND_U_BOOT_SIZE\t(768 << 10)\n #define CONFIG_SYS_NAND_U_BOOT_DST\t0x00200000\n #define CONFIG_SYS_NAND_U_BOOT_START\t0x00200000\n+#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR\n+#define CONFIG_SYS_MPC85XX_NO_RESETVEC\n+#endif\n #endif\n \n #ifdef CONFIG_SPIFLASH\ndiff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h\nindex 7165ba082833..0a15ec0dc985 100644\n--- a/include/configs/T208xRDB.h\n+++ b/include/configs/T208xRDB.h\n@@ -39,6 +39,9 @@\n #define CONFIG_SYS_NAND_U_BOOT_SIZE\t(768 << 10)\n #define CONFIG_SYS_NAND_U_BOOT_DST\t0x00200000\n #define CONFIG_SYS_NAND_U_BOOT_START\t0x00200000\n+#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR\n+#define CONFIG_SYS_MPC85XX_NO_RESETVEC\n+#endif\n #endif\n \n #ifdef CONFIG_SPIFLASH\ndiff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h\nindex 92008cd38e49..42adfabe509c 100644\n--- a/include/configs/p1_p2_rdb_pc.h\n+++ b/include/configs/p1_p2_rdb_pc.h\n@@ -114,6 +114,10 @@\n #define CONFIG_SYS_NAND_U_BOOT_SIZE\t(128 << 10)\n #define CONFIG_SYS_NAND_U_BOOT_DST\t0xf8f80000\n #define CONFIG_SYS_NAND_U_BOOT_START\t0xf8f80000\n+#else\n+#ifndef CONFIG_MPC85XX_HAVE_RESET_VECTOR\n+#define CONFIG_SYS_MPC85XX_NO_RESETVEC\n+#endif\n #endif /* not CONFIG_TPL_BUILD */\n \n #define CONFIG_SPL_PAD_TO\t\t0x20000\n", "prefixes": [ "2/8" ] }