diff --git a/build_system.md b/build_system.md index 5d4aef6b2be7dd67da0e876b385e08daca23b9bf..e1f488d0aaee1e8b88079ebba124fd4f78dfa3b4 100644 --- a/build_system.md +++ b/build_system.md @@ -59,23 +59,6 @@ arguments. [See here](build_variants.md) for details. For a list of all `gen.py` options, run `gen.py --help`. -### Running Fuchsia - -The commands above create an `out/debug-{arch}/user.bootfs` file. To run the -system with this filesystem attached in QEMU, pass the path to user.bootfs as -the value of the `-x` parameter in Zircon's start command script, for example: - -``` -./scripts/run-zircon-x86-64 -x out/debug-x86-64/user.bootfs -m 2048 -./scripts/run-zircon-arm64 -x out/debug-aarch64/user.bootfs -m 2048 -``` - -See the [standard build instructions](/getting_started.md#Boot-from-QEMU) -for other flags you can pass to QEMU. - -[zircon]: https://fuchsia.googlesource.com/zircon/+/HEAD/docs/getting_started.md "Zircon" - - ### Running on ARM Hardware To build a fuchsia image for a particular ARM hardware target, you must also diff --git a/developing_on_nuc.md b/developing_on_nuc.md index e7c751c255d3fc825f16363b340698321356a925..19c0d54772a7da3ac3749573cce2f31921797cb0 100644 --- a/developing_on_nuc.md +++ b/developing_on_nuc.md @@ -3,10 +3,9 @@ This document describes how to get a NUC up and running with Fuchsia. [1. Get Parts](#parts)<br/> -[2. Create an Installable Fuchsia USB Drive](#usb)<br/> -[3. Prepare the NUC](#nuc)<br/> -[4. Install Fuchsia](#install)<br/> -[5. Update NUC BIOS to allow netbooting](#bios)<br/> +[2. Prepare the NUC](#nuc)<br/> +[3. Install Fuchsia](#install)<br/> +[4. Update NUC BIOS to allow netbooting](#bios)<br/> ----- @@ -43,22 +42,7 @@ This table shows what I bought from Amazon. ----- -## 2. Create an Installable Fuchsia USB Drive <a name="usb"/> - -Full description of what to do can be found [here](https://fuchsia.googlesource.com/install-fuchsia/+/master/README.md). - -The concise version is as follows: -Build Fuchsia. -Run “create installer bootfs†script. (If you built release, use -r argument) -Copy the installer bootfs over the user bootfs. -Plug in USB drive. -Unmount the USB drive (via “Disks†if you are on gLinux. If you unmount via the file browser it won’t work). -Run “create gigaboot bootable usb†script. (If you built release, use -r argument) -Unplug drive. - ------ - -## 3. Prepare the NUC <a name="nuc"/> +## 2. Prepare the NUC <a name="nuc"/> NUCs don’t come with RAM or an SSD so you need to install them. <br/><center><img width="50%" src="images/developing_on_nuc/parts.jpg"/></center><br/> @@ -77,6 +61,15 @@ NUCs don’t come with RAM or an SSD so you need to install them. ----- +## 3. Build Fuchsia <a name="build"/> + +1. Follow the [getting started guidelines](getting_started.md) +1. Plug in your USB key to your build workstation +1. Identify the path to your USB key by running `fx list-usb-disks` +1. Create a Zedboot USB by running `fx mkzedboot /path/to/usb/disk` +1. Plug the Zedboot USB key into the NUC and boot it +1. Run `fx boot` on your workstation + ## 4. Install Fuchsia <a name="install"/> 1. Plug in your installable fuchsia usb drive into NUC. diff --git a/getting_started.md b/getting_started.md index e54f47488a49e18a01452bcfdc9c297dade34557..10bd03b56b63ceb0c99efb33457f57d3666c9be2 100644 --- a/getting_started.md +++ b/getting_started.md @@ -126,7 +126,7 @@ using [QEMU](https://fuchsia.googlesource.com/zircon/+/HEAD/docs/qemu.md). Fuchsia includes prebuilt binaries for QEMU under `buildtools/qemu`. The `fx run` command will launch Zircon within QEMU, using the locally built -`user.bootfs`: +disk image: ``` fx run