aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2015-06-09 07:41:41 +0000
committerLinaro Android Code Review <android-review@review.linaro.org>2015-06-09 07:41:41 +0000
commitac905d1a0b76e09f749c4fedc16be4c4c4c3b38d (patch)
tree5f0572d51387799a03533cea2c28c0dc69a40975
parenteaed4dd7a72ab64709ae03eebff82e192707f130 (diff)
parentfd748bde2fa33f40d38357057306fafebc3ad0de (diff)
downloadvexpress-ac905d1a0b76e09f749c4fedc16be4c4c4c3b38d.tar.gz
Merge "Revert "Revert "Use prebuilt UEFI firmware""" into linaro-lollipop
-rw-r--r--bootloader.mk18
-rw-r--r--vexpress-firmware/SOFTWARE/A5/uefi.binbin0 -> 2621440 bytes
-rw-r--r--vexpress-firmware/SOFTWARE/A9/uefi.binbin0 -> 2621440 bytes
-rw-r--r--vexpress-firmware/SOFTWARE/TC1/uefi.binbin0 -> 2621440 bytes
-rw-r--r--vexpress-firmware/SOFTWARE/TC2/uefi.binbin0 -> 753664 bytes
5 files changed, 8 insertions, 10 deletions
diff --git a/bootloader.mk b/bootloader.mk
index 879fd66..71e978e 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -1,11 +1,9 @@
-ifneq ($(strip $(ANDROID_64)),true)
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc -D EDK2_ARMVE_SINGLE_BINARY=1 -D EDK2_ARMVE_STANDALONE=1,ca9,ARMVEXPRESS_EFI,uefi_v2p-ca9.bin))
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.dsc -D EDK2_ARMVE_SINGLE_BINARY=1 -D EDK2_ARMVE_STANDALONE=1,ca15-tc1,ARMVEXPRESS_EFI,uefi_v2p-ca15-tc1.bin))
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc -D EDK2_ARMVE_SINGLE_BINARY=1 -D EDK2_ARMVE_STANDALONE=1,ca5s,ARMVEXPRESS_EFI,uefi_v2p-ca5s.bin))
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc -D ARM_BIGLITTLE_TC2=1 -D EDK2_ARMVE_SINGLE_BINARY=1,ca15-tc2,ARM_VEXPRESS_CTA15A7_EFI,uefi_v2p-ca15-tc2.bin))
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc -D EDK2_ARMVE_STANDALONE=1,rtsm-ca9,RTSM_VE_CORTEX-A9_EFI,rtsm/uefi_rtsm_ve-ca9x4.bin))
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc -D EDK2_ARMVE_STANDALONE=1,rtsm-ca15,RTSM_VE_CORTEX-A15_MPCORE_EFI,rtsm/uefi_rtsm_ve-ca15.bin))
+REALTOP=$(realpath $(TOP))
-else
-$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc,fvp-base,FVP_AARCH64_EFI,uefi_fvp-base.bin,AARCH64))
-endif
+copy-uefi:
+ cp ${REALTOP}/device/linaro/vexpress/vexpress-firmware/SOFTWARE/TC2/uefi.bin $(PRODUCT_OUT)/boot/uefi_v2p-ca15-tc2.bin
+ cp ${REALTOP}/device/linaro/vexpress/vexpress-firmware/SOFTWARE/TC1/uefi.bin $(PRODUCT_OUT)/boot/uefi_v2p-ca15-tc1.bin
+ cp ${REALTOP}/device/linaro/vexpress/vexpress-firmware/SOFTWARE/A9/uefi.bin $(PRODUCT_OUT)/boot/uefi_v2p-ca9.bin
+ cp ${REALTOP}/device/linaro/vexpress/vexpress-firmware/SOFTWARE/A5/uefi.bin $(PRODUCT_OUT)/boot/uefi_v2p-ca5s.bin
+
+boottarball: copy-uefi
diff --git a/vexpress-firmware/SOFTWARE/A5/uefi.bin b/vexpress-firmware/SOFTWARE/A5/uefi.bin
new file mode 100644
index 0000000..7c589d4
--- /dev/null
+++ b/vexpress-firmware/SOFTWARE/A5/uefi.bin
Binary files differ
diff --git a/vexpress-firmware/SOFTWARE/A9/uefi.bin b/vexpress-firmware/SOFTWARE/A9/uefi.bin
new file mode 100644
index 0000000..adbbb15
--- /dev/null
+++ b/vexpress-firmware/SOFTWARE/A9/uefi.bin
Binary files differ
diff --git a/vexpress-firmware/SOFTWARE/TC1/uefi.bin b/vexpress-firmware/SOFTWARE/TC1/uefi.bin
new file mode 100644
index 0000000..217a576
--- /dev/null
+++ b/vexpress-firmware/SOFTWARE/TC1/uefi.bin
Binary files differ
diff --git a/vexpress-firmware/SOFTWARE/TC2/uefi.bin b/vexpress-firmware/SOFTWARE/TC2/uefi.bin
new file mode 100644
index 0000000..a255ed2
--- /dev/null
+++ b/vexpress-firmware/SOFTWARE/TC2/uefi.bin
Binary files differ