From 7372a5138f6aa9081a39009530fbb8b1a2123983 Mon Sep 17 00:00:00 2001
From: Jerome Forissier <jerome.forissier@linaro.org>
Date: Tue, 28 Aug 2018 17:04:56 +0200
Subject: [PATCH] fvp: use DT file foundation-v8-gicv3-psci.dtb
The Device Tree configuration we need for the Foundation Platform is now
available upstream (v4.18) as foundation-v8-gicv3-psci.dts (it only lacks
the optee node and memory reservations). Let's use this new file instead
of a hacked version of foundation-v8.dts modified for PSCI and GiCv3.
Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
---
fvp.mk | 2 +-
fvp/grub/grub.cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fvp.mk b/fvp.mk
index 40b5b26..e910c31 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -167,7 +167,7 @@ boot-img: linux grub buildroot
rm -f $(BOOT_IMG)
mformat -i $(BOOT_IMG) -n 64 -h 255 -T 131072 -v "BOOT IMG" -C ::
mcopy -i $(BOOT_IMG) $(LINUX_PATH)/arch/arm64/boot/Image ::
- mcopy -i $(BOOT_IMG) $(LINUX_PATH)/arch/arm64/boot/dts/arm/foundation-v8.dtb ::
+ mcopy -i $(BOOT_IMG) $(LINUX_PATH)/arch/arm64/boot/dts/arm/foundation-v8-gicv3-psci.dtb ::
mmd -i $(BOOT_IMG) ::/EFI
mmd -i $(BOOT_IMG) ::/EFI/BOOT
mcopy -i $(BOOT_IMG) $(ROOT)/out-br/images/rootfs.cpio.gz ::/initrd.img
diff --git a/fvp/grub/grub.cfg b/fvp/grub/grub.cfg
index 6ddef34..2b1fc84 100644
--- a/fvp/grub/grub.cfg
+++ b/fvp/grub/grub.cfg
@@ -6,5 +6,5 @@ set timeout=10
menuentry 'GNU/Linux (OP-TEE)' {
linux /Image console=tty0 console=ttyAMA0,115200 earlycon=pl011,0x1c090000 root=/dev/disk/by-partlabel/system rootwait rw ignore_loglevel efi=noruntime
initrd /initrd.img
- devicetree /foundation-v8.dtb
+ devicetree /foundation-v8-gicv3-psci.dtb
}
--
GitLab