Message ID | 1459504373-4662-2-git-send-email-Qianyu.Gong@nxp.com |
---|---|
State | Accepted |
Commit | 2a5558399828e24fce9e948288a88cd28887875e |
Delegated to: | York Sun |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3qby3N1LkHz9sBG for <incoming@patchwork.ozlabs.org>; Fri, 1 Apr 2016 21:16:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B569BA7535; Fri, 1 Apr 2016 12:16:44 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1ToY9T6FJ2vs; Fri, 1 Apr 2016 12:16:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DD601A752D; Fri, 1 Apr 2016 12:16:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B2EF9A7528 for <u-boot@lists.denx.de>; Fri, 1 Apr 2016 12:16:40 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aFQPTzF2SewL for <u-boot@lists.denx.de>; Fri, 1 Apr 2016 12:16:40 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0060.outbound.protection.outlook.com [157.56.110.60]) by theia.denx.de (Postfix) with ESMTPS id 22702A7518 for <u-boot@lists.denx.de>; Fri, 1 Apr 2016 12:16:36 +0200 (CEST) Received: from BN3PR0301CA0077.namprd03.prod.outlook.com (10.160.152.173) by SN2PR03MB2239.namprd03.prod.outlook.com (10.166.210.8) with Microsoft SMTP Server (TLS) id 15.1.447.15; Fri, 1 Apr 2016 10:02:14 +0000 Received: from BL2FFO11FD031.protection.gbl (2a01:111:f400:7c09::191) by BN3PR0301CA0077.outlook.office365.com (2a01:111:e400:401e::45) with Microsoft SMTP Server (TLS) id 15.1.447.15 via Frontend Transport; Fri, 1 Apr 2016 10:02:14 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD031.mail.protection.outlook.com (10.173.160.71) with Microsoft SMTP Server (TLS) id 15.1.453.6 via Frontend Transport; Fri, 1 Apr 2016 10:02:13 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u31A26LX022400; Fri, 1 Apr 2016 03:02:10 -0700 From: Gong Qianyu <Qianyu.Gong@nxp.com> To: <u-boot@lists.denx.de>, <york.sun@nxp.com>, <Mingkai.Hu@nxp.com> Date: Fri, 1 Apr 2016 17:52:53 +0800 Message-ID: <1459504373-4662-2-git-send-email-Qianyu.Gong@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1459504373-4662-1-git-send-email-Qianyu.Gong@nxp.com> References: <1459504373-4662-1-git-send-email-Qianyu.Gong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131039785337425274; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(2950100001)(77096005)(5003940100001)(19580405001)(19580395003)(47776003)(87936001)(76176999)(50226001)(48376002)(50466002)(2201001)(50986999)(85426001)(86362001)(5008740100001)(6806005)(11100500001)(2906002)(81166005)(4326007)(92566002)(1096002)(1220700001)(106466001)(229853001)(105606002)(5001770100001)(104016004)(36756003)(189998001)(586003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2239; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD031; 1:vAnqo2b4UxFXK3mqi4EPqjst6pOT9IzfbA/BaqHxXLNeuVUU4Da1NgtnrqZHL5BD6Hs8MdpF+4NLprolOltjpCACd6ELE0UDw9tX9oJ/re65MhK5Cj0jGzJfbONmlGg8wwIXCiCfuxutC9ZGrL03WBgrFVCqUxcP+1Ml5XknKa3TXW5PHtpOh2lshUDfwERMfXsJnZXoVgsRz7FcQd4TbaLVgO1DYFoGnIMQS+xcGY4KvNRAfc5W28AgvJQEJkkeebXa05KBaP7TyCxbInsIL6o8MVfzTDOCs24Oy6SNNO74srDqE6UE5wJW3uz3XwHG4NtE4aLfoZlfreNuuvGF/cGB9wBSMnwyx1eSiNJHNXnUXK1R9OQBdzEucRkNhZlPmXuRVWF85zenQzzj3emU6MF/ltwNZSZ3A+QBB+CTGTpf4RV7nv9Oc6B29tPn0dqUeYixuZ2BX6uITZbmhA56G40CiynVlRGGEy8pZeuVcjRSGlqWD0znJN8F9zr/drL3Y0Or/hfeY783JofuOoKgrb+1N++Dk1Zc3/XWBCKYoR9TNlaeW/9l10F+s+KitXmLoGFNGWRFdODSopATCxwiz1Y8YemOHhrXrEE6DoSaSJTAUtX9PYqfbJ6KwD7Y0c3zQxSnBWViF6IHmYeiR7Drl4DA6zCR0t43/bd6QyGeC7I= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 92ed2989-c7a9-4441-0d7a-08d35a14b2f2 X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2239; 2:2s4nkfV/+hJf+7+CDoG24lALEUb8TfhDn7yy9zMUmZJu2wjjuZMAnWssjUbByR1NNaV4avMDnhmlQB4jwbtsSJCngr7JEb6oJ7dIzVvBibxdT8mRQBXdzhFG82ajrMvatRC/mbOMrtzXi9yMVZ9Ydl+pazW/xxDgbFiQUcPT4Reqz3fZOagSyDp/DLv/7zWQ; 3:Vxv1AqaTCtqMeYVZ35eMFh3IySkA1DrZWoPn34VbwEgja9IBNn+PVksCMTzZBAlYOGiHjaycZMqFHEyDV9SKKbft26QP1sgKufkPvTFSt1rLZO+E+zm9fPWHdlb/i8hStO5MCFmArp1qI5Ot3ZIGcp8acB5EYF5q7pBT6ySd/q6MPo/Qb4g04H32a/guzkSkHpQY69H9SpivHApWi6sGuY11GbnMonHRJyJRonHlEDA= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB2239; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2239; 25:vjdrucgkCdXA3BQ3vhb+08q/SX3xrEzc00TZvY8NQcyxlIYLBEIQJ+ZFFRa+BZbkCJu+7bIayDIHIz9f4QSNIMjY64kyag8Nt/yJ+fRROUPw6mRimsGqm2Umkncx0yjxwLpD0nK/FRIFwNUxJHpjgJ3PIozsOZxuWCFnKpAe4+cVtPo5OYZ650BJA61dotLWW7imeWBm5vsY6XKd+ExGZiFcvOnT7PmWAfnp4v/ZUlBTDdhEkBvPyHo51MBnBkpXXHLeVeAQt3fdOdFGga0Ys+p0fADsAhvoct4p0xJ8NTdrSjJvdQiU8ZopeZwnb3Gc8Y2lWQAOLv7mV+AeQQ84cKwukr7ex46gxZTa1GaQS/xCCt8UL7EBiOhK8FpsQD4AQmNcyVCokAhuN1iFy9bfaUU17Lu/jDB87BdM4EZj90RkfSK9T7Dg5zAs59TCoBlvICFOUvL/7hNgdlWoUhhxdDrPG8/r11Y9KHk9CHDwif39JK7AONCILg0J6J3hbWCxoKv0WFZcv/bp56Ka8GU/xlxgMSB0W5CU/OYXiLODjf7QBAwj3YoXVNp0kZwekVtuns1C5pobrm8w/pYepuRUzn3epvMOS/l9V00x27uUNwX3n4X5iLu/3zhEaoaDgu0LgeLNodzmwL3LHMUn7fpwrQ== X-Microsoft-Antispam-PRVS: <SN2PR03MB2239530B296382AB014C75C7E79A0@SN2PR03MB2239.namprd03.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(13018025)(13024025)(13023025)(13017025)(13015025)(10201501046)(3002001); SRVR:SN2PR03MB2239; BCL:0; PCL:0; RULEID:(400006); SRVR:SN2PR03MB2239; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2239; 4:ywlg3aBhlORHGkJBrZvLySvjZ4ApsSaCvB/SCraZ+fVKy6TIyxyZz6xx+eIUIuAY4+m0GqYcpljAk+0FoVh0IXhEvFfWamjdkGNLqU3HxPFjrAYPtLvB+K2I/AsIuGvcuYHCHM5Uao26qbJQv9gSLFfgLPuDeZOpzH5TT+4s85cMSpq+EQI1+GXDCUWeh/6NRzNPAMIoquDRMTFzdpd7LGqCs0m3SnHZ5W1K7uiU2hy3w+RdXAk83vfxKylTvWKBCboEwn9F0ShWVAoO8fRgkMfuVqYAXfUYcxrEIHwuifuQx5LS15B9E4NVB1FgYcRseEX5loKZAJBHgJUk3ZlpbAKJijpxyvPkiADoYCy8vYZgVH+gGL2wYfutSyMje7UzU/gKzdYrsoMKoVzJ2+8bwEjpWvYYD/v1toUgJJqUYC0bWDKVylvxcykHDTP/5hrbOdSEPKD7mw9Q2dSrQTVa5A== X-Forefront-PRVS: 0899B47777 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2239; 23:Qt1ivBkq2bhBtA0srnD04mooMD/BC0Krbe8WhqxND?= =?us-ascii?Q?1sfYGChZLt+aOuCxsS6DcX+7YCvjkV6IW6ZD5n8r0FBuiaOTzxmBjTgOmITZ?= =?us-ascii?Q?TahmTYlV3HW9BIVT3xp3C5vZzzpz3UHudW3ptMa929G6Z6SnNzvL5XZgusqH?= =?us-ascii?Q?inBNZ6vTknhEb64CeGGVRM7LvfvjSoxVTOVTakZG0KfBypY5VeskukTYfn/1?= =?us-ascii?Q?8lgCJN9O4DcxI33029IWH9Nxwpy1ERcgGJv2s4BtZ78gWQ1+KV4osYXTGvw0?= =?us-ascii?Q?kQx7YfAeG/P/m0k7D3oTRtu+GgFRAZgA0bDuXYx/LrIFCreVdLn8etvE7s2w?= =?us-ascii?Q?F7Q9Wx63uYIrvrcGV788tmfW5k9bI2W5L0/ISqqE3TExBzU6PJuBATmeosfb?= =?us-ascii?Q?0dIq+dNWuUb4CelivT2uFzZujqn9KV4kXSLpeGco+GCtDTasXBqYhI6ALmky?= =?us-ascii?Q?nSjuYoKfUlxn5LmTaE+9gBWPFflkkOD+uMg5XCi7UIM54y6jkyaZ18aG3NF5?= =?us-ascii?Q?/OeLhrk+T6MzcO8cmVkxHtD311j+NVteKp9VE5uBrIwEby7xs7KcBL1PPJWl?= =?us-ascii?Q?rBb1gav/tU4EZmvAsXSqbUYO3q+fCGPJFmTpV8v5WJbcenl9gz0Jei9sgqGx?= =?us-ascii?Q?9zRkqcoAErf1fergsYBcSvigoo/SOiEFmOjglm3ydG1Dh2kHXUBtdSIbxXi7?= =?us-ascii?Q?CheRR5bCfYYywCyaDjbUhPJoz/oSDy0SxEHXmd2ZWQMxtkcSTN67ud5xWdde?= =?us-ascii?Q?OW1vdZ9ZH2ZlC7RfJX2gaHZUzvCEFdy+a4nxPKWWQ+AZ0GY2X4OEBY1gt786?= =?us-ascii?Q?k377huX2E2858PbWW+swskrpSMtU+F6Up8T2YvO3C4yssnohrnoWXFRPj9Me?= =?us-ascii?Q?SynlkwyQfs5q4cYMK4lVQcbgew+WWcM2zdodPb9KP7iIS6bpmVUqCI9186NI?= =?us-ascii?Q?efBejTh6ytLz3BUNAbwk/w6fW20xzIaj0mkebnzE6L68JbQpIW6/FzCzOcGV?= =?us-ascii?Q?caqnJH1FJv7DL3Ucs09ayaThgCNSA6zt2NFuG5eemjDzi1BsUUNnR7MCf8Ui?= =?us-ascii?Q?rCf7c0=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2239; 5:gDJvYaXo/2UDeXYaiDQK25qstY0SWkt9BEn0hWTCdj4HEdp2JOwJ//kUS5gThDsu3GCK8LnW5yTcX+aUUiZZp2xbJAdKUnU84bwuWnNDkMr2gzGpCLH0f38Iw5x0xbDMdXGbAsB06WF87v05IiMsiaCFAJUqcaiRhCFIsGPfLzk=; 24:RB5MAwIeaZIBTwrh94L/Ljlv1GYB54N8AGu/mp5fhI9XytW+pVOdyVMIgb7rRrwM3xKANIRfMyuHywEVOQSJ4A4Tdjgwz4gC2WVx0PeoVMU= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2016 10:02:13.5553 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2239 Cc: zhiqiang.hou@nxp.com, wenbin.song@nxp.com, Gong Qianyu <Qianyu.Gong@nxp.com> Subject: [U-Boot] [PATCH 2/2] armv8: ls1043a: load Fman ucode from SD/MMC under SD boot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <http://lists.denx.de/mailman/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <http://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: <http://lists.denx.de/mailman/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
On 04/01/2016 03:02 AM, Gong Qianyu wrote: > Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> > --- > include/configs/ls1043a_common.h | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > Applied to u-boot-fsl-qoriq master. Awaiting upstream. Thanks. York
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 2432531..e900c50 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -216,7 +216,15 @@ /* Store Fman ucode at offeset 0x160000(11 blocks). */ #define CONFIG_SYS_QE_FMAN_FW_IN_NAND #define CONFIG_SYS_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE) -#elif defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#elif defined(CONFIG_SD_BOOT) +/* + * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is + * about 1MB (2040 blocks), Env is stored after the image, and the env size is + * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 2080(0x820). + */ +#define CONFIG_SYS_QE_FMAN_FW_IN_MMC +#define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820) +#elif defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000 #define CONFIG_ENV_SPI_BUS 0
Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com> --- include/configs/ls1043a_common.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)