summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2014-07-01 18:29:17 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2014-07-01 18:29:17 +0100
commit749fe3e00c6c59497aaa561b1c9f222b29634bbf (patch)
treee4c5ab20c6276453a292800d9de7e8cfc6f40c9d
parentdba872fa8b123d1d2aa2baea35ad1d010c47fe40 (diff)
downloadtextile_instructions-749fe3e00c6c59497aaa561b1c9f222b29634bbf.tar.gz
14.06: apply another update from Andy
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt7
-rw-r--r--android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt57
-rw-r--r--android/images/armv8-android-juno-lsk/HOWTO_install.txt52
-rw-r--r--android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt1
-rw-r--r--android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt7
-rw-r--r--android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt57
-rw-r--r--android/images/armv8-juice-juno-lsk/HOWTO_install.txt52
-rw-r--r--openembedded/juno-lsk/GETTINGSTARTED.textile57
-rw-r--r--openembedded/juno-lsk/HACKING.textile7
-rw-r--r--openembedded/juno-lsk/INSTALL.textile52
-rw-r--r--openembedded/juno-lsk/README.textile1
11 files changed, 262 insertions, 88 deletions
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
index f4d2b06..5b2d012 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -236,7 +236,7 @@ $ cp <path to prebuilt binary>/bl30.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl32.bin .
-$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL33_AP_UEFI.fd  bl33.bin
+$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL33_AP_UEFI.fd bl33.bin
If you wish to use the pre-built ARM trusted firmware and UEFI EDK2 images instead of building them from source, then the last four lines of the above block can independently be replaced with the following:
@@ -287,3 +287,8 @@ Updating "fip.bin"
For more details and options about the `fip_create` tool:
bc. $ fip_create --help
+
+
+h2. Installing the binaries
+
+Please refer to the section titled "Firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/#tabs-2.
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt b/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt
index 665d3ae..a77dc72 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_gettingstarted.txt
@@ -68,7 +68,7 @@ h3. Software preloaded on new Juno boards
New Juno boards arrive preloaded with MCC firmware, SCP firmware, AP trusted firmware, UEFI, and a Linux kernel. The Juno board does not contain a Linux filesystem or Android AOSP filesystem anywhere in onboard storage.
-*Please note* that early batches of Juno boards contained an SCP firmware image that limits the CPU clock to 50 MHz. ARM strongly recommends that you immediately upgrade to the latest firmware image hosted on this website by following the instructions in the section titled "Juno Board Recovery Image and MCC firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-2.
+*Please note* that early batches of Juno boards contained an SCP firmware image that limits the CPU clock to 50 MHz. ARM strongly recommends that you immediately upgrade to the latest firmware image hosted on this website by following the instructions in the section titled "Firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/#tabs-2.
When the power is first turned on, it should boot straight through to Linux. UEFI offers a 10 second window during which you can interrupt the boot sequence by pressing a key on the serial terminal, otherwise the Linux kernel will be launched. In order to reach the Linux shell you must attach a Linux "filesystem":https://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/#tabs-2 via USB. If no filesystem is attached then Linux will boot as far as it can and then announce that it is waiting for a filesystem to be attached.
@@ -123,7 +123,7 @@ The Mali GPU in Juno is able to use a variety of texture compression formats, ma
1. Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
-2. Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+2. Connect a USB cable between the USB Configuration Port on the rear panel and a USB port of your host computer.
3. Connect the 12 volt power supply to the board.
@@ -137,11 +137,12 @@ The configuration flash memory should now be visible on the host computer as a m
5. Open the file SITE1/HBI0262B/board.txt for editing.
-6. Consult the "Mali-T600 Series GPU Configuration and Sign-off Guide" to determine the correct value that should be programmed into the GPU texture format register to enable only the registers that you have licensed for use with Juno. For example, to enable all texture compression formats, the value should be 0xFFFFFFFF.
+6. Consult table 1 below to determine the correct value that should be programmed into the GPU texture format register to enable only the registers that you have licensed for use with Juno.
+ To reset to factory settings, the value to program should be 0x00FE001E.
7. In the [SCC REGISTERS] section, below the "TOTALSCCS" line, insert the following line:
-SCC: 0x05C <value from step 6 above> ;Optional comment to explain which texture you have enabled
+bc. SCC: 0x05C <value from step 6 above> ;Optional comment to explain which texture you have enabled
8. Update the TOTALSCCS count (increment it by one) so that it now reflects the total number of SCC registers that are programmed.
@@ -149,6 +150,53 @@ SCC: 0x05C <value from step 6 above> ;Optional comment to explain whic
The board will load the default configuration and boot up.
+<br><br>
+
+h4. Table 1. Bit mappings for the CONFIG_TEX_COMPRESSED_FORMAT_ENABLE register.
+
+&nbsp;&nbsp;&nbsp;&nbsp;*Please ensure you have obtained the appropriate license(s) before enabling these texture compression formats*
+
+|Bit|Texture compression format| Direct X 9| DirectX 10| DirectX 11| OpenGL ES 1.1| OpenGL ES 2.0| OpenGL ES 3.0| OpenGL 2.0 - 2.1| OpenGL 3.0 - 3.1| OpenGL 3.2 - 4.1| OpenGL 4.2|
+|0 | Invalid format | | | | | | | | | | |
+|1 | ETC2 | | | | x<sup>[a]</sup> | x<sup>[a]</sup> | x | | | | |
+|2 | EAC, 1 component | | | | | | x | | | | |
+|3 | ETC2 + EAC | | | | | | x | | | | |
+|4 | EAC, 2 components | | | | | | x | | | | |
+|5 | Reserved | | | | | | | | | | |
+|6 | NXR | | | | | | | | | | |
+|7 | BC1_UNORM (DXT1) | x | x | x | x<sup>[b]</sup> | x<sup>[b]</sup> | x<sup>[b]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|8 | BC2_UNORM (DXT3) | x | x | x | | x<sup>&#91;c]</sup> | x<sup>&#91;c]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|9 | BC3_UNORM (DXT5) | x | x | x | | x<sup>[d]</sup> | x<sup>[d]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|10 | BC4_UNORM (RGTC1_UNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|11 | BC4_SNORM (RGTC1_SNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|12 | BC5_UNORM (RGTC2_UNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|13 | BC5_SNORM (RGTC2_SNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|14 | BC6H_UF16 | | | x | | | | | | x<sup>[h]</sup> | x |
+|15 | BC6H_SF16 | | | x | | | | | | x<sup>[h]</sup> | x |
+|16 | BC7_UNORM | | | x | | | | | | x<sup>[h]</sup> | x |
+|17 | EAC_SNORM, 1 component | | | | | | x | | | | |
+|18 | EAC_SNORM, 2 components | | | | | | x | | | | |
+|19 | ETC2 + punch-through alpha | | | | | | x | | | | |
+|20 | ASTC 3D LDR | | | | | | | | | | |
+|21 | ASTC 3D HDR | | | | | | | | | | |
+|22 | ASTC 2D LDR | | | | x<sup>[e]</sup> | x<sup>[e]</sup> | x<sup>[e]</sup> | | | | |
+|23 | ASTC 2D HDR | | | | | | | | | | |
+|24 - 31 | Reserved | | | | | | | | | | |
+
+<p></p>
+
+Key
+&nbsp;&nbsp;&nbsp;[a]&nbsp;&nbsp; Enable for GL_OES_compressed_ETC1_RGB8_texture
+&nbsp;&nbsp;&nbsp;[b]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_dxt1
+&nbsp;&nbsp;&nbsp;[c]&nbsp;&nbsp; Enable for GL_ANGLE_texture_compression_dxt3
+&nbsp;&nbsp;&nbsp;[d]&nbsp;&nbsp; Enable for GL_ANGLE_texture_compression_dxt5
+&nbsp;&nbsp;&nbsp;[e]&nbsp;&nbsp; Enable for GL_KHR_texture_compression_astc_ldr
+&nbsp;&nbsp;&nbsp;[f]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_s3tc
+&nbsp;&nbsp;&nbsp;[g]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_rgtc
+&nbsp;&nbsp;&nbsp;[h]&nbsp;&nbsp; Enable for GL_ARB_texture_compression_bptc
+
+
+
h3. Additional documentation
For further details, please see the following documents.
@@ -156,4 +204,3 @@ For further details, please see the following documents.
* "Juno SoC Reference Manual":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DDI0515A3b_juno_arm_development_platform_soc_trm.pdf
* "V2M Juno Reference Manual":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DDI0524A4b_v2m_juno_reference_manual.pdf
* "SCPI protocol description":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=scpi-doc-v0.2.1.zip
-
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_install.txt b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
index 015b8b8..efa693f 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_install.txt
@@ -307,59 +307,65 @@ h2. DS-5 Configuration Files for Juno
As an optional step, you may wish to install DS-5 configuration files that will allow you to debug Juno. The procedure is as follows:
-1.      Extract the "DS-5 config files":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DS-5_config.zip anywhere on your host PC.
+1. Extract the "DS-5 config files":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DS-5_config.zip anywhere on your host PC.
-2.      Start DS-5 and select &quot;Preferences&quot; from the &quot;Window&quot; menu.
+2. Start DS-5 and select &quot;Preferences&quot; from the &quot;Window&quot; menu.
-3.      In the window that opens, expand the &quot;DS-5&quot; heading and select &quot;Configuration Database&quot;
+3. In the window that opens, expand the &quot;DS-5&quot; heading and select &quot;Configuration Database&quot;
-4.      In the dialogue that opens, fill in:
+4. In the dialogue that opens, fill in:
-a.       Name, which can be any string you like e.g. &quot;Juno&quot;.
+&nbsp;&nbsp;a. Name, which can be any string you like e.g. &quot;Juno&quot;.
-b.      Location, which must be the directory that you extracted the DS-5 config files to. Note this is not the &quot;boards&quot; directory, but the parent directory that now contains &quot;boards&quot;.
+&nbsp;&nbsp;b. Location, which must be the directory that you extracted the DS-5 config files to. Note this is not the &quot;boards&quot; directory, but the parent directory that now contains &quot;boards&quot;.
-5.      Click Ok to close the dialogue
+5. Click Ok to close the dialogue
-6.      Back in the &quot;Configuration Database&quot; screen, click on &quot;Rebuild database&quot; then click Ok.
+6. Back in the &quot;Configuration Database&quot; screen, click on &quot;Rebuild database&quot; then click Ok.
 
