[PATCH 05/11] rockchip: Ensure device settings is defined before rk3588_common.h

Jonas Karlman jonas at kwiboo.se
Sun Apr 6 02:24:26 CEST 2025


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

Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
---
 include/configs/evb_rk3588.h           | 4 ++--
 include/configs/khadas-edge2-rk3588s.h | 4 ++--
 include/configs/toybrick_rk3588.h      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/evb_rk3588.h b/include/configs/evb_rk3588.h
index 4568e2cace66..5ff1ddbfcbec 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 d279cf3826a9..fe8461d63626 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 faa2e6c19c3e..005650896760 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
-- 
2.49.0



More information about the U-Boot mailing list