From patchwork Sat May 9 14:30:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pragnesh Patel X-Patchwork-Id: 1286704 X-Patchwork-Delegate: uboot@andestech.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=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=selector1 header.b=rkRwKKfk; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49K8qF6BjCz9sNH for ; Sun, 10 May 2020 00:34:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74223801B2; Sat, 9 May 2020 16:32:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.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=sifive.com header.i=@sifive.com header.b="rkRwKKfk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 045F2812DF; Sat, 9 May 2020 16:32:53 +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=-1.0 required=5.0 tests=BAYES_00,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 NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2062f.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::62f]) (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 59963813A6 for ; Sat, 9 May 2020 16:32:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pragnesh.patel@sifive.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZAHzDryBrdKcRbEK/0rL2LCM8UDHfROZGUagY5vBQHfq/nvuWr5afOpl7YDM6cxr0BDNtgvkeLN566S6ty0/OD5ZdOL0WqfAQMfKSjSdF+322cGAH+CDeEu+eya9KJlmoNx4K8IH3cxG1Hl/EFzttg2ZIj15seweYGBdgSxHi1dVzI3cfnEwmSgFnx+gpGG7z1NBwSVQixxpyeWd4Yr3UAF8199+3UshYYr6c3ZaZeZ7PmQtIZ4ExoE2enW7Jup3wvJJaZIP/1sgCbUcITTrvoXYtYluO+Ei0S+7hEuA/pL/G1W4+6ZkjrkF5hh3IGfkZkC/zAay1D23V4chvvwCFg== 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=99SUNNGIzmgyr62EUjEVnlLABNU6dMwzgBWPZvmL0lE=; b=h7m1bu+GKCnVryAdGNZGoa5s9FyCRAncklfFwpyM81pYieii59/viyUxhekAfUurOVtuTtz58K+dJlhPQelHytYwJ62zjP29QtkIAV1aZ752pElRbFhw+9SaC1K7OoRoeSm7ViAHEG56Q0eNefoz006eNORh3nZuEHriu2v9JQZTJJ6r5yBdE7pyMBxAyYxaOFz8HAEV+UEtpviEBp/GVU3H7ky6cBkxHASnrqsUPxj6qVSTDThww9wQIVOEfF+so8ZLNLZOavdWHyN4U8hgZB6Xw52MXPk6y4ldO8cEVP4SAfasdsCnvo+EWD6hPYeaf5aZcv3gavx/ik1JvlkqDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sifive.com; dmarc=pass action=none header.from=sifive.com; dkim=pass header.d=sifive.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=99SUNNGIzmgyr62EUjEVnlLABNU6dMwzgBWPZvmL0lE=; b=rkRwKKfkwP5e5peS6ZxZvbzTKYGkn1u5r1hbYR2VEBdpbZGK1N6sIgDccNzk5gEMQGhSV1h5uWOImZg8R8ML09R619J5EuPRlNVJdDok+0jJmYbVrP5aVKvip/LhTI9TJknxheBfrhuSamjc6KW6r4Cec35/9QwlZ+YFSi5oBCM= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=sifive.com; Received: from MWHPR13MB0944.namprd13.prod.outlook.com (2603:10b6:300:15::19) by MWHPR13MB1806.namprd13.prod.outlook.com (2603:10b6:300:130::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.14; Sat, 9 May 2020 14:32:46 +0000 Received: from MWHPR13MB0944.namprd13.prod.outlook.com ([fe80::7d7c:7f0b:7a05:fa2c]) by MWHPR13MB0944.namprd13.prod.outlook.com ([fe80::7d7c:7f0b:7a05:fa2c%9]) with mapi id 15.20.3000.014; Sat, 9 May 2020 14:32:46 +0000 From: Pragnesh Patel To: u-boot@lists.denx.de Cc: atish.patra@wdc.com, palmerdabbelt@google.com, bmeng.cn@gmail.com, paul.walmsley@sifive.com, jagan@amarulasolutions.com, troy.benjegerdes@sifive.com, anup.patel@wdc.com, sagar.kadam@sifive.com, rick@andestech.com, Pragnesh Patel , Palmer Dabbelt , Joe Hershberger Subject: [PATCH v8 18/21] configs: fu540: Add config options for U-Boot SPL Date: Sat, 9 May 2020 20:00:33 +0530 Message-Id: <20200509143037.26009-19-pragnesh.patel@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200509143037.26009-1-pragnesh.patel@sifive.com> References: <20200509143037.26009-1-pragnesh.patel@sifive.com> X-ClientProxiedBy: LNXP123CA0022.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::34) To MWHPR13MB0944.namprd13.prod.outlook.com (2603:10b6:300:15::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sachinj2-OptiPlex-7010.open-silicon.com (114.143.65.226) by LNXP123CA0022.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:d2::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Sat, 9 May 2020 14:32:41 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [114.143.65.226] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 102276a4-f279-4a06-3765-08d7f425d748 X-MS-TrafficTypeDiagnostic: MWHPR13MB1806: X-LD-Processed: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 03982FDC1D X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xhcWVrlPWKf5avoekiS3RF1R6UqDEe++8M9A8aAfQh8kX1wGgjWJm5iNzGLZfRbkM1iPkU5ITDeyrDQ3dl+fDIdFeMofLdsaMMVbb6iRJZd5/3wD4038FldRPSgxNvWwUA6XfkwKEOvv2pHJ54YfMVKj+wgyBijXxp6jYIatBJEyP/fgRPTfzuAl/5hF/7ICemt2y4mtjstdc5I7uXq39nsHym/8RYBkBbiz0ToNOnw6qNZW1D+QiQ/RpZBI6j9CrJPcOdWhIWzEykf1ojFVM2m5i8B6UHCP6l0A4CcBZi3jHmYYSL+itQxbDuwaTqem2rU83f1kDJBmcViKlyw7QFEWbyWgGyPsYLlHIfxambOoLeXGbF2SLzE7mUMuZxLCrebT6PqQ2BHtc0DvRtw2HM3L1/skylM+yvmwdhfmxjqrJpy7sP0orjm56k2e9Sn0Or4e8K9RoRPVOBX3LXjKLCnZ0q3xlV88V8XDqvO88OVzrdW7DFblyodr3A/7WvLBjlrBGxWUuqVp82tg32e9ZbIyeLr3sbOM+fR0yWCMP17rDTSBXaWDUEh1XY4GZN9K2Gq6dCtvdM0njzlm/CE0yJ1yLvYYh31Gi6u+8cT3VnE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR13MB0944.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(346002)(396003)(366004)(376002)(136003)(39840400004)(33430700001)(2616005)(1006002)(956004)(44832011)(36756003)(5660300002)(6506007)(16526019)(186003)(52116002)(26005)(316002)(54906003)(66476007)(66946007)(6916009)(66556008)(6486002)(86362001)(6512007)(2906002)(966005)(8936002)(478600001)(6666004)(4326008)(8676002)(1076003)(33440700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: pQN8KGU1ectNelNGjGQXfEi8WQ488wuSyHKHlbW4KlZ3rhvviV0t7poEqcKueJBI5FMmW281FFxKDd0yKmVSaekmBgkDAhuN3ikgvq7AN/FB8dsHVonaBkM6NxLK9se1KMOAOIqGQytoX3lAQUC4zOQxmiw2sAL7/QIqG3tICRYFQ09ZwKyvX2ywV6rmCEGbU6DZ12XuFrOOlN+WU/1rMCZSXm/eoun7dCbcy/QTnHUWphlcLG+1fho1qWNXRkKxqyRNd7yKLMQeI4pYt6EjqPtA9Pd30Hwrmffm2n6UgJpi1u5OaZniftS9IeVqDxRImUflmzbRrcmPBq8xL4CwnBfLMeeqYmpuNxcX//Gx8Z8p6S4+6AiPxx1mdOC2lftz//TlMLS09fBzejxr8JUMX1K+stoUDu/eeoO38T3chYgBP3nO3c6tORzI1sZAbTZhICbgzn1T2josrkj66gKpCTxk/9tZcc5BUjFl62A2/do= X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-Network-Message-Id: 102276a4-f279-4a06-3765-08d7f425d748 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2020 14:32:46.2614 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vXHfc3qNTkR2y44PXaMLEuxN297uRuPOdH8EyGTnrC6cpvYh0xmvWxdEC7fVIlT8K7h8QHXuHCArbh8JBhNkmsczSCP7Xtaxbbcuhjxbyro= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR13MB1806 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean With sifive_fu540_defconfig: User can use FSBL or u-boot-spl.bin anyone at a time. For FSBL, fsbl->fw_payload.bin (opensbi + U-Boot) For u-boot-spl.bin, u-boot-spl.bin->FIT image (opensbi + U-Boot + dtb) U-Boot SPL will be loaded by ZSBL from SD card (replace fsbl.bin with u-boot-spl.bin) and runs in L2 LIM in machine mode and then load FIT image u-boot.itb from SD card into RAM. U-Boot SPL expects u-boot.itb FIT image at the starting of SD card sector number (0x822) of GUID type "2E54B353-1271-4842-806F-E436D6AF6985" Signed-off-by: Pragnesh Patel Signed-off-by: Jagan Teki Reviewed-by: Jagan Teki --- configs/sifive_fu540_defconfig | 8 ++ doc/board/sifive/fu540.rst | 134 +++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) diff --git a/configs/sifive_fu540_defconfig b/configs/sifive_fu540_defconfig index f805aacc7a..8d412f8d6a 100644 --- a/configs/sifive_fu540_defconfig +++ b/configs/sifive_fu540_defconfig @@ -1,6 +1,11 @@ CONFIG_RISCV=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x3000 CONFIG_ENV_SIZE=0x20000 +CONFIG_SPL_MMC_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_SPL=y +CONFIG_SPL_SPI_SUPPORT=y CONFIG_TARGET_SIFIVE_FU540=y CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y @@ -9,7 +14,10 @@ CONFIG_FIT=y CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_CPUINFO=y CONFIG_DISPLAY_BOARDINFO=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_OF_BOARD_FIXUP=y CONFIG_DEFAULT_DEVICE_TREE="hifive-unleashed-a00" CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SPL_CLK=y CONFIG_DM_MTD=y diff --git a/doc/board/sifive/fu540.rst b/doc/board/sifive/fu540.rst index 610ba87074..89e8d66c56 100644 --- a/doc/board/sifive/fu540.rst +++ b/doc/board/sifive/fu540.rst @@ -31,6 +31,9 @@ TODO: stdout-path = "/soc/serial@10010000:115200"; }; +Booting from MMC using FSBL +--------------------------- + Building -------- @@ -421,3 +424,134 @@ as well. Please press Enter to activate this console. / # + +Booting from MMC using U-Boot SPL +--------------------------------- + +Building +-------- + +Before building U-Boot SPL, OpenSBI must be built first. OpenSBI can be +cloned and built for FU540 as below: + +.. code-block:: console + + git clone https://github.com/riscv/opensbi.git + cd opensbi + make PLATFORM=generic FW_DYNAMIC=y + +Copy OpenSBI FW_DYNAMIC image +(build/platform/generic/firmware/fw_dynamic.bin) into U-Boot +root directory + +.. code-block:: console + + cp build/platform/generic/firmware/fw_dynamic.bin + +Now build the U-Boot SPL and U-Boot proper + +.. code-block:: console + + cd + make sifive_fu540_defconfig + make + +This will generate spl/u-boot-spl.bin and FIT image (u-boot.itb) + + +Flashing +-------- + +ZSBL loads the U-Boot SPL (u-boot-spl.bin) from a partition with GUID type +5B193300-FC78-40CD-8002-E86C45580B47 + +U-Boot SPL expects a U-Boot FIT image (u-boot.itb) from a partition with GUID +type 2E54B353-1271-4842-806F-E436D6AF6985 + +FIT image (u-boot.itb) is a combination of fw_dynamic.bin, u-boot-nodtb.bin and +device tree blob (hifive-unleashed-a00.dtb) + +Format the SD card (make sure the disk has GPT, otherwise use gdisk to switch) + +.. code-block:: none + + # sudo sgdisk --clear \ + > --set-alignment=2 \ + > --new=1:34:2081 --change-name=1:loader1 --typecode=1:5B193300-FC78-40CD-8002-E86C45580B47 \ + > --new=2:2082:10273 --change-name=2:loader2 --typecode=2:2E54B353-1271-4842-806F-E436D6AF6985 \ + > --new=3:10274: --change-name=3:rootfs --typecode=3:0FC63DAF-8483-4772-8E79-3D69D8477DE4 \ + > /dev/sda + +Program the SD card + +.. code-block:: none + + sudo dd if=spl/u-boot-spl.bin of=/dev/sda seek=34 + sudo dd if=u-boot.itb of=/dev/sda seek=2082 + +Booting +------- +Once you plugin the sdcard and power up, you should see the U-Boot prompt. + +Sample boot log from HiFive Unleashed board +------------------------------------------- + +.. code-block:: none + + U-Boot SPL 2020.04-rc2-00109-g63efc7e07e-dirty (Apr 30 2020 - 13:52:36 +0530) + Trying to boot from MMC1 + + + U-Boot 2020.04-rc2-00109-g63efc7e07e-dirty (Apr 30 2020 - 13:52:36 +0530) + + CPU: rv64imafdc + Model: SiFive HiFive Unleashed A00 + DRAM: 8 GiB + MMC: spi@10050000:mmc@0: 0 + In: serial@10010000 + Out: serial@10010000 + Err: serial@10010000 + Board serial number should not be 0 !! + Net: + Warning: ethernet@10090000 (eth0) using random MAC address - 96:06:92:18:eb:04 + eth0: ethernet@10090000 + Hit any key to stop autoboot: 0 + => version + U-Boot 2020.04-rc2-00109-g63efc7e07e-dirty (Apr 30 2020 - 13:52:36 +0530) + + riscv64-unknown-linux-gnu-gcc (crosstool-NG 1.24.0.37-3f461da) 9.2.0 + GNU ld (crosstool-NG 1.24.0.37-3f461da) 2.32 + => mmc info + Device: spi@10050000:mmc@0 + Manufacturer ID: 3 + OEM: 5344 + Name: SC16G + Bus Speed: 20000000 + Mode: SD Legacy + Rd Block Len: 512 + SD version 2.0 + High Capacity: Yes + Capacity: 14.8 GiB + Bus Width: 1-bit + Erase Group Size: 512 Bytes + => mmc part + + Partition Map for MMC device 0 -- Partition Type: EFI + + Part Start LBA End LBA Name + Attributes + Type GUID + Partition GUID + 1 0x00000022 0x00000821 "loader1" + attrs: 0x0000000000000000 + type: 5b193300-fc78-40cd-8002-e86c45580b47 + guid: 66e2b5d2-74db-4df8-ad6f-694b3617f87f + 2 0x00000822 0x00002821 "loader2" + attrs: 0x0000000000000000 + type: 2e54b353-1271-4842-806f-e436d6af6985 + guid: 8befaeaf-bca0-435d-b002-e201f37c0a2f + 3 0x00002822 0x01dacbde "rootfs" + attrs: 0x0000000000000000 + type: 0fc63daf-8483-4772-8e79-3d69d8477de4 + type: linux + guid: 9faa81b6-39b1-4418-af5e-89c48f29c20d