From patchwork Mon Feb 3 07:25:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 1232625 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=P6BzC5/o; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489zvR1Scpz9sPK for ; Mon, 3 Feb 2020 18:28:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A83581881; Mon, 3 Feb 2020 08:28:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=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=nxp.com header.i=@nxp.com header.b="P6BzC5/o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 99727818B1; Mon, 3 Feb 2020 08:28:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60d]) (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 26A558187E for ; Mon, 3 Feb 2020 08:28:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alison.wang@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=al4zsfUOSMF0bhWBM1hy+AvIfzfLrANYUt4gaeHZbnAAdi5Utl8lX0tmPp9CEHhA9Dc0/E5ybdGIDdB2bRRpZpm4OBlVbtyTFyojZJNrQ1/ANrYNLw+VJFnU7DWVB3LaKHoDNcwIRoC5Qjor+HgSKAKDRaCI12HDvdAfhXZzan65nbZ08PtUnjbYQHcg/oLSmNtAtdVYWQ48a1e4df06jFRbOhFLvkeAPLVqvG/Uj3Vtrzhv1fXCxxLFU6HyTQgbCOs077Pv/Jt6GchshVeVLp8DR1aBx7VX6mw7cxPH+Oz8h5+xJNqYv2Cvw3Ih8ieUCcKBHCj6jGw9MgcBzz0z+Q== 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-SenderADCheck; bh=tDTlKSbYdznMgnU1ajtespJtPNXm9QBaSYgOM72tqxg=; b=acvNM5HaG15F+rfw0nXp9yzIx9IkvhhKhZRxFNmv7oUiS04lqj2QSiyCfVHCwTuhZizoB4uMqu7ndwkTPJSYgWHevjSo8wbTb374JZe+XtNlrb5gMZ6OZG9FR+Uy+V49J19qX2n2A0stwXibQB6Rf+z5DLtI+GFL8QVJZYBIa6nsUTwCznDDGQeSOLV8exoXjiJEfurKd7snkjvFpOsZsol/d0tdszHwtDYkhAnxZagQmODQThW5wK4hdrbLCyqr/LpjsEqDzY6thwqYSpNFHWsWn8y3HqOX7dCqoRyy2rjB5Abt8RoQXGiAhWUWfGWuGz18O0eHARqKtghWZyofbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tDTlKSbYdznMgnU1ajtespJtPNXm9QBaSYgOM72tqxg=; b=P6BzC5/o5VwpJa05qAh+oTu0F1j1Ex90NrSzAfEkpFgNU9VKTf0+j3HT3Bwt/MW5jN7Vk+C77IoXoaZFUz9qOFqDugZBj4D34RGaaXv0UeP2wYeWe2xYvLJgcKPw3Bj8vsYHsNZYPhjwYuXpbxzsMW4QMfg9vaC+4hQGy8oLeBI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alison.wang@nxp.com; Received: from VI1PR04MB4062.eurprd04.prod.outlook.com (52.133.12.32) by VI1PR04MB7037.eurprd04.prod.outlook.com (10.186.157.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.29; Mon, 3 Feb 2020 07:28:00 +0000 Received: from VI1PR04MB4062.eurprd04.prod.outlook.com ([fe80::e991:37c5:7289:55a8]) by VI1PR04MB4062.eurprd04.prod.outlook.com ([fe80::e991:37c5:7289:55a8%3]) with mapi id 15.20.2686.025; Mon, 3 Feb 2020 07:28:00 +0000 From: Alison Wang To: priyanka.jain@nxp.com, jagdish.gediya@nxp.com, xiaobo.xie@nxp.com, u-boot@lists.denx.de Subject: [PATCH] ls1021a: Set CONFIG_SYS_BOOTMAPSZ to the memory for relocation Date: Mon, 3 Feb 2020 15:25:19 +0800 Message-Id: <20200203072519.42589-1-alison.wang@nxp.com> X-Mailer: git-send-email 2.17.1 X-ClientProxiedBy: HK2PR0401CA0023.apcprd04.prod.outlook.com (2603:1096:202:2::33) To VI1PR04MB4062.eurprd04.prod.outlook.com (2603:10a6:803:40::32) MIME-Version: 1.0 Received: from localhost.localdomain (119.31.174.73) by HK2PR0401CA0023.apcprd04.prod.outlook.com (2603:1096:202:2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.30 via Frontend Transport; Mon, 3 Feb 2020 07:27:58 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [119.31.174.73] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 37fcfd9a-a335-4fe7-87ec-08d7a87a98d1 X-MS-TrafficTypeDiagnostic: VI1PR04MB7037:|VI1PR04MB7037: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Forefront-PRVS: 0302D4F392 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(376002)(346002)(366004)(396003)(39860400002)(189003)(199004)(69590400006)(1076003)(36756003)(6666004)(316002)(6486002)(8936002)(4326008)(81166006)(81156014)(478600001)(66556008)(66476007)(186003)(16526019)(66946007)(5660300002)(52116002)(956004)(6506007)(2616005)(86362001)(26005)(8676002)(44832011)(2906002)(6512007); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB7037; H:VI1PR04MB4062.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4qBLusexp5SoO6ZL0KUuMXctVg0misAzoTgm+QWu0JXwqTwNLI1bCb55uEX11v/XeQrZcZobin6X7dh8NM/TQH1u6BRhnflKxa2sSxgTOjdenFkiRDn9iQsAqvYoNeYM0ODXgAryFzV03kp97AkIyKP6iY98CWs1VhVUsIzmc0DcARFnt7L2x+HXjUbpFirKa451hqCQD3+DaH3UB3Ep0bkYgxigLWv5I6KwXkNDUQyjoVo3vG+wnoWBcit4uTWaKKmeCrQTJNb2IhI0N54XtvOWZ2OR/kUr9q9P0epufLJPnh2yysWGkPd9P/AASJOePHEXE1PbbrADcStqj9gRrxZF2QbaW4VzthJEcbSW92GkD1S4Uxo0zYkdQVE3WcXLyqlXd0bG2q3pKEhd1p6TNyrnSbAZo5ItMkWQh+/AQ1cFi4z1s7hfF1ri6DZmPlR54y/+0wk2EQzEIJZUeL/SeCPozCfbkkyTB8PwZSmUr/wnN7MER3CsmTnZrxdwY8RstAQkoBk61WHtaSqfjLCd7YcF6sjaXzwovMoq69l7Zp0= X-MS-Exchange-AntiSpam-MessageData: NoBDKZjKUyUnhIbGsC302UtdumNIyPz+PM6Tf4Lqvp32LhAFsvP7lrFJAC889ar5lq4uNKPBc5Qyd4Ymk0Y/902OnxbJU7yNLqDiHNwI+EBqYqoGl8B2ZGkwlrLjOwPQDg0jR8gBzZj4jfkySNPSag== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37fcfd9a-a335-4fe7-87ec-08d7a87a98d1 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2020 07:28:00.1918 (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: Bzw+M9mDEWsVBkPMBNBlOmW3ShwYfHjPzFarJvqeN3MMYLOZk/FFh4YqeafSOjhGHrXdg67WuIFR9qES+U3i2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7037 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alison.wang@nxp.com Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean This patch sets CONFIG_SYS_BOOTMAPSZ to the amount of memory available to safely contain a kernel, device tree and initrd for relocation. The way to set fdt_high as 0xffffffff to disable device tree relocation is removed. Signed-off-by: Alison Wang Reviewed-by: Tom Rini --- include/configs/ls1021aiot.h | 5 +++-- include/configs/ls1021aqds.h | 3 +-- include/configs/ls1021atsn.h | 3 ++- include/configs/ls1021atwr.h | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 769a7e2..4e3d818 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -207,12 +207,13 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ -"initrd_high=0xffffffff\0" \ -"fdt_high=0xffffffff\0" +"initrd_high=0xffffffff\0" /* * Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) + #define CONFIG_CMD_GREPENV #define CONFIG_CMD_MEMINFO diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 6f1c0d4..5345e8f 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -460,13 +460,11 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_LPUART #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ - "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=null\0" #endif @@ -474,6 +472,7 @@ unsigned long get_board_ddr_clk(void); /* * Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index 84fdfce..039c794 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -154,7 +154,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x61000000\0" \ "kernelheader_addr=0x60800000\0" \ @@ -216,6 +215,8 @@ "bootm $load_addr#$board\0" /* Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) + #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE \ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index e845232..511d10a 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -299,7 +299,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x65000000\0" \ "scriptaddr=0x80000000\0" \ @@ -357,7 +356,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x61000000\0" \ "kernelheader_addr=0x60800000\0" \ @@ -441,6 +439,7 @@ /* * Miscellaneous configurable options */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END 0x9fffffff