diff mbox

[2/2] configs: add u-noot and atfirmware options to juno

Message ID b0b00c7eeea5a904f3c7c7170716a3b55535e6b6.1462269854.git.jpinto@synopsys.com
State Changes Requested
Headers show

Commit Message

Joao Pinto May 3, 2016, 10:13 a.m. UTC 
This patch adds the necessary U-Boot and ATFirmware configurations to the
Juno's defconfig and updates the readme.txt file regarding the new output
binaries.

Signed-off-by: Joao Pinto <jpinto@synopsys.com>
---
 board/arm/juno/readme.txt  | 21 ++++++++++++++++++---
 configs/arm_juno_defconfig |  9 +++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Comments

Joao Pinto June 1, 2016, 10:45 a.m. UTC | #1 
Hi,

On 6/1/2016 11:37 AM, Liviu.Dudau@arm.com wrote:
> Hi Joao,
> 
> Your commit subject contains a mis-spelling of U-Boot.
> 
> Also, your "Resend" is not the same version as the original, you have changed
> BR2_TARGET_UBOOT_DEFCONFIG into BR2_TARGET_UBOOT_BOARDNAME. I've discovered
> that because I have applied your original patch and not the "Resend". Please
> label the patches correctly and add version number and logs to the 0/x email
> at least.

You spotted that right, thanks! Going to send e v2 in a sec.

> 
> I've given the build a go, it boots fine on my Juno r0 board (well, mostly,
> the hardcoded command line is waiting for /dev/sda2 which is not going to
> work for me because I have an NFS rootfs).
> 
> Best regards,
> Liviu
> 

Thanks,
Joao
diff mbox

Patch

diff --git a/board/arm/juno/readme.txt b/board/arm/juno/readme.txt
index 52fabf9..2a2af55 100644
--- a/board/arm/juno/readme.txt
+++ b/board/arm/juno/readme.txt
@@ -7,8 +7,8 @@  These instructions apply to all models of the ARM Juno:
   - Juno r0 (does not support PCIe)
   - Juno r1 (supports PCIe)
 
-Buildroot will generate the kernel image, device tree blob and a
-minimal root filesystem.
+Buildroot will generate the kernel image, device tree blob, bootloader binaries
+and a minimal root filesystem.
 
 How to build it
 ===============
@@ -42,6 +42,20 @@  After building, you should obtain this tree:
     +-- juno.dtb (if Juno r0 is used)
     +-- juno-r1.dtb (if Juno r1 is used)
     +-- Image
+    +-- bl1.bin
+    +-- bl2.bin
+    +-- bl2u.bin
+    +-- bl31.bin
+    +-- fip.bin
+    +-- scp-fw.bin
+    +-- u-boot.bin
+
+Preparing your rootfs
+======================
+
+Format your pen drive as a ext3 filesystem by executing:
+
+   $ mkfs.ext3 /dev/<your device>
 
 Preparing your rootfs
 ======================
@@ -98,7 +112,8 @@  Installing kernel image and DTB
 3. Open the software/ folder
 4. Copy the 'Image' file to software/
 5. Copy the 'juno-r1.dtb' (r1) or the 'juno.dtb' (r0) file to software/
-6. Press the red button in the front pannel of ARM Juno
+6. Copy the bootloader binaries (bl1.bin and fip.bin) to software/
+7. Press the red button in the front pannel of ARM Juno
 
 At this time, the board will erase the Flash entry for each new item and
 replace it with the lastest ones.
diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig
index 87b6374..2349000 100644
--- a/configs/arm_juno_defconfig
+++ b/configs/arm_juno_defconfig
@@ -12,3 +12,12 @@  BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1"
+BR2_TARGET_ATFIRMWARE=y
+BR2_TARGET_ATFIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ATFIRMWARE_CUSTOM_GIT_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
+BR2_TARGET_ATFIRMWARE_CUSTOM_GIT_VERSION="v1.2"
+BR2_TARGET_ATFIRMWARE_PLATFORM="juno"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vexpress_aemv8a_juno"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03"