Add FVP pre-boot package

Drop grub-arm and u-boot packages

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

1 files changed, 27 insertions, 33 deletions

diff --git a/hwpacks/linaro-vexpress b/hwpacks/linaro-vexpress
index 7105d70..9c7d94a 100644
--- a/hwpacks/linaro-vexpress
+++ b/hwpacks/linaro-vexpress
@@ -23,22 +23,13 @@ packages:
 - linux-headers-linaro-vexpress
 - ubuntu-vexpress-extras-config
 - kvm-boot-wrapper
-- grub-arm
+- fvp-pre-boot
 wired_interfaces:
 - eth0
 sources:
   linaro: http://ppa.launchpad.net/linaro-maintainers/overlay/ubuntu raring main
   ubuntu: http://ports.ubuntu.com/ubuntu-ports raring main universe
 bootloaders:
-  u_boot:
-    extra_boot_options:
-    - mem=1024M
-    - ip=dhcp
-    - clcd=xvga
-    - mmci.fmax=4000000
-    package: u-boot-linaro-vexpress-ca9x4
-    file: usr/lib/u-boot/vexpress_ca9x4/u-boot.bin
-    in_boot_part: true
   uefi:
     extra_boot_options:
     - mem=1024M
@@ -46,27 +37,30 @@ bootloaders:
     - clcd=xvga
     - mmci.fmax=4000000
     package: uefi-image-vexpress
-    file: usr/lib/uefi/vexpress/uefi_v2p-ca9.bin
-    in_boot_part: true
-#    copy_files:
-#      - usr/lib/uefi/vexpress/uefi_v2p-ca5s.bin
-#      - usr/lib/uefi/vexpress/uefi_v2p-ca15-tc1.bin
-#      - usr/lib/uefi/vexpress/uefi_v2p-ca15-tc2.bin
+    file: usr/lib/uefi/vexpress/uefi_fvp-base.bin
+    in_boot_part: false
 dtb_files:
-- v2p-ca5s.dtb : lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca5s.dtb
-- v2p-ca9.dtb : lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca9.dtb
-- v2p-ca15-tc1.dtb : lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca15-tc1.dtb
-- v2p-ca15-tc2.dtb : lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca15_a7.dtb
-- rtsm/rtsm_ve-ca9x2.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a9x2.dtb
-- rtsm/rtsm_ve-ca9x4.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a9x4.dtb
-- rtsm/rtsm_ve-ca15x1.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x1.dtb
-- rtsm/rtsm_ve-ca15x2.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x2.dtb
-- rtsm/rtsm_ve-ca15x4.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x4.dtb
-- rtsm/rtsm_ve-ca15x1-ca7x1.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-v2p-ca15x1-ca7x1.dtb
-- rtsm/rtsm_ve-ca15x4-ca7x4.dtb : lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-v2p-ca15x4-ca7x4.dtb
-- uefi_v2p-ca5s.bin : usr/lib/uefi/vexpress/uefi_v2p-ca5s.bin
-- uefi_v2p-ca15-tc1.bin : usr/lib/uefi/vexpress/uefi_v2p-ca15-tc1.bin
-- uefi_v2p-ca15-tc2.bin : usr/lib/uefi/vexpress/uefi_v2p-ca15-tc2.bin
-- rtsm/uefi_rtsm_ve-ca9x4.bin : usr/lib/uefi/vexpress/uefi_rtsm_ve-ca9x4.bin
-- rtsm/uefi_rtsm_ve-ca15.bin : usr/lib/uefi/vexpress/uefi_rtsm_ve-ca15.bin
-- rtsm/linux-system-semi.axf : boot/img.axf
+- fvp/BL2_AP_Trusted_RAM.bin: lib/firmware/fvp-pre-boot/BL2_AP_Trusted_RAM.bin
+- fvp/BL31_AP_Trusted_RAM.bin: lib/firmware/fvp-pre-boot/BL31_AP_Trusted_RAM.bin
+- fvp/bl1.bin: lib/firmware/fvp-pre-boot/bl1.bin
+- fvp/fvp-base-gicv2-psci.dtb: lib/firmware/*-linaro-vexpress64/device-tree/fvp-base-gicv2-psci.dtb
+- fvp/fvp-base-gicv2legacy-psci.dtb: lib/firmware/*-linaro-vexpress64/device-tree/fvp-base-gicv2legacy-psci.dtb
+- fvp/fvp-base-gicv3-psci.dtb: lib/firmware/*-linaro-vexpress64/device-tree/fvp-base-gicv3-psci.dtb
+- fvp/uefi_fvp-base.bin: usr/lib/uefi/vexpress/uefi_fvp-base.bin
+- rtsm/linux-system-semi.axf: boot/img.axf
+- rtsm/rtsm_ve-ca15x1-ca7x1.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-v2p-ca15x1-ca7x1.dtb
+- rtsm/rtsm_ve-ca15x1.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x1.dtb
+- rtsm/rtsm_ve-ca15x2.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x2.dtb
+- rtsm/rtsm_ve-ca15x4-ca7x4.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-v2p-ca15x4-ca7x4.dtb
+- rtsm/rtsm_ve-ca15x4.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a15x4.dtb
+- rtsm/rtsm_ve-ca9x2.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a9x2.dtb
+- rtsm/rtsm_ve-ca9x4.dtb: lib/firmware/*-linaro-vexpress/device-tree/rtsm_ve-cortex_a9x4.dtb
+- rtsm/uefi_rtsm_ve-ca15.bin: usr/lib/uefi/vexpress/uefi_rtsm_ve-ca15.bin
+- rtsm/uefi_rtsm_ve-ca9x4.bin: usr/lib/uefi/vexpress/uefi_rtsm_ve-ca9x4.bin
+- uefi_v2p-ca15-tc1.bin: usr/lib/uefi/vexpress/uefi_v2p-ca15-tc1.bin
+- uefi_v2p-ca15-tc2.bin: usr/lib/uefi/vexpress/uefi_v2p-ca15-tc2.bin
+- uefi_v2p-ca5s.bin: usr/lib/uefi/vexpress/uefi_v2p-ca5s.bin
+- v2p-ca15-tc1.dtb: lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca15-tc1.dtb
+- v2p-ca15-tc2.dtb: lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca15_a7.dtb
+- v2p-ca5s.dtb: lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca5s.dtb
+- v2p-ca9.dtb: lib/firmware/*-linaro-vexpress/device-tree/vexpress-v2p-ca9.dtb
\ No newline at end of file