From 060241f0bb51406f83bf82bafec6a356e31f4a27 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 1 Mar 2020 10:32:07 +0100
Subject: [PATCH] Revert "Switched OrangePi 4 to SPL/TPL + bl31 u-boot scenario
 (#1774)"

This reverts commit 45de363a0fda09dc631282cd59267b3a3582d47b.
---
 config/sources/families/rk3399.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/sources/families/rk3399.conf b/config/sources/families/rk3399.conf
index 506701ad1a..9eee709daa 100644
--- a/config/sources/families/rk3399.conf
+++ b/config/sources/families/rk3399.conf
@@ -22,12 +22,12 @@ if [[ $BOARD == roc-rk3399-pc ]]; then
 
 	BOOT_USE_MAINLINE_ATF=yes
 
-elif [[ $BOARD == rockpi-4* || $BOARD == orangepi4 ]]; then
+elif [[ $BOARD == rockpi-4* ]]; then
 
 	BOOT_USE_TPL_SPL_BLOB=yes
 	BL31_BLOB='rk33/rk3399_bl31_v1.30.elf'
 
-elif [[ $BOARD == nanopim4v2 ]]; then
+elif [[ $BOARD == nanopim4v2 || $BOARD == orangepi4 ]]; then
 
 	BOOT_USE_BLOBS=yes
 	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin'