From 8ad1e284924719f3cf1bf3a93b215acd4ebab12d Mon Sep 17 00:00:00 2001 From: Joakim Bech <joakim.bech@linaro.org> Date: Mon, 27 Aug 2018 08:37:35 +0200 Subject: [PATCH] docs: remove HiKey Debian instructions Signed-off-by: Joakim Bech <joakim.bech@linaro.org> Acked-by: Jerome Forissier <jerome.forissier@linaro.org> --- README.md | 1 - docs/hikey.md | 80 +++------------------------------------------------ 2 files changed, 4 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 386261f..a045785 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,6 @@ Here is a list of manifests for the devices currently supported. | QEMUv8 | `qemu_v8.xml` | `qemu_v8_stable.xml` | | | FVP | `fvp.xml` | `fvp_stable.xml` | [fvp.md] | | HiKey | `hikey.xml` | `hikey_stable.xml` | [hikey.md] | -| HiKey Debian | `hikey_debian.xml` | `hikey_debian_stable.xml`| [hikey.md] | | Poplar Debian | `poplar.xml` | | [] | | MediaTek MT8173 EVB Board | `mt8173-evb.xml` | `mt8173-evb_stable.xml` | [mtk8173.md] | | ARM Juno board| `juno.xml` | `juno_stable.xml` | [juno.md] | diff --git a/docs/hikey.md b/docs/hikey.md index 4573d6a..32fc5a5 100644 --- a/docs/hikey.md +++ b/docs/hikey.md @@ -5,13 +5,10 @@ 2. [Multiple sources for HiKey and OP-TEE instructions?](#2-multiple-sources-for-hikey-and-op-tee-instructions) 3. [Supported HiKey boards?](#3-supported-hikey-boards) 4. [Regular build](#4-regular-build) -5. [Debian based build](#5-debian-based-build) -6. [Recovery](#6-recovery) +5. [Recovery](#5-recovery) # 1. Introduction -The instructions here will tell how to run OP-TEE on HiKey. We have two variants -that we support. One is the regular build as described in the [README.md] file. -The other is a Debian based build. +The instructions here will tell how to run OP-TEE on [HiKey 6220]. # 2. Multiple sources for HiKey and OP-TEE instructions? First you must understand that HiKey project as such is led by the 96Boards @@ -56,77 +53,7 @@ See `CFG_NW_CONSOLE_UART` and `CFG_NW_CONSOLE_UART` in [hikey.mk]. Just follow the "Get and build the solution" in the [README.md] file. The `make flash` step will tell you how you should set the jumpers on the board. -# 5. Debian based build -The intention here was to do almost the same kind of build as the regular where -the big difference is the kernel in use and the rootfs. The kernel currently -comes from the 96Boards team, but that might change soon again. The rootfs is -Debian based. - -In the rootfs OP-TEE binaries can be installed via `apt`. After building the -solution one must replace those, since they can be a bit dated (see below about -how to dpkg force install a couple of OP-TEE Debian packages). - -## 5.1 Building the OP-TEE Debian based setup -Do the same as the regular build (of course you should use the Debian based -manifest file). - -Next, the `make flash` step will tell you how you should set the jumpers on the -board and how to flash the device. - -**NOTE**: There have been reports of some boards stalling or getting stuck in -`make flash` when flashing `SYSTEM_IMG`, i.e. the command does not complete -after more than 5 minutes. If that happens, please try running `make recovery` -instead. - -Now you can boot up the device, note that the **up-to-date** OP-TEE normal world -binaries still hasn't been put on the device at this stage. So by now you're -basically booting up an RPB build. When you have a prompt, the next step is to -connect the device to the network. WiFi is preferable, since HiKey has no -Ethernet jack. Easiest is to edit `/etc/network/interfaces`. To find out what to -add, run: -``` -$ make help -``` - -When that's been added, reboot and when you have a prompt again, you're ready to -push the OP-TEE client binaries and the kernel with OP-TEE support. First find -out the IP for your device (`ifconfig`). Then send the files to HiKey by -running: -```bash -$ IP=111.222.333.444 make send - -Credentials for the image are: -username: linaro -password: linaro -``` - -When the files has been transfered, please follow the commands from the `make -send` command which will install the debian packages on the device. Typically it -tells you to run something like this on the device itself: -```bash -$ dpkg --force-all -i /tmp/out/*.deb -$ dpkg --force-all -i /tmp/linux-image-*.deb -``` -## 5.2 Good to know -Just want to update secure side? Put the device in fastboot mode and -```bash -$ make arm-tf -$ make flash-fip - -``` - -Just want to update OP-TEE client software? Put the device in fastboot mode and -```bash -$ make optee-client -$ make xtest -``` - -Boot up the device and follow the instructions from make send -```bash -$ IP=111.222.333.444 make send -``` - -# 6. Recovery +# 5. Recovery If you manage to corrupt the device, so that fastboot doesn't load automatically on boot, then you will need to run the recovery procedure. Basically what you will need to do is use another make target and change some jumpers. All that is @@ -141,3 +68,4 @@ $ make recovery [README.md]: ../README.md [hikey.mk]: https://github.com/OP-TEE/build/blob/master/hikey.mk [96Boards UART Adapter Board]: http://www.96boards.org/product/uarts +[HiKey 6220]: https://www.96boards.org/product/hikey/ -- GitLab