From ea627f09205d0aa3773fd76158f7f9d4983a7fa9 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Tue, 4 Jul 2023 15:09:36 +0200 Subject: [PATCH] Fix booting for orange-pi-one-plus machine Use proper config for ATF. Signed-off-by: Marek Belisko --- conf/machine/include/sun50i-h6.inc | 8 ++++++++ conf/machine/orange-pi-one-plus.conf | 2 +- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 conf/machine/include/sun50i-h6.inc diff --git a/conf/machine/include/sun50i-h6.inc b/conf/machine/include/sun50i-h6.inc new file mode 100644 index 0000000..e406c6a --- /dev/null +++ b/conf/machine/include/sun50i-h6.inc @@ -0,0 +1,8 @@ +require conf/machine/include/sunxi64.inc + +DEFAULTTUNE ?= "cortexa53-crypto" +require conf/machine/include/arm/armv8a/tune-cortexa53.inc + +MACHINEOVERRIDES =. "sun50i:" + +SOC_FAMILY = "sun50i-h6" diff --git a/conf/machine/orange-pi-one-plus.conf b/conf/machine/orange-pi-one-plus.conf index db1589a..df7c861 100644 --- a/conf/machine/orange-pi-one-plus.conf +++ b/conf/machine/orange-pi-one-plus.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the Orange Pi One Plus, based on Allwinner H6 CPU -require conf/machine/include/sun50i.inc +require conf/machine/include/sun50i-h6.inc KERNEL_DEVICETREE = "allwinner/sun50i-h6-orangepi-one-plus.dtb" UBOOT_MACHINE = "orangepi_one_plus_defconfig" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index fc0d715..df34187 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,6 +1,7 @@ -COMPATIBLE_MACHINE = "(sun50i|sun50i-h616)" +COMPATIBLE_MACHINE = "(sun50i|sun50i-h616|sun50i-h6)" TFA_PLATFORM:sun50i = "sun50i_a64" +TFA_PLATFORM:sun50i-h6 = "sun50i_h6" TFA_PLATFORM:sun50i-h616 = "sun50i_h616" TFA_BUILD_TARGET = "bl31"