aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishal Bhoj <vishal.bhoj@linaro.org>2015-05-26 11:04:30 +0000
committerLinaro Android Code Review <android-review@review.linaro.org>2015-05-26 11:04:30 +0000
commiteaed4dd7a72ab64709ae03eebff82e192707f130 (patch)
tree3437af01cbf29dfe994579c8c0c2371948ed913c
parent384896dd20b208f681f67726aeca85f0cc68228c (diff)
parent08d72f3b180791c2f80b2ac8d6db2bd856120c44 (diff)
downloadvexpress-eaed4dd7a72ab64709ae03eebff82e192707f130.tar.gz
Merge "Revert "Use prebuilt UEFI firmware"" into linaro-lollipop
-rw-r--r--bootloader.mk18
-rw-r--r--vexpress-firmware/SOFTWARE/A5/uefi.binbin2621440 -> 0 bytes
-rw-r--r--vexpress-firmware/SOFTWARE/A9/uefi.binbin2621440 -> 0 bytes
-rw-r--r--vexpress-firmware/SOFTWARE/TC1/uefi.binbin2621440 -> 0 bytes
-rw-r--r--vexpress-firmware/SOFTWARE/TC2/uefi.binbin753664 -> 0 bytes
5 files changed, 10 insertions, 8 deletions
diff --git a/bootloader.mk b/bootloader.mk
index 71e978e..879fd66 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -1,9 +1,11 @@
-REALTOP=$(realpath $(TOP))
+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))
-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
+else
+$(eval $(call MAKE_EDK2_ROM,ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc,fvp-base,FVP_AARCH64_EFI,uefi_fvp-base.bin,AARCH64))
+endif
diff --git a/vexpress-firmware/SOFTWARE/A5/uefi.bin b/vexpress-firmware/SOFTWARE/A5/uefi.bin
deleted file mode 100644
index 7c589d4..0000000
--- a/vexpress-firmware/SOFTWARE/A5/uefi.bin
+++ /dev/null
Binary files differ
diff --git a/vexpress-firmware/SOFTWARE/A9/uefi.bin b/vexpress-firmware/SOFTWARE/A9/uefi.bin
deleted file mode 100644
index adbbb15..0000000
--- a/vexpress-firmware/SOFTWARE/A9/uefi.bin
+++ /dev/null
Binary files differ
diff --git a/vexpress-firmware/SOFTWARE/TC1/uefi.bin b/vexpress-firmware/SOFTWARE/TC1/uefi.bin
deleted file mode 100644
index 217a576..0000000
--- a/vexpress-firmware/SOFTWARE/TC1/uefi.bin
+++ /dev/null
Binary files differ
diff --git a/vexpress-firmware/SOFTWARE/TC2/uefi.bin b/vexpress-firmware/SOFTWARE/TC2/uefi.bin
deleted file mode 100644
index a255ed2..0000000
--- a/vexpress-firmware/SOFTWARE/TC2/uefi.bin
+++ /dev/null
Binary files differ