From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D55CFC433EF for ; Thu, 16 Jun 2022 08:58:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C3A9282105; Thu, 16 Jun 2022 10:58:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="OrEeVeya"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E76DB805FE; Thu, 16 Jun 2022 10:58:05 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20620.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::620]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 84D5A84314 for ; Thu, 16 Jun 2022 10:57:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bzirw/OpxPvVuB6/yea5EcAaqi9tA56+PDUdtsyzkhwtKHiy70tcRQ11XguxUTKTx0ok6c/GxNfibIAQQI/aNdixIstIrSEW7qjFT97Ru2G6IW2DxaD9XMCSzlqZ/Q0OHxnwvkQdZ6jpmjUqBAfatPcBCHpN/PLvwaqIdYTOcEQQnbdWZjWatXTQqXjieAv9hGhF2JrDmzBd2iv9ZlidUVe5jRvz4sQHL5J7s8ys/q7H1JnMwe3PP2tZKZVUwTyLfW3GavfJFMIQB5gWrnrTzZcCC0971WB8VQIhKGvLISF6wXbdfsZK6HjKHd8ZrjySM5rDMEAsG8rqkpLCJqqyYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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; bh=3/DIHBghvZdjqeqT7f5lFyDsPGCZYUuoDHdydmsGORU=; b=m3GXUcyDQJUaPwMxzX1nOntMQU8ZHi06MUwj7x6hAaDWRqVsWZzCikoUFkOw4Ky2HNhYoBft3+e7HUn6ZSGYjEY5An5Fg6+qe8Hnw3HBTFYYFcLka/MB7per6FzfPD/0aKpPk0hLAOk1A4Npc4cpWyLxmtEIN8MNhAhF/3hQsvoNRGlApLXgkz+wgnQUq53bA3ZWbMLQFBba1edNZAYlnPC19gZUgifba3ojWn+HuH2VN4Ce8q/6tD/YC5tpKOvxkuA0otaTbRT5EjJTFHR45/18QaGti0vU4aGcrPyTRt0f1V1XNEWWF1EU3nJb3gcbRgUk4bXq0EX+UCqn1SQpQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3/DIHBghvZdjqeqT7f5lFyDsPGCZYUuoDHdydmsGORU=; b=OrEeVeyae/G3gn+c1DodujzqNU8P2gXdZJhOlhJhox5xvV3vxBBPyHIBY+ZQYTkNuBeXucBHvs8c4Z9Cw7V6X2VVg70bvhe13bQ5Xc//2BeKtIqeb80NgA8p7evD47H5+OeYM9kjG7+Ciu6AIPrcGR6OLSwVn3/Eg0hPLf2OQ5U= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB6PR04MB3240.eurprd04.prod.outlook.com (2603:10a6:6:11::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Thu, 16 Jun 2022 08:57:55 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5353.014; Thu, 16 Jun 2022 08:57:55 +0000 Message-ID: <4fea4901-2d25-b867-617b-e03c152cffce@oss.nxp.com> Date: Thu, 16 Jun 2022 16:57:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH v2] powerpc: mpc85xx: Set TEXT_BASE addresses to real base values To: =?UTF-8?Q?Pali_Roh=c3=a1r?= , "Priyanka Jain (OSS)" Cc: Qiang Zhao , Shengzhou Liu , Alexander Graf , Bin Meng , Wolfgang Denk , Sinan Akman , u-boot@lists.denx.de References: <20220405131237.405-8-pali@kernel.org> <20220425122947.15126-1-pali@kernel.org> From: "Peng Fan (OSS)" In-Reply-To: <20220425122947.15126-1-pali@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2P153CA0029.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::16) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee5ffe8f-d03d-4ab9-03a6-08da4f764d5f X-MS-TrafficTypeDiagnostic: DB6PR04MB3240:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xC77qnMzB8kdnS2RtRh3K7myK9tzV1Lifi9SZnzRxvH+HcPBINbTlEPM9GGqLyAosAlWe46poAGfkLFUBMXBVRXlIi6Tw03EbYkKsnfwD4Zivg+rWo/XZi5mKg+qM1iieJ7+DCXpSqc8LvQtd99mepIYEbr6AW8h+CoQeAoXlNhrDF7D04Iq2/jsPn+w10deGndQjjFns6Vd9hVNDntVgfqlTfSlkt78eKEM2qsgFjoHxRcx5S0Ecz0rAwivWuPaV72T7vhiuyz58iGEYzGlAjcXH2qzPhG1n4SN+rJM2zSYd/7x6sCNdN01KJPGxFqkB8v5OsZQmXAUiL8203+w1UwI280g11V0fBZJLj3pg3Ka2f8M1Z8fo5L1O9OHVA9SEg8HSIQYOHNo84bEZKzrL7kWugrHMu0AUcUyKbjBC9gx39RKDsWzDpxtynatteZyUASlWPW5E3LTdybfiISHHv+NI5SfFZRl08jvqBCvXb35XbwAPBsNhIENLZ87Q6VPk/3pQdL0GCPWLTGFgqy5rtE6DtQ6OLjm+0gQ5mSysarktiFTcFHoWCt1/ssTuZYvgSZtzQceC/zuJ6JSm2Dgl5Tts/LBx2bUTo0r00vyq7ogLh2ZwraATQgvIK3kLMuXrfJxvWXqi8ssnpBajIycVk1+IzeBWsi1w9olc0ZH5Gb2QxigPpKbGkF2Rmq1w27npzEiBljXjHlQ2D12N0dKdLfwElk2291z9P9d6P7xfieIUkO6q/XWav2Ucc/DDLZ7Mpyhowz3WnObanbUkmUkmQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(366004)(66946007)(86362001)(31696002)(6666004)(316002)(5660300002)(8936002)(26005)(6486002)(508600001)(19627235002)(66556008)(4326008)(6636002)(54906003)(8676002)(66476007)(110136005)(38100700002)(6512007)(31686004)(38350700002)(83380400001)(2616005)(2906002)(30864003)(186003)(52116002)(6506007)(43740500002)(45980500001)(579004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TUs0QnEyR3lxTGI2NTAxK2YySjR5T2owQnFSVllESktsb202UnNyQ3o3TXFS?= =?utf-8?B?b2ZLT0RYUGJsTnpKUzRBb3lwYVZrTW1Kcm9lZWNrdmJTdEdwcHN0aTlsQUlj?= =?utf-8?B?bHNNZFZqQnRNK0pkV0pkNUIwWHVBd05oN2RVZ2lxMnFaYkhodFgvV3hVc2Fy?= =?utf-8?B?QTdIcEQzcnVoQ2VYVCsrVVdyWGl0WDdIVkJTR3FxZXNQcmRMOUFnNGFhOHYv?= =?utf-8?B?WEVQZmZDaXpBYXA2Y2pWa1doSVlPQ3lrdG9HUTRBVFJGMDM4RUI0d1grQ0lu?= =?utf-8?B?SlppeFZvQUZEQ0I0d0l0QkkvTmN5bkx0WE9CUGNpSG54eWRmTWNBT1BWNkZj?= =?utf-8?B?dGIvWDhNUUo4NkxWWEgwcWFMOE9pL1JRaEFqM0RPUGVuUjc4WWNOb000em55?= =?utf-8?B?N3U5R2dWMEc1NzhTWGVTYlo0MmQrRnV6ZjFXWklucnVVZGtMbTZzVXRJY3d3?= =?utf-8?B?WDMyN2s4bC9aVWNQNExacGorVEVKbFM5TmpzamxwdjR4dC9EUzBrSjFRaWdh?= =?utf-8?B?VlJxTk00WFZtS0ZZRnN5QW9WUmt1azBIQmh2NXU0dmlhT01BOWNrby84QVZN?= =?utf-8?B?N1VGUU9sc1ErTU53SXB3YVkvaGxzY1cySDVvejJhQWtEeTdubHk5dVNhbWgr?= =?utf-8?B?Ly9jYkh6UGdydkJCYzdJUVVpUEtuVnptZnNVZ1RiUmFUVFNDS1BhMk9EOXUx?= =?utf-8?B?K0ZIQnpjUzRoRlRtcksxUDdpeGZ0RkoxRE1zOVFQZ0dnR0lLQitlU1ZxcGtU?= =?utf-8?B?SHZoZC9KSXExMlBWZTNLY1IrTjJBS0hvSUdIR0szY3pIRUM4K1ZWS3FBNFkv?= =?utf-8?B?ZXkyYUFrNHp3UXVFb083Rk9LcmN4ZUt1MWNQaTVFMlFGTjFTallhY1N6Y0h0?= =?utf-8?B?Mk5TbjAvSmpWWHAyTU44YVJOaUtjOFVIYi91NVZBdlNYT1JqdFdxZXVTMVRh?= =?utf-8?B?bHZpTW5wZG5oWU8xTWx0cjJsSDBmWTZQVUhrTXhRRVh3M3luVXZveGRXc0xU?= =?utf-8?B?MVFhVFNKeWUrYXpadmpFOGtmSmgxQmphVzJOeWVMV1dOS0tpZDZrVVZEeFZV?= =?utf-8?B?QitVSGJ6SkhqRHdybW4xTjAwZXBtOGZMQk1sdzhZbmtDRGVhSWV2OWdoTXVZ?= =?utf-8?B?NDFIa3J1UzBFYXhzWUx0QkFWMzBMczhRS3NIZlpWYXMxazhMZzZpRHdWQTZ5?= =?utf-8?B?N1Nmejl4amNOYlpER2R0RlpERVAwKzh6TW9wUko1Vkp1WmFZMDJxOXZqT1Jw?= =?utf-8?B?REdIZHpDeFNYZDNSdzZFUGVlS1A4a2JBY1RlbjBkcG1zOURNRzN4V2Y2Rk5x?= =?utf-8?B?Tml1aGlhdEJ0OVgzYUwyd2VabEtaWDd3TVkvR1BmQmlHaGVDWTBxZ2kvQVdo?= =?utf-8?B?OWM5ZGpubituWk9tWDA3WjNEakpMZ0tMQ0tZU1pZR3lCcDVRVlFKd2JjWEhB?= =?utf-8?B?UnV5SEtZdHlOdUhOdThMVFNVditmcVpzVitaNE11cWtoN3c0a212M1h1dklm?= =?utf-8?B?eUhTNi9HaWhWWDRZTllWNDcvSDlLYmx3UUJjVUMvMWpOdXBEREtIRjN2WFBH?= =?utf-8?B?eXpBN1M0c3V0SWtZRlpKN2xKYzljRWZ2VTQ0bzRKaU4vc0NmeDZJQkJ6VWFR?= =?utf-8?B?OW5wZzhjK1ZqNGY3bGJjQ1E0Q2l0ZEJKRXc5UnJGQ3lrQmQ5c3QzSkNObWk0?= =?utf-8?B?SU1VOHp4aGFQT0U1WUd1cW5MTHFLdjFZSEtQV0JTc2szOE1jN0lWd3YrWnVP?= =?utf-8?B?dkdxOE1HYlpYUDVTOHdMbVFROXo1eUJhUDFtY01mVWw0elBkVWlVRjJQT0dh?= =?utf-8?B?eDEwM0tRRXlEQUVPSDRIbkowUzU1M2JOTlNNeERabHdhYVlHREZrWUJ4aG5I?= =?utf-8?B?WDVxYWRXUGtCU1pweDRvd2k5c1ZmWkppcDAzUHhtVlNFcTJXYmZNeVh1ZWtw?= =?utf-8?B?STE1aFh5b3lmUVNYN1gxUjlkS3M5YWdUL1l6Y0h1QXA5Qm4xeTRNaVcyUkk0?= =?utf-8?B?NDN0bTNxSzdjSUNROFVlMTUzbWc4NDloOGEvSXMrTXczS08yM2lZcUtjR1lN?= =?utf-8?B?QnliOWpvQkZLbXd1SWwvTWplMklyZEgwRk5SVm52eTVaNDhRRnQ4Y3NuUmYx?= =?utf-8?B?c0FjcTh1K202NThjVHdwdzdCRnhUUk1PUk5pTzNBNFpLd1BjV1NYSWYyRUdP?= =?utf-8?B?MmxQTkNkbmNMbTJwdy80Q3doYlpYVmYxQi9hUmoyK0xDaSt0RVc0Q3pBanJK?= =?utf-8?B?UE5QRFB2NkUvOWdxdEY1eG5sTU96U2JKOSs5OE53WlhHSFNvNFVYRnNnTUJI?= =?utf-8?B?WE5Ia3g4b2dQN3BBNHgrdDZKbDVoT1JrcTRKTVJ1cGxuaFFuNzdxQT09?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee5ffe8f-d03d-4ab9-03a6-08da4f764d5f X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 08:57:55.3997 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GPM2Duae8dPI0MwuanbZIbRPtP5Do4WDXX61EOPF5W1MLV0YZTqC4KcTLzH9Z53cYYMpsY6a99I5bOBDFJE7xw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3240 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean 在 2022/4/25 20:29, Pali Rohár 写道: > Currently CONFIG_SPL_TEXT_BASE and CONFIG_SYS_TEXT_BASE addresses are > manually increased by 0x1000 due to .bootpg section. This section has size > of 0x1000 bytes and is manually put by linker script before .text section > (and therefore before base address) when CONFIG_SYS_MPC85XX_NO_RESETVEC is > set. Due to this fact lot of other config options are manually increased by > 0x1000 value to make correct layout. Note that entry point is not on > CONFIG_SPL_TEXT_BASE (image+0x1000) but it is really on address > CONFIG_SPL_TEXT_BASE-0x1000 (means at the start of the image). > > Cleanup handling of .bootpg section when CONFIG_SYS_MPC85XX_NO_RESETVEC is > set. Put .bootpg code directly into .text section and move text base > address to the start of .bootpg code. And finally remove +0x1000 value from > lot of config options. With this removal custom PHDRS is not used anymore, > so remove it too. > > After this change entry point would be at CONFIG_SPL_TEXT_BASE and not at > address -0x1000 anymore. > > Tested on P2020 board with SPL and proper U-Boot. > > Signed-off-by: Pali Rohár > --- > Changes in v2: > * Rebased on top of the U-Boot master branch, commit 9bb99fa95826d1a608737ca821977b4136a1a278 Please rebase on next branch, I am collecting patches based on Tom's next branch. Your patch not apply. Thanks, Peng. > --- > arch/powerpc/cpu/mpc85xx/start.S | 4 ++-- > arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 15 +++--------- > arch/powerpc/cpu/mpc85xx/u-boot.lds | 24 ++++++-------------- > configs/P1010RDB-PA_36BIT_NAND_defconfig | 6 ++--- > configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 4 ++-- > configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 4 ++-- > configs/P1010RDB-PA_NAND_defconfig | 6 ++--- > configs/P1010RDB-PA_SDCARD_defconfig | 4 ++-- > configs/P1010RDB-PA_SPIFLASH_defconfig | 4 ++-- > configs/P1010RDB-PB_36BIT_NAND_defconfig | 6 ++--- > configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 4 ++-- > configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 4 ++-- > configs/P1010RDB-PB_NAND_defconfig | 6 ++--- > configs/P1010RDB-PB_SDCARD_defconfig | 4 ++-- > configs/P1010RDB-PB_SPIFLASH_defconfig | 4 ++-- > configs/P1020RDB-PC_36BIT_NAND_defconfig | 6 ++--- > configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 6 ++--- > configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 6 ++--- > configs/P1020RDB-PC_NAND_defconfig | 6 ++--- > configs/P1020RDB-PC_SDCARD_defconfig | 6 ++--- > configs/P1020RDB-PC_SPIFLASH_defconfig | 6 ++--- > configs/P1020RDB-PD_NAND_defconfig | 6 ++--- > configs/P1020RDB-PD_SDCARD_defconfig | 6 ++--- > configs/P1020RDB-PD_SPIFLASH_defconfig | 6 ++--- > configs/P2020RDB-PC_36BIT_NAND_defconfig | 6 ++--- > configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 6 ++--- > configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 6 ++--- > configs/P2020RDB-PC_NAND_defconfig | 6 ++--- > configs/P2020RDB-PC_SDCARD_defconfig | 6 ++--- > configs/P2020RDB-PC_SPIFLASH_defconfig | 6 ++--- > configs/T1024RDB_NAND_defconfig | 2 +- > configs/T1024RDB_SDCARD_defconfig | 2 +- > configs/T1024RDB_SPIFLASH_defconfig | 2 +- > configs/T1042D4RDB_NAND_defconfig | 2 +- > configs/T1042D4RDB_SDCARD_defconfig | 2 +- > configs/T1042D4RDB_SPIFLASH_defconfig | 2 +- > configs/T2080QDS_NAND_defconfig | 2 +- > configs/T2080QDS_SDCARD_defconfig | 2 +- > configs/T2080QDS_SPIFLASH_defconfig | 2 +- > configs/T2080RDB_NAND_defconfig | 2 +- > configs/T2080RDB_SDCARD_defconfig | 2 +- > configs/T2080RDB_SPIFLASH_defconfig | 2 +- > configs/T2080RDB_revD_NAND_defconfig | 2 +- > configs/T2080RDB_revD_SDCARD_defconfig | 2 +- > configs/T2080RDB_revD_SPIFLASH_defconfig | 2 +- > configs/T4240RDB_SDCARD_defconfig | 2 +- > configs/qemu-ppce500_defconfig | 4 ++-- > include/configs/P1010RDB.h | 4 ++-- > include/configs/p1_p2_rdb_pc.h | 4 ++-- > 49 files changed, 107 insertions(+), 126 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S > index 9ddd37111906..e2e9ab4d9005 100644 > --- a/arch/powerpc/cpu/mpc85xx/start.S > +++ b/arch/powerpc/cpu/mpc85xx/start.S > @@ -1128,7 +1128,7 @@ switch_as: > /*--------------------------------------------------------------*/ > lis r3,CONFIG_VAL(SYS_MONITOR_BASE)@h > ori r3,r3,CONFIG_VAL(SYS_MONITOR_BASE)@l > - addi r3,r3,_start_cont - _start > + addi r3,r3,_start_cont - CONFIG_VAL(SYS_MONITOR_BASE) > mtlr r3 > blr > #endif > @@ -1604,7 +1604,7 @@ relocate_code: > * initialization, now running from RAM. > */ > > - addi r0,r10,in_ram - _start > + addi r0,r10,in_ram - CONFIG_VAL(SYS_MONITOR_BASE) > > /* > * As IVPR is going to point RAM address, > diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds > index 1b4d1e05a4a3..6fd0da9f39b1 100644 > --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds > +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds > @@ -9,24 +9,15 @@ > #include "config.h" > > OUTPUT_ARCH(powerpc) > -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC > -PHDRS > -{ > - text PT_LOAD; > - bss PT_LOAD; > -} > -#endif > + > SECTIONS > { > + . = IMAGE_TEXT_BASE; > + .text : { > /* For ifc, elbc, esdhc, espi, all need the SPL without section .resetvec */ > #ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC > - .bootpg IMAGE_TEXT_BASE - 0x1000 : > - { > KEEP(*(.bootpg)) > - } :text = 0xffff > #endif > - . = IMAGE_TEXT_BASE; > - .text : { > *(.text*) > } > _etext = .; > diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds > index 67b8efdc3043..9794044b3286 100644 > --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds > +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds > @@ -14,32 +14,22 @@ > OUTPUT_ARCH(powerpc) > ENTRY(_start_e500) > > -PHDRS > -{ > - text PT_LOAD; > - bss PT_LOAD; > -} > - > SECTIONS > { > /* Read-only sections, merged into text segment: */ > -#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC > - .bootpg CONFIG_SYS_TEXT_BASE - 0x1000 : > + .text : > { > +#ifdef CONFIG_SYS_MPC85XX_NO_RESETVEC > KEEP(arch/powerpc/cpu/mpc85xx/start.o (.bootpg)) > - } :text = 0xffff > - . = CONFIG_SYS_TEXT_BASE; > #endif > - .text : > - { > *(.text*) > - } :text > + } > _etext = .; > PROVIDE (etext = .); > .rodata : > { > *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) > - } :text > + } > > /* Read-write section, merged into data segment: */ > . = (. + 0x00FF) & 0xFFFFFF00; > @@ -88,12 +78,12 @@ SECTIONS > .bootpg RESET_VECTOR_ADDRESS - 0xffc : > { > arch/powerpc/cpu/mpc85xx/start.o (.bootpg) > - } :text = 0xffff > + } = 0xffff > > .resetvec RESET_VECTOR_ADDRESS : > { > KEEP(*(.resetvec)) > - } :text = 0xffff > + } = 0xffff > > . = RESET_VECTOR_ADDRESS + 0x4; > > @@ -115,7 +105,7 @@ SECTIONS > *(.sbss*) > *(.bss*) > *(COMMON) > - } :bss > + } > > . = ALIGN(4); > __bss_end = . ; > diff --git a/configs/P1010RDB-PA_36BIT_NAND_defconfig b/configs/P1010RDB-PA_36BIT_NAND_defconfig > index de67892a4567..ad6f24239361 100644 > --- a/configs/P1010RDB-PA_36BIT_NAND_defconfig > +++ b/configs/P1010RDB-PA_36BIT_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xD0001000 > +CONFIG_TPL_TEXT_BASE=0xD0000000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" > diff --git a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig > index 516198b96347..7156f5f6f63d 100644 > --- a/configs/P1010RDB-PA_36BIT_SDCARD_defconfig > +++ b/configs/P1010RDB-PA_36BIT_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > diff --git a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig > index a545cffe4d92..ee5b0f4b4e48 100644 > --- a/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig > +++ b/configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa_36b" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > CONFIG_SPL=y > diff --git a/configs/P1010RDB-PA_NAND_defconfig b/configs/P1010RDB-PA_NAND_defconfig > index c980adffffc3..86181bb3636a 100644 > --- a/configs/P1010RDB-PA_NAND_defconfig > +++ b/configs/P1010RDB-PA_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xD0001000 > +CONFIG_TPL_TEXT_BASE=0xD0000000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -21,7 +21,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" > diff --git a/configs/P1010RDB-PA_SDCARD_defconfig b/configs/P1010RDB-PA_SDCARD_defconfig > index 160f4a0dfdeb..7e72653da161 100644 > --- a/configs/P1010RDB-PA_SDCARD_defconfig > +++ b/configs/P1010RDB-PA_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > diff --git a/configs/P1010RDB-PA_SPIFLASH_defconfig b/configs/P1010RDB-PA_SPIFLASH_defconfig > index cf61ca3b9228..f790bd47d8b0 100644 > --- a/configs/P1010RDB-PA_SPIFLASH_defconfig > +++ b/configs/P1010RDB-PA_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > CONFIG_SPL=y > diff --git a/configs/P1010RDB-PB_36BIT_NAND_defconfig b/configs/P1010RDB-PB_36BIT_NAND_defconfig > index ac56d416670e..318b849be260 100644 > --- a/configs/P1010RDB-PB_36BIT_NAND_defconfig > +++ b/configs/P1010RDB-PB_36BIT_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xD0001000 > +CONFIG_TPL_TEXT_BASE=0xD0000000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" > diff --git a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig > index 2774a5c5c448..c53d75bad52d 100644 > --- a/configs/P1010RDB-PB_36BIT_SDCARD_defconfig > +++ b/configs/P1010RDB-PB_36BIT_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > diff --git a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig > index 240aa3a4c2e8..c986b06aae1d 100644 > --- a/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig > +++ b/configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb_36b" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > CONFIG_SPL=y > diff --git a/configs/P1010RDB-PB_NAND_defconfig b/configs/P1010RDB-PB_NAND_defconfig > index 0954e76bb80e..3e4d3c495cc4 100644 > --- a/configs/P1010RDB-PB_NAND_defconfig > +++ b/configs/P1010RDB-PB_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xD0001000 > +CONFIG_TPL_TEXT_BASE=0xD0000000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -21,7 +21,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xD0001000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xD0000000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr" > diff --git a/configs/P1010RDB-PB_SDCARD_defconfig b/configs/P1010RDB-PB_SDCARD_defconfig > index 4ad9633bf603..1d08e35371c9 100644 > --- a/configs/P1010RDB-PB_SDCARD_defconfig > +++ b/configs/P1010RDB-PB_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > diff --git a/configs/P1010RDB-PB_SPIFLASH_defconfig b/configs/P1010RDB-PB_SPIFLASH_defconfig > index 9b05f4846823..55300dc37e4a 100644 > --- a/configs/P1010RDB-PB_SPIFLASH_defconfig > +++ b/configs/P1010RDB-PB_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pb" > -CONFIG_SPL_TEXT_BASE=0xD0001000 > +CONFIG_SPL_TEXT_BASE=0xD0000000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL_DRIVERS_MISC=y > CONFIG_SPL=y > diff --git a/configs/P1020RDB-PC_36BIT_NAND_defconfig b/configs/P1020RDB-PC_36BIT_NAND_defconfig > index f739ca0977f6..8e54318ea29f 100644 > --- a/configs/P1020RDB-PC_36BIT_NAND_defconfig > +++ b/configs/P1020RDB-PC_36BIT_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xF8F81000 > +CONFIG_TPL_TEXT_BASE=0xF8F80000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -23,7 +23,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig > index 4407a02a7d97..ee21d7c28e0a 100644 > --- a/configs/P1020RDB-PC_36BIT_SDCARD_defconfig > +++ b/configs/P1020RDB-PC_36BIT_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > @@ -20,7 +20,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig > index ee0fdd6657d1..246f65c46cd2 100644 > --- a/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig > +++ b/configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc_36b" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_SPIFLASH=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > diff --git a/configs/P1020RDB-PC_NAND_defconfig b/configs/P1020RDB-PC_NAND_defconfig > index be29f9eac4fc..fb6b5d0ad743 100644 > --- a/configs/P1020RDB-PC_NAND_defconfig > +++ b/configs/P1020RDB-PC_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xF8F81000 > +CONFIG_TPL_TEXT_BASE=0xF8F80000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P1020RDB-PC_SDCARD_defconfig b/configs/P1020RDB-PC_SDCARD_defconfig > index feb00ea91615..bbf40382b165 100644 > --- a/configs/P1020RDB-PC_SDCARD_defconfig > +++ b/configs/P1020RDB-PC_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > @@ -19,7 +19,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P1020RDB-PC_SPIFLASH_defconfig b/configs/P1020RDB-PC_SPIFLASH_defconfig > index f18f4b2ce150..bf666fd50748 100644 > --- a/configs/P1020RDB-PC_SPIFLASH_defconfig > +++ b/configs/P1020RDB-PC_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pc" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -21,7 +21,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_SPIFLASH=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > diff --git a/configs/P1020RDB-PD_NAND_defconfig b/configs/P1020RDB-PD_NAND_defconfig > index 38e5633f82ce..5951be073605 100644 > --- a/configs/P1020RDB-PD_NAND_defconfig > +++ b/configs/P1020RDB-PD_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x20000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xF8F81000 > +CONFIG_TPL_TEXT_BASE=0xF8F80000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P1020RDB-PD_SDCARD_defconfig b/configs/P1020RDB-PD_SDCARD_defconfig > index b50dfcbc392c..ff98e0fbbd02 100644 > --- a/configs/P1020RDB-PD_SDCARD_defconfig > +++ b/configs/P1020RDB-PD_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > @@ -19,7 +19,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P1020RDB-PD_SPIFLASH_defconfig b/configs/P1020RDB-PD_SPIFLASH_defconfig > index 6649f5b2feaf..0d2ed25de201 100644 > --- a/configs/P1020RDB-PD_SPIFLASH_defconfig > +++ b/configs/P1020RDB-PD_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -21,7 +21,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_SPIFLASH=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > diff --git a/configs/P2020RDB-PC_36BIT_NAND_defconfig b/configs/P2020RDB-PC_36BIT_NAND_defconfig > index 905b1edc2b23..b2c30b5abfd0 100644 > --- a/configs/P2020RDB-PC_36BIT_NAND_defconfig > +++ b/configs/P2020RDB-PC_36BIT_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xF8F81000 > +CONFIG_TPL_TEXT_BASE=0xF8F80000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -23,7 +23,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig > index 1e15552edc70..aef18fba5ab8 100644 > --- a/configs/P2020RDB-PC_36BIT_SDCARD_defconfig > +++ b/configs/P2020RDB-PC_36BIT_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > @@ -20,7 +20,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig > index cf0ae5da3cfa..8db795fd1de3 100644 > --- a/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig > +++ b/configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc_36b" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_SPIFLASH=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > diff --git a/configs/P2020RDB-PC_NAND_defconfig b/configs/P2020RDB-PC_NAND_defconfig > index 5b140525f025..6f39ad80cfdc 100644 > --- a/configs/P2020RDB-PC_NAND_defconfig > +++ b/configs/P2020RDB-PC_NAND_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_ENV_SIZE=0x4000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc" > CONFIG_SPL_TEXT_BASE=0xFF800000 > CONFIG_SPL_SERIAL=y > -CONFIG_TPL_TEXT_BASE=0xF8F81000 > +CONFIG_TPL_TEXT_BASE=0xF8F80000 > CONFIG_TPL_LIBCOMMON_SUPPORT=y > CONFIG_TPL_LIBGENERIC_SUPPORT=y > CONFIG_TPL_SERIAL=y > @@ -22,7 +22,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_TPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_TPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P2020RDB-PC_SDCARD_defconfig b/configs/P2020RDB-PC_SDCARD_defconfig > index 540999bef21d..63f6a64a8a70 100644 > --- a/configs/P2020RDB-PC_SDCARD_defconfig > +++ b/configs/P2020RDB-PC_SDCARD_defconfig > @@ -1,13 +1,13 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x0 > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_MMC=y > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > @@ -19,7 +19,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr" > diff --git a/configs/P2020RDB-PC_SPIFLASH_defconfig b/configs/P2020RDB-PC_SPIFLASH_defconfig > index 0881e35476ac..e62d9cff3116 100644 > --- a/configs/P2020RDB-PC_SPIFLASH_defconfig > +++ b/configs/P2020RDB-PC_SPIFLASH_defconfig > @@ -1,6 +1,6 @@ > CONFIG_PPC=y > CONFIG_SYS_IMMR=0xFFE00000 > -CONFIG_SYS_TEXT_BASE=0x11001000 > +CONFIG_SYS_TEXT_BASE=0x11000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 > CONFIG_ENV_OFFSET=0x100000 > CONFIG_ENV_SECT_SIZE=0x10000 > CONFIG_DEFAULT_DEVICE_TREE="p2020rdb-pc" > -CONFIG_SPL_TEXT_BASE=0xf8f81000 > +CONFIG_SPL_TEXT_BASE=0xf8f80000 > CONFIG_SPL_SERIAL=y > CONFIG_SPL=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -21,7 +21,7 @@ CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SPL_SYS_MONITOR_BASE=0xF8F81000 > +CONFIG_SPL_SYS_MONITOR_BASE=0xF8F80000 > CONFIG_SPIFLASH=y > CONFIG_BOOTDELAY=10 > CONFIG_USE_BOOTCOMMAND=y > diff --git a/configs/T1024RDB_NAND_defconfig b/configs/T1024RDB_NAND_defconfig > index a5d80c9857bb..f794c9e2ef2b 100644 > --- a/configs/T1024RDB_NAND_defconfig > +++ b/configs/T1024RDB_NAND_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x30001000 > +CONFIG_SYS_TEXT_BASE=0x30000000 > CONFIG_SYS_MALLOC_LEN=0xa00000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > diff --git a/configs/T1024RDB_SDCARD_defconfig b/configs/T1024RDB_SDCARD_defconfig > index a820d2969e35..96fb2d9f982b 100644 > --- a/configs/T1024RDB_SDCARD_defconfig > +++ b/configs/T1024RDB_SDCARD_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x30001000 > +CONFIG_SYS_TEXT_BASE=0x30000000 > CONFIG_SYS_MALLOC_LEN=0xa00000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig > index 2708e9f0911f..1b60ed1dd305 100644 > --- a/configs/T1024RDB_SPIFLASH_defconfig > +++ b/configs/T1024RDB_SPIFLASH_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x30001000 > +CONFIG_SYS_TEXT_BASE=0x30000000 > CONFIG_SYS_MALLOC_LEN=0xa00000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig > index 1ec838aaa0f8..0f24f86d0cc6 100644 > --- a/configs/T1042D4RDB_NAND_defconfig > +++ b/configs/T1042D4RDB_NAND_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x30001000 > +CONFIG_SYS_TEXT_BASE=0x30000000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig > index 3cb72f03d6b0..6a6145cbb679 100644 > --- a/configs/T1042D4RDB_SDCARD_defconfig > +++ b/configs/T1042D4RDB_SDCARD_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x30001000 > +CONFIG_SYS_TEXT_BASE=0x30000000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig > index 662c93691d1d..4e5b82def313 100644 > --- a/configs/T1042D4RDB_SPIFLASH_defconfig > +++ b/configs/T1042D4RDB_SPIFLASH_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x30001000 > +CONFIG_SYS_TEXT_BASE=0x30000000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080QDS_NAND_defconfig b/configs/T2080QDS_NAND_defconfig > index 4721795c5eb5..0867c85c14f8 100644 > --- a/configs/T2080QDS_NAND_defconfig > +++ b/configs/T2080QDS_NAND_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080QDS_SDCARD_defconfig b/configs/T2080QDS_SDCARD_defconfig > index d440ab69a685..02f34dcd500d 100644 > --- a/configs/T2080QDS_SDCARD_defconfig > +++ b/configs/T2080QDS_SDCARD_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig > index f3ae31bf2224..75d030307ba3 100644 > --- a/configs/T2080QDS_SPIFLASH_defconfig > +++ b/configs/T2080QDS_SPIFLASH_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080RDB_NAND_defconfig b/configs/T2080RDB_NAND_defconfig > index bef6fe8f59af..c2b86d1e331d 100644 > --- a/configs/T2080RDB_NAND_defconfig > +++ b/configs/T2080RDB_NAND_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080RDB_SDCARD_defconfig b/configs/T2080RDB_SDCARD_defconfig > index f6668720cf3a..ebf0a20eae32 100644 > --- a/configs/T2080RDB_SDCARD_defconfig > +++ b/configs/T2080RDB_SDCARD_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig > index 2578b0eabb88..913686480182 100644 > --- a/configs/T2080RDB_SPIFLASH_defconfig > +++ b/configs/T2080RDB_SPIFLASH_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080RDB_revD_NAND_defconfig b/configs/T2080RDB_revD_NAND_defconfig > index 10f7e2cd18ba..2711b99a1039 100644 > --- a/configs/T2080RDB_revD_NAND_defconfig > +++ b/configs/T2080RDB_revD_NAND_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080RDB_revD_SDCARD_defconfig b/configs/T2080RDB_revD_SDCARD_defconfig > index 9951efbb3d50..01273313d368 100644 > --- a/configs/T2080RDB_revD_SDCARD_defconfig > +++ b/configs/T2080RDB_revD_SDCARD_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T2080RDB_revD_SPIFLASH_defconfig b/configs/T2080RDB_revD_SPIFLASH_defconfig > index 59f67d88a024..1b196e0945f1 100644 > --- a/configs/T2080RDB_revD_SPIFLASH_defconfig > +++ b/configs/T2080RDB_revD_SPIFLASH_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/T4240RDB_SDCARD_defconfig b/configs/T4240RDB_SDCARD_defconfig > index 43354c0af2b7..7d2e1841c378 100644 > --- a/configs/T4240RDB_SDCARD_defconfig > +++ b/configs/T4240RDB_SDCARD_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0x00201000 > +CONFIG_SYS_TEXT_BASE=0x00200000 > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > CONFIG_ENV_SIZE=0x2000 > diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig > index eac2cc2854db..4aae686335b0 100644 > --- a/configs/qemu-ppce500_defconfig > +++ b/configs/qemu-ppce500_defconfig > @@ -1,5 +1,5 @@ > CONFIG_PPC=y > -CONFIG_SYS_TEXT_BASE=0xf01000 > +CONFIG_SYS_TEXT_BASE=0xf00000 > CONFIG_ENV_SIZE=0x2000 > CONFIG_DEFAULT_DEVICE_TREE="qemu-ppce500" > CONFIG_SYS_CLK_FREQ=33000000 > @@ -9,7 +9,7 @@ CONFIG_TARGET_QEMU_PPCE500=y > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_OF_STDOUT_VIA_ALIAS=y > -CONFIG_SYS_MONITOR_BASE=0x00F01000 > +CONFIG_SYS_MONITOR_BASE=0x00F00000 > CONFIG_BOOTDELAY=1 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTCOMMAND="test -n \"$qemu_kernel_addr\" && bootm $qemu_kernel_addr - $fdtcontroladdr" > diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h > index 0d8f13eeb065..40a5afd2d8c6 100644 > --- a/include/configs/P1010RDB.h > +++ b/include/configs/P1010RDB.h > @@ -420,7 +420,7 @@ extern unsigned long get_sdram_size(void); > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR > #define CONFIG_SYS_L2_SIZE (256 << 10) > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE) > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xD0001000 > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 128 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_SIZE (128 << 10) > @@ -431,7 +431,7 @@ extern unsigned long get_sdram_size(void); > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR > #define CONFIG_SYS_L2_SIZE (256 << 10) > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE) > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xD0001000 > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 192 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 208 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_SIZE (48 << 10) > diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h > index 17b9021fbf86..7d03d888f21f 100644 > --- a/include/configs/p1_p2_rdb_pc.h > +++ b/include/configs/p1_p2_rdb_pc.h > @@ -347,7 +347,7 @@ > #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000 > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE) > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000 > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE > #define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024) > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024) > @@ -361,7 +361,7 @@ > #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000 > #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR > #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE) > -#define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000 > +#define CONFIG_SPL_RELOC_TEXT_BASE CONFIG_SYS_MONITOR_BASE > #define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 192 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 208 * 1024) > #define CONFIG_SPL_RELOC_MALLOC_SIZE (48 << 10)