From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 6 Apr 2025 00:24:25 +0000 (+0000)
Subject: rockchip: Ensure device settings is defined before rk3568_common.h
X-Git-Tag: v2025.07-rc1~33^2~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8f2dd137d573be9beca3a1ceb5b9d4c8d2bde6e;p=thirdparty%2Fu-boot.git

rockchip: Ensure device settings is defined before rk3568_common.h

Ensure ROCKCHIP_DEVICE_SETTINGS is defined before including
rk3568_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/anbernic-rgxx3-rk3566.h b/include/configs/anbernic-rgxx3-rk3566.h
index 3c4ea4e7d84..3d9e05a976a 100644
--- a/include/configs/anbernic-rgxx3-rk3566.h
+++ b/include/configs/anbernic-rgxx3-rk3566.h
@@ -3,10 +3,10 @@
 #ifndef __ANBERNIC_RGXX3_RK3566_H
 #define __ANBERNIC_RGXX3_RK3566_H
 
-#include <configs/rk3568_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
 
+#include <configs/rk3568_common.h>
+
 #endif
diff --git a/include/configs/evb_rk3568.h b/include/configs/evb_rk3568.h
index a0f2383bf2f..9070160cf58 100644
--- a/include/configs/evb_rk3568.h
+++ b/include/configs/evb_rk3568.h
@@ -6,10 +6,10 @@
 #ifndef __EVB_RK3568_H
 #define __EVB_RK3568_H
 
-#include <configs/rk3568_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
 
+#include <configs/rk3568_common.h>
+
 #endif
diff --git a/include/configs/powkiddy-x55-rk3566.h b/include/configs/powkiddy-x55-rk3566.h
index 4b25c6a8774..8ace435434f 100644
--- a/include/configs/powkiddy-x55-rk3566.h
+++ b/include/configs/powkiddy-x55-rk3566.h
@@ -3,10 +3,10 @@
 #ifndef __POWKIDDY_X55_RK3566_H
 #define __POWKIDDY_X55_RK3566_H
 
-#include <configs/rk3568_common.h>
-
 #define ROCKCHIP_DEVICE_SETTINGS \
 			"stdout=serial,vidconsole\0" \
 			"stderr=serial,vidconsole\0"
 
+#include <configs/rk3568_common.h>
+
 #endif