-h2(#firmware). Juno Board Recovery Image and MCC firmware update
+h2(#firmware). Firmware update
-This section describes how to reset all firmware images to their factory default state. This procedure is also the only way that you can install updates to the MCC firmware.
+This section describes how to update the firmware on the Juno board.
-The configuration of the Juno Development Platform board is determined by a set of files stored on a flash memory device on the board.  The flash memory can be accessed via a USB-B socket on the rear panel of the board.  When connected to a host computer, the flash memory will appear as a USB mass storage device with a FAT16 filesystem.  The files in this filesystem are edited to control the configuration of the board.
+The configuration of the Juno Development Platform board is determined by a set of files stored on a flash memory device on the board. The flash memory can be accessed via a USB-B socket on the rear panel of the board. When connected to a host computer, the flash memory will appear as a USB mass storage device with a FAT16 filesystem. The files in this filesystem are edited to control the configuration of the board.
-The configuration of the Juno Development Platform board can be returned to factory default by extracting the board recovery image onto the flash memory device, replacing any files already in the flash memory.
+The configuration of the Juno Development Platform board can be returned to factory default by extracting the Juno board recovery image onto the flash memory device, replacing any files already in the flash memory.
-To update the MCC firmware only, the procedure is just the same except that the MCC firmware update bundle will contain only a subset of the files contained in the full recovery image.
+To install firmware images that you have built yourself, the procedure is the same except that you will overwrite the contents of the /SOFTWARE/ directory with your own images.
-To carry out a system recovery or update the MCC firmware, follow these steps:
+To update the MCC firmware only, the procedure is the same except that the MCC firmware update bundle will contain only a subset of the files contained in the full recovery image.
-1.      Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
+<br>
-2.      Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+To carry out a system recovery, update the MCC firmware, or install your own custom firmware images, follow these steps:
-3.      Connect the 12 volt power supply to the board.
+1. Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
+
+2. Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+
+3. Connect the 12 volt power supply to the board.
The serial terminal will show the command prompt Cmd>
-4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
+4. At the Cmd> prompt on the serial terminal, issue the command usb_on
bc. Cmd> usb_on
The configuration flash memory should now be visible on the host computer as a mass storage device.
-5.      Save to the host PC any of the existing files in the configuration flash memory that you wish to retain for future use.
+5. Save to the host PC any of the existing files in the configuration flash memory that you wish to retain for future use.
+
+6. If you wish to update one or more of the firmware components then skip to step 7. Otherwise, for a full system recovery, format the configuration flash memory (FAT16).
-6.      If you wish to update the MCC firmware only then skip to step 7. Otherwise, for a full system recovery, format the configuration flash memory (FAT16).
+7. Extract the board recovery image ("board_recovery_image_0.7.5.zip":http://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/board_recovery_image_0.7.5.zip) to the root directory of the configuration flash memory, preserving the directory structure.
-7.      Extract the board recovery image ("board_recovery_image_0.7.5.zip":http://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/board_recovery_image_0.7.5.zip) to the root directory of the configuration flash memory, preserving the directory structure.
+8. If you are performing a system recovery or installing an update from ARM then skip to step 9. Otherwise if you wish to install firmware images that you have "built yourself":http://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/#tabs-3 then delete the bl1.bin and fip.bin from the /SOFTWARE/ directory in the configuration flash memory, and copy your own bl1.bin and fip.bin images into that directory to replace them.
-8.      Safely eject the mass storage device, giving it time to write the files to the internal storage.
+9. Safely eject the mass storage device, giving it time to write the files to the internal storage.
-9.      Press the red ON/OFF button on the rear panel of the board and wait for reprogramming to complete.
+10. Press the red ON/OFF button on the rear panel of the board and wait for reprogramming to complete.
The board will load the default configuration and boot up.
diff --git a/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt b/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
index 262cc35..08016a2 100644
--- a/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
+++ b/android/images/armv8-android-juno-lsk/HOWTO_releasenotes.txt
@@ -56,6 +56,7 @@ h3. Linux Kernel
* Limited set of peripherals present on the Juno development board: on-chip USB, non-secure UART, HDMI output, keyboard and mouse functionality over PS/2 connector, ethernet support is provided via on-board SMSC ethernet chip.
* Full USB driver support in Linux, for access to mass storage and input devices.
* big.LITTLE MP support for all 6 cores.
+* Unified kernel and kernel config for Android and Linux. 
* DVFS stable operating points are enabled for nominal and overdrive
h3. UEFI
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
index 81fbeac..f4158f8 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_getsourceandbuild.txt
@@ -235,7 +235,7 @@ $ cp <path to prebuilt binary>/bl30.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl32.bin .
-$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL33_AP_UEFI.fd  bl33.bin
+$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL33_AP_UEFI.fd bl33.bin
If you wish to use the pre-built ARM trusted firmware and UEFI EDK2 images instead of building them from source, then the last four lines of the above block can independently be replaced with the following:
@@ -286,3 +286,8 @@ Updating "fip.bin"
For more details and options about the `fip_create` tool:
bc. $ fip_create --help
+
+
+h2. Installing the binaries
+
+Please refer to the section titled "Firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/#tabs-2.
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt b/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt
index cde6517..115a8c4 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_gettingstarted.txt
@@ -68,7 +68,7 @@ h3. Software preloaded on new Juno boards
New Juno boards arrive preloaded with MCC firmware, SCP firmware, AP trusted firmware, UEFI, and a Linux kernel. The Juno board does not contain a Linux filesystem or Android AOSP filesystem anywhere in onboard storage.
-*Please note* that early batches of Juno boards contained an SCP firmware image that limits the CPU clock to 50 MHz. ARM strongly recommends that you immediately upgrade to the latest firmware image hosted on this website by following the instructions in the section titled "Juno Board Recovery Image and MCC firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-2.
+*Please note* that early batches of Juno boards contained an SCP firmware image that limits the CPU clock to 50 MHz. ARM strongly recommends that you immediately upgrade to the latest firmware image hosted on this website by following the instructions in the section titled "Firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/#tabs-2.
When the power is first turned on, it should boot straight through to Linux. UEFI offers a 10 second window during which you can interrupt the boot sequence by pressing a key on the serial terminal, otherwise the Linux kernel will be launched. In order to reach the Linux shell you must attach a Linux "filesystem":https://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/#tabs-2 via USB. If no filesystem is attached then Linux will boot as far as it can and then announce that it is waiting for a filesystem to be attached.
@@ -123,7 +123,7 @@ The Mali GPU in Juno is able to use a variety of texture compression formats, ma
1. Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
-2. Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+2. Connect a USB cable between the USB Configuration Port on the rear panel and a USB port of your host computer.
3. Connect the 12 volt power supply to the board.
@@ -137,11 +137,12 @@ The configuration flash memory should now be visible on the host computer as a m
5. Open the file SITE1/HBI0262B/board.txt for editing.
-6. Consult the "Mali-T600 Series GPU Configuration and Sign-off Guide" to determine the correct value that should be programmed into the GPU texture format register to enable only the registers that you have licensed for use with Juno. For example, to enable all texture compression formats, the value should be 0xFFFFFFFF.
+6. Consult table 1 below to determine the correct value that should be programmed into the GPU texture format register to enable only the registers that you have licensed for use with Juno.
+ To reset to factory settings, the value to program should be 0x00FE001E.
7. In the [SCC REGISTERS] section, below the "TOTALSCCS" line, insert the following line:
-SCC: 0x05C <value from step 6 above> ;Optional comment to explain which texture you have enabled
+bc. SCC: 0x05C <value from step 6 above> ;Optional comment to explain which texture you have enabled
8. Update the TOTALSCCS count (increment it by one) so that it now reflects the total number of SCC registers that are programmed.
@@ -149,6 +150,53 @@ SCC: 0x05C <value from step 6 above> ;Optional comment to explain whic
The board will load the default configuration and boot up.
+<br><br>
+
+h4. Table 1. Bit mappings for the CONFIG_TEX_COMPRESSED_FORMAT_ENABLE register.
+
+&nbsp;&nbsp;&nbsp;&nbsp;*Please ensure you have obtained the appropriate license(s) before enabling these texture compression formats*
+
+|Bit|Texture compression format| Direct X 9| DirectX 10| DirectX 11| OpenGL ES 1.1| OpenGL ES 2.0| OpenGL ES 3.0| OpenGL 2.0 - 2.1| OpenGL 3.0 - 3.1| OpenGL 3.2 - 4.1| OpenGL 4.2|
+|0 | Invalid format | | | | | | | | | | |
+|1 | ETC2 | | | | x<sup>[a]</sup> | x<sup>[a]</sup> | x | | | | |
+|2 | EAC, 1 component | | | | | | x | | | | |
+|3 | ETC2 + EAC | | | | | | x | | | | |
+|4 | EAC, 2 components | | | | | | x | | | | |
+|5 | Reserved | | | | | | | | | | |
+|6 | NXR | | | | | | | | | | |
+|7 | BC1_UNORM (DXT1) | x | x | x | x<sup>[b]</sup> | x<sup>[b]</sup> | x<sup>[b]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|8 | BC2_UNORM (DXT3) | x | x | x | | x<sup>&#91;c]</sup> | x<sup>&#91;c]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|9 | BC3_UNORM (DXT5) | x | x | x | | x<sup>[d]</sup> | x<sup>[d]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|10 | BC4_UNORM (RGTC1_UNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|11 | BC4_SNORM (RGTC1_SNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|12 | BC5_UNORM (RGTC2_UNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|13 | BC5_SNORM (RGTC2_SNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|14 | BC6H_UF16 | | | x | | | | | | x<sup>[h]</sup> | x |
+|15 | BC6H_SF16 | | | x | | | | | | x<sup>[h]</sup> | x |
+|16 | BC7_UNORM | | | x | | | | | | x<sup>[h]</sup> | x |
+|17 | EAC_SNORM, 1 component | | | | | | x | | | | |
+|18 | EAC_SNORM, 2 components | | | | | | x | | | | |
+|19 | ETC2 + punch-through alpha | | | | | | x | | | | |
+|20 | ASTC 3D LDR | | | | | | | | | | |
+|21 | ASTC 3D HDR | | | | | | | | | | |
+|22 | ASTC 2D LDR | | | | x<sup>[e]</sup> | x<sup>[e]</sup> | x<sup>[e]</sup> | | | | |
+|23 | ASTC 2D HDR | | | | | | | | | | |
+|24 - 31 | Reserved | | | | | | | | | | |
+
+<p></p>
+
+Key
+&nbsp;&nbsp;&nbsp;[a]&nbsp;&nbsp; Enable for GL_OES_compressed_ETC1_RGB8_texture
+&nbsp;&nbsp;&nbsp;[b]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_dxt1
+&nbsp;&nbsp;&nbsp;[c]&nbsp;&nbsp; Enable for GL_ANGLE_texture_compression_dxt3
+&nbsp;&nbsp;&nbsp;[d]&nbsp;&nbsp; Enable for GL_ANGLE_texture_compression_dxt5
+&nbsp;&nbsp;&nbsp;[e]&nbsp;&nbsp; Enable for GL_KHR_texture_compression_astc_ldr
+&nbsp;&nbsp;&nbsp;[f]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_s3tc
+&nbsp;&nbsp;&nbsp;[g]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_rgtc
+&nbsp;&nbsp;&nbsp;[h]&nbsp;&nbsp; Enable for GL_ARB_texture_compression_bptc
+
+
+
h3. Additional documentation
For further details, please see the following documents.
@@ -156,4 +204,3 @@ For further details, please see the following documents.
* "Juno SoC Reference Manual":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DDI0515A3b_juno_arm_development_platform_soc_trm.pdf
* "V2M Juno Reference Manual":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DDI0524A4b_v2m_juno_reference_manual.pdf
* "SCPI protocol description":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=scpi-doc-v0.2.1.zip
-
diff --git a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
index f5072c0..2cdc49a 100644
--- a/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
+++ b/android/images/armv8-juice-juno-lsk/HOWTO_install.txt
@@ -307,59 +307,65 @@ h2. DS-5 Configuration Files for Juno
As an optional step, you may wish to install DS-5 configuration files that will allow you to debug Juno. The procedure is as follows:
-1.      Extract the "DS-5 config files":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DS-5_config.zip anywhere on your host PC.
+1. Extract the "DS-5 config files":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DS-5_config.zip anywhere on your host PC.
-2.      Start DS-5 and select &quot;Preferences&quot; from the &quot;Window&quot; menu.
+2. Start DS-5 and select &quot;Preferences&quot; from the &quot;Window&quot; menu.
-3.      In the window that opens, expand the &quot;DS-5&quot; heading and select &quot;Configuration Database&quot;
+3. In the window that opens, expand the &quot;DS-5&quot; heading and select &quot;Configuration Database&quot;
-4.      In the dialogue that opens, fill in:
+4. In the dialogue that opens, fill in:
-a.       Name, which can be any string you like e.g. &quot;Juno&quot;.
+&nbsp;&nbsp;a. Name, which can be any string you like e.g. &quot;Juno&quot;.
-b.      Location, which must be the directory that you extracted the DS-5 config files to. Note this is not the &quot;boards&quot; directory, but the parent directory that now contains &quot;boards&quot;.
+&nbsp;&nbsp;b. Location, which must be the directory that you extracted the DS-5 config files to. Note this is not the &quot;boards&quot; directory, but the parent directory that now contains &quot;boards&quot;.
-5.      Click Ok to close the dialogue
+5. Click Ok to close the dialogue
-6.      Back in the &quot;Configuration Database&quot; screen, click on &quot;Rebuild database&quot; then click Ok.
+6. Back in the &quot;Configuration Database&quot; screen, click on &quot;Rebuild database&quot; then click Ok.
 
-h2(#firmware). Juno Board Recovery Image and MCC firmware update
+h2(#firmware). Firmware update
-This section describes how to reset all firmware images to their factory default state. This procedure is also the only way that you can install updates to the MCC firmware.
+This section describes how to update the firmware on the Juno board.
-The configuration of the Juno Development Platform board is determined by a set of files stored on a flash memory device on the board.  The flash memory can be accessed via a USB-B socket on the rear panel of the board.  When connected to a host computer, the flash memory will appear as a USB mass storage device with a FAT16 filesystem.  The files in this filesystem are edited to control the configuration of the board.
+The configuration of the Juno Development Platform board is determined by a set of files stored on a flash memory device on the board. The flash memory can be accessed via a USB-B socket on the rear panel of the board. When connected to a host computer, the flash memory will appear as a USB mass storage device with a FAT16 filesystem. The files in this filesystem are edited to control the configuration of the board.
-The configuration of the Juno Development Platform board can be returned to factory default by extracting the board recovery image onto the flash memory device, replacing any files already in the flash memory.
+The configuration of the Juno Development Platform board can be returned to factory default by extracting the Juno board recovery image onto the flash memory device, replacing any files already in the flash memory.
-To update the MCC firmware only, the procedure is just the same except that the MCC firmware update bundle will contain only a subset of the files contained in the full recovery image.
+To install firmware images that you have built yourself, the procedure is the same except that you will overwrite the contents of the /SOFTWARE/ directory with your own images.
-To carry out a system recovery or update the MCC firmware, follow these steps:
+To update the MCC firmware only, the procedure is the same except that the MCC firmware update bundle will contain only a subset of the files contained in the full recovery image.
-1.      Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
+<br>
-2.      Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+To carry out a system recovery, update the MCC firmware, or install your own custom firmware images, follow these steps:
-3.      Connect the 12 volt power supply to the board.
+1. Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
+
+2. Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+
+3. Connect the 12 volt power supply to the board.
The serial terminal will show the command prompt Cmd>
-4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
+4. At the Cmd> prompt on the serial terminal, issue the command usb_on
bc. Cmd> usb_on
The configuration flash memory should now be visible on the host computer as a mass storage device.
-5.      Save to the host PC any of the existing files in the configuration flash memory that you wish to retain for future use.
+5. Save to the host PC any of the existing files in the configuration flash memory that you wish to retain for future use.
+
+6. If you wish to update one or more of the firmware components then skip to step 7. Otherwise, for a full system recovery, format the configuration flash memory (FAT16).
-6.      If you wish to update the MCC firmware only then skip to step 7. Otherwise, for a full system recovery, format the configuration flash memory (FAT16).
+7. Extract the board recovery image ("board_recovery_image_0.7.5.zip":http://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/board_recovery_image_0.7.5.zip) to the root directory of the configuration flash memory, preserving the directory structure.
-7.      Extract the board recovery image ("board_recovery_image_0.7.5.zip":http://releases.linaro.org/14.06/android/images/armv8-android-juno-lsk/board_recovery_image_0.7.5.zip) to the root directory of the configuration flash memory, preserving the directory structure.
+8. If you are performing a system recovery or installing an update from ARM then skip to step 9. Otherwise if you wish to install firmware images that you have "built yourself":http://releases.linaro.org/14.06/android/images/armv8-juice-juno-lsk/#tabs-3 then delete the bl1.bin and fip.bin from the /SOFTWARE/ directory in the configuration flash memory, and copy your own bl1.bin and fip.bin images into that directory to replace them.
-8.      Safely eject the mass storage device, giving it time to write the files to the internal storage.
+9. Safely eject the mass storage device, giving it time to write the files to the internal storage.
-9.      Press the red ON/OFF button on the rear panel of the board and wait for reprogramming to complete.
+10. Press the red ON/OFF button on the rear panel of the board and wait for reprogramming to complete.
The board will load the default configuration and boot up.
diff --git a/openembedded/juno-lsk/GETTINGSTARTED.textile b/openembedded/juno-lsk/GETTINGSTARTED.textile
index 9674c0c..67a56d0 100644
--- a/openembedded/juno-lsk/GETTINGSTARTED.textile
+++ b/openembedded/juno-lsk/GETTINGSTARTED.textile
@@ -68,7 +68,7 @@ h3. Software preloaded on new Juno boards
New Juno boards arrive preloaded with MCC firmware, SCP firmware, AP trusted firmware, UEFI, and a Linux kernel. The Juno board does not contain a Linux filesystem or Android AOSP filesystem anywhere in onboard storage.
-*Please note* that early batches of Juno boards contained an SCP firmware image that limits the CPU clock to 50 MHz. ARM strongly recommends that you immediately upgrade to the latest firmware image hosted on this website by following the instructions in the section titled "Juno Board Recovery Image and MCC firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-2.
+*Please note* that early batches of Juno boards contained an SCP firmware image that limits the CPU clock to 50 MHz. ARM strongly recommends that you immediately upgrade to the latest firmware image hosted on this website by following the instructions in the section titled "Firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-2.
When the power is first turned on, it should boot straight through to Linux. UEFI offers a 10 second window during which you can interrupt the boot sequence by pressing a key on the serial terminal, otherwise the Linux kernel will be launched. In order to reach the Linux shell you must attach a Linux "filesystem":https://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-2 via USB. If no filesystem is attached then Linux will boot as far as it can and then announce that it is waiting for a filesystem to be attached.
@@ -123,7 +123,7 @@ The Mali GPU in Juno is able to use a variety of texture compression formats, ma
1. Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
-2. Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+2. Connect a USB cable between the USB Configuration Port on the rear panel and a USB port of your host computer.
3. Connect the 12 volt power supply to the board.
@@ -137,11 +137,12 @@ The configuration flash memory should now be visible on the host computer as a m
5. Open the file SITE1/HBI0262B/board.txt for editing.
-6. Consult the "Mali-T600 Series GPU Configuration and Sign-off Guide" to determine the correct value that should be programmed into the GPU texture format register to enable only the registers that you have licensed for use with Juno. For example, to enable all texture compression formats, the value should be 0xFFFFFFFF.
+6. Consult table 1 below to determine the correct value that should be programmed into the GPU texture format register to enable only the registers that you have licensed for use with Juno.
+ To reset to factory settings, the value to program should be 0x00FE001E.
7. In the [SCC REGISTERS] section, below the "TOTALSCCS" line, insert the following line:
-SCC: 0x05C <value from step 6 above> ;Optional comment to explain which texture you have enabled
+bc. SCC: 0x05C <value from step 6 above> ;Optional comment to explain which texture you have enabled
8. Update the TOTALSCCS count (increment it by one) so that it now reflects the total number of SCC registers that are programmed.
@@ -149,6 +150,53 @@ SCC: 0x05C <value from step 6 above> ;Optional comment to explain whic
The board will load the default configuration and boot up.
+<br><br>
+
+h4. Table 1. Bit mappings for the CONFIG_TEX_COMPRESSED_FORMAT_ENABLE register.
+
+&nbsp;&nbsp;&nbsp;&nbsp;*Please ensure you have obtained the appropriate license(s) before enabling these texture compression formats*
+
+|Bit|Texture compression format| Direct X 9| DirectX 10| DirectX 11| OpenGL ES 1.1| OpenGL ES 2.0| OpenGL ES 3.0| OpenGL 2.0 - 2.1| OpenGL 3.0 - 3.1| OpenGL 3.2 - 4.1| OpenGL 4.2|
+|0 | Invalid format | | | | | | | | | | |
+|1 | ETC2 | | | | x<sup>[a]</sup> | x<sup>[a]</sup> | x | | | | |
+|2 | EAC, 1 component | | | | | | x | | | | |
+|3 | ETC2 + EAC | | | | | | x | | | | |
+|4 | EAC, 2 components | | | | | | x | | | | |
+|5 | Reserved | | | | | | | | | | |
+|6 | NXR | | | | | | | | | | |
+|7 | BC1_UNORM (DXT1) | x | x | x | x<sup>[b]</sup> | x<sup>[b]</sup> | x<sup>[b]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|8 | BC2_UNORM (DXT3) | x | x | x | | x<sup>&#91;c]</sup> | x<sup>&#91;c]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|9 | BC3_UNORM (DXT5) | x | x | x | | x<sup>[d]</sup> | x<sup>[d]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> | x<sup>[f]</sup> |
+|10 | BC4_UNORM (RGTC1_UNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|11 | BC4_SNORM (RGTC1_SNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|12 | BC5_UNORM (RGTC2_UNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|13 | BC5_SNORM (RGTC2_SNORM) | | x | x | | | | x<sup>[g]</sup> | x | x | x |
+|14 | BC6H_UF16 | | | x | | | | | | x<sup>[h]</sup> | x |
+|15 | BC6H_SF16 | | | x | | | | | | x<sup>[h]</sup> | x |
+|16 | BC7_UNORM | | | x | | | | | | x<sup>[h]</sup> | x |
+|17 | EAC_SNORM, 1 component | | | | | | x | | | | |
+|18 | EAC_SNORM, 2 components | | | | | | x | | | | |
+|19 | ETC2 + punch-through alpha | | | | | | x | | | | |
+|20 | ASTC 3D LDR | | | | | | | | | | |
+|21 | ASTC 3D HDR | | | | | | | | | | |
+|22 | ASTC 2D LDR | | | | x<sup>[e]</sup> | x<sup>[e]</sup> | x<sup>[e]</sup> | | | | |
+|23 | ASTC 2D HDR | | | | | | | | | | |
+|24 - 31 | Reserved | | | | | | | | | | |
+
+<p></p>
+
+Key
+&nbsp;&nbsp;&nbsp;[a]&nbsp;&nbsp; Enable for GL_OES_compressed_ETC1_RGB8_texture
+&nbsp;&nbsp;&nbsp;[b]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_dxt1
+&nbsp;&nbsp;&nbsp;[c]&nbsp;&nbsp; Enable for GL_ANGLE_texture_compression_dxt3
+&nbsp;&nbsp;&nbsp;[d]&nbsp;&nbsp; Enable for GL_ANGLE_texture_compression_dxt5
+&nbsp;&nbsp;&nbsp;[e]&nbsp;&nbsp; Enable for GL_KHR_texture_compression_astc_ldr
+&nbsp;&nbsp;&nbsp;[f]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_s3tc
+&nbsp;&nbsp;&nbsp;[g]&nbsp;&nbsp; Enable for GL_EXT_texture_compression_rgtc
+&nbsp;&nbsp;&nbsp;[h]&nbsp;&nbsp; Enable for GL_ARB_texture_compression_bptc
+
+
+
h3. Additional documentation
For further details, please see the following documents.
@@ -156,4 +204,3 @@ For further details, please see the following documents.
* "Juno SoC Reference Manual":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DDI0515A3b_juno_arm_development_platform_soc_trm.pdf
* "V2M Juno Reference Manual":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DDI0524A4b_v2m_juno_reference_manual.pdf
* "SCPI protocol description":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=scpi-doc-v0.2.1.zip
-
diff --git a/openembedded/juno-lsk/HACKING.textile b/openembedded/juno-lsk/HACKING.textile
index e3a52d7..e5d60c0 100644
--- a/openembedded/juno-lsk/HACKING.textile
+++ b/openembedded/juno-lsk/HACKING.textile
@@ -224,7 +224,7 @@ $ cp <path to prebuilt binary>/bl30.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl2.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl31.bin .
$ cp $JUNO_ROOT_DIR/arm-trusted-firmware/build/juno/release/bl32.bin .
-$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL33_AP_UEFI.fd  bl33.bin
+$ cp $JUNO_ROOT_DIR/edk2/Build/ArmJuno/RELEASE_GCC48/FV/BL33_AP_UEFI.fd bl33.bin
If you wish to use the pre-built ARM trusted firmware and UEFI EDK2 images instead of building them from source, then the last four lines of the above block can independently be replaced with the following:
@@ -275,3 +275,8 @@ Updating "fip.bin"
For more details and options about the `fip_create` tool:
bc. $ fip_create --help
+
+
+h2. Installing the binaries
+
+Please refer to the section titled "Firmware update" on the "Binary Image Installation tab":https://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-2.
diff --git a/openembedded/juno-lsk/INSTALL.textile b/openembedded/juno-lsk/INSTALL.textile
index 64b3596..bef8631 100644
--- a/openembedded/juno-lsk/INSTALL.textile
+++ b/openembedded/juno-lsk/INSTALL.textile
@@ -308,58 +308,64 @@ h2. DS-5 Configuration Files for Juno
As an optional step, you may wish to install DS-5 configuration files that will allow you to debug Juno. The procedure is as follows:
-1.      Extract the "DS-5 config files":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DS-5_config.zip anywhere on your host PC.
+1. Extract the "DS-5 config files":https://wiki.linaro.org/ARM/Juno?action=AttachFile&do=get&target=DS-5_config.zip anywhere on your host PC.
-2.      Start DS-5 and select &quot;Preferences&quot; from the &quot;Window&quot; menu.
+2. Start DS-5 and select &quot;Preferences&quot; from the &quot;Window&quot; menu.
-3.      In the window that opens, expand the &quot;DS-5&quot; heading and select &quot;Configuration Database&quot;
+3. In the window that opens, expand the &quot;DS-5&quot; heading and select &quot;Configuration Database&quot;
-4.      In the dialogue that opens, fill in:
+4. In the dialogue that opens, fill in:
-a.       Name, which can be any string you like e.g. &quot;Juno&quot;.
+&nbsp;&nbsp;a. Name, which can be any string you like e.g. &quot;Juno&quot;.
-b.      Location, which must be the directory that you extracted the DS-5 config files to. Note this is not the &quot;boards&quot; directory, but the parent directory that now contains &quot;boards&quot;.
+&nbsp;&nbsp;b. Location, which must be the directory that you extracted the DS-5 config files to. Note this is not the &quot;boards&quot; directory, but the parent directory that now contains &quot;boards&quot;.
-5.      Click Ok to close the dialogue
+5. Click Ok to close the dialogue
-6.      Back in the &quot;Configuration Database&quot; screen, click on &quot;Rebuild database&quot; then click Ok.
+6. Back in the &quot;Configuration Database&quot; screen, click on &quot;Rebuild database&quot; then click Ok.
 
-h2(#firmware). Juno Board Recovery Image and MCC firmware update
+h2(#firmware). Firmware update
-This section describes how to reset all firmware images to their factory default state. This procedure is also the only way that you can install updates to the MCC firmware.
+This section describes how to update the firmware on the Juno board.
-The configuration of the Juno Development Platform board is determined by a set of files stored on a flash memory device on the board.  The flash memory can be accessed via a USB-B socket on the rear panel of the board.  When connected to a host computer, the flash memory will appear as a USB mass storage device with a FAT16 filesystem.  The files in this filesystem are edited to control the configuration of the board.
+The configuration of the Juno Development Platform board is determined by a set of files stored on a flash memory device on the board. The flash memory can be accessed via a USB-B socket on the rear panel of the board. When connected to a host computer, the flash memory will appear as a USB mass storage device with a FAT16 filesystem. The files in this filesystem are edited to control the configuration of the board.
-The configuration of the Juno Development Platform board can be returned to factory default by extracting the board recovery image onto the flash memory device, replacing any files already in the flash memory.
+The configuration of the Juno Development Platform board can be returned to factory default by extracting the Juno board recovery image onto the flash memory device, replacing any files already in the flash memory.
-To update the MCC firmware only, the procedure is just the same except that the MCC firmware update bundle will contain only a subset of the files contained in the full recovery image.
+To install firmware images that you have built yourself, the procedure is the same except that you will overwrite the contents of the /SOFTWARE/ directory with your own images.
-To carry out a system recovery or update the MCC firmware, follow these steps:
+To update the MCC firmware only, the procedure is the same except that the MCC firmware update bundle will contain only a subset of the files contained in the full recovery image.
-1.      Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
+<br>
-2.      Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+To carry out a system recovery, update the MCC firmware, or install your own custom firmware images, follow these steps:
-3.      Connect the 12 volt power supply to the board.
+1. Connect a serial terminal to the top 9-pin UART0 connector on the rear panel (115200 baud, 8, n, 1).
+
+2. Connect a USB cable between the USB-B connector on the rear panel and a USB port of your host computer.
+
+3. Connect the 12 volt power supply to the board.
The serial terminal will show the command prompt Cmd>
-4.      At the Cmd> prompt on the serial terminal, issue the command usb_on
+4. At the Cmd> prompt on the serial terminal, issue the command usb_on
bc. Cmd> usb_on
The configuration flash memory should now be visible on the host computer as a mass storage device.
-5.      Save to the host PC any of the existing files in the configuration flash memory that you wish to retain for future use.
+5. Save to the host PC any of the existing files in the configuration flash memory that you wish to retain for future use.
+
+6. If you wish to update one or more of the firmware components then skip to step 7. Otherwise, for a full system recovery, format the configuration flash memory (FAT16).
-6.      If you wish to update the MCC firmware only then skip to step 7. Otherwise, for a full system recovery, format the configuration flash memory (FAT16).
+7. Extract the board recovery image ("board_recovery_image_0.7.5.zip":http://releases.linaro.org/14.06/openembedded/juno-lsk/board_recovery_image_0.7.5.zip) to the root directory of the configuration flash memory, preserving the directory structure.
-7.      Extract the board recovery image ("board_recovery_image_0.7.5.zip":http://releases.linaro.org/14.06/openembedded/juno-lsk/board_recovery_image_0.7.5.zip) to the root directory of the configuration flash memory, preserving the directory structure.
+8. If you are performing a system recovery or installing an update from ARM then skip to step 9. Otherwise if you wish to install firmware images that you have "built yourself":http://releases.linaro.org/14.06/openembedded/juno-lsk/#tabs-3 then delete the bl1.bin and fip.bin from the /SOFTWARE/ directory in the configuration flash memory, and copy your own bl1.bin and fip.bin images into that directory to replace them.
-8.      Safely eject the mass storage device, giving it time to write the files to the internal storage.
+9. Safely eject the mass storage device, giving it time to write the files to the internal storage.
-9.      Press the red ON/OFF button on the rear panel of the board and wait for reprogramming to complete.
+10. Press the red ON/OFF button on the rear panel of the board and wait for reprogramming to complete.
The board will load the default configuration and boot up.
diff --git a/openembedded/juno-lsk/README.textile b/openembedded/juno-lsk/README.textile
index 4888c86..c6e7b03 100644
--- a/openembedded/juno-lsk/README.textile
+++ b/openembedded/juno-lsk/README.textile
@@ -40,7 +40,6 @@ h3. Linux Kernel
* Limited set of peripherals present on the Juno development board: on-chip USB, non-secure UART, HDMI output, keyboard and mouse functionality over PS/2 connector, ethernet support is provided via on-board SMSC ethernet chip.
* Full USB driver support in Linux, for access to mass storage and input devices.
* big.LITTLE MP support for all 6 cores.
-* Unified kernel and kernel config for Android and Linux.†
* DVFS stable operating points are enabled for nominal and overdrive
h3. UEFI