From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 6 Apr 2025 00:24:26 +0000 (+0000)
Subject: rockchip: Ensure device settings is defined before rk3588_common.h
X-Git-Tag: v2025.07-rc1~33^2~57
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd753bc2a9cc95afd4e7c3df41c6ab0b8f77cc74;p=pandora-u-boot.git

rockchip: Ensure device settings is defined before rk3588_common.h

Ensure ROCKCHIP_DEVICE_SETTINGS is defined before including
rk3588_common.h in board include/configs files.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---

diff --git a/include/configs/evb_rk3588.h b/include/configs/evb_rk3588.h
index 4568e2cace6..5ff1ddbfcbe 100644
--- a/include/configs/evb_rk3588.h
+++ b/include/configs/evb_rk3588.h
@@ -6,10 +6,10 @@
 #ifndef __EVB_RK3588_H
 #define __EVB_RK3588_H
 
-#include <configs/rk3588_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
 
+#include <configs/rk3588_common.h>
+
 #endif
diff --git a/include/configs/khadas-edge2-rk3588s.h b/include/configs/khadas-edge2-rk3588s.h
index d279cf3826a..fe8461d6362 100644
--- a/include/configs/khadas-edge2-rk3588s.h
+++ b/include/configs/khadas-edge2-rk3588s.h
@@ -6,10 +6,10 @@
 #ifndef __KHADAS_EDGE2_RK3588_H
 #define __KHADAS_EDGE2_RK3588_H
 
-#include <configs/rk3588_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
 
+#include <configs/rk3588_common.h>
+
 #endif /* __KHADAS_EDGE2_RK3588_H */
diff --git a/include/configs/toybrick_rk3588.h b/include/configs/toybrick_rk3588.h
index faa2e6c19c3..00565089676 100644
--- a/include/configs/toybrick_rk3588.h
+++ b/include/configs/toybrick_rk3588.h
@@ -6,10 +6,10 @@
 #ifndef __TOYBRICK_RK3588_H
 #define __TOYBRICK_RK3588_H
 
-#include <configs/rk3588_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 		"stdout=serial,vidconsole\0" \
 		"stderr=serial,vidconsole\0"
 
+#include <configs/rk3588_common.h>
+
 #endif