rockchip: Use rk3568_common.h by default for RK356x boards

Ensure rk3568_common.h can be used by boards directly by defining a
blank ROCKCHIP_DEVICE_SETTINGS unless it already is defined.

Add a default SYS_CONFIG_NAME to include rk3568_common.h unless a board
target overrides it in its board Kconfig.

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

diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
index c589fd586993b1f6e264fc094bf155c3e82ce46d..8a18b411c8620c047aef7a586a48a9e5be5b5589 100644 (file)
--- a/arch/arm/mach-rockchip/rk3568/Kconfig
+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
@@ -84,4 +84,7 @@ source "board/qnap/ts433/Kconfig"
 source "board/radxa/zero3-rk3566/Kconfig"
 source "board/xunlong/orangepi-3b-rk3566/Kconfig"
 
+config SYS_CONFIG_NAME
+       default "rk3568_common"
+
 endif

diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index a68ca381db575d09690bab9df49a79d93662549c..b2a35db0b949d735d2ba3636c8f223b134dd4c7c 100644 (file)
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -15,6 +15,10 @@
 #define CFG_SYS_SDRAM_BASE             0
 #define SDRAM_MAX_SIZE                 0xf0000000
 
+#ifndef ROCKCHIP_DEVICE_SETTINGS
+#define ROCKCHIP_DEVICE_SETTINGS
+#endif
+
 #define ENV_MEM_LAYOUT_SETTINGS                \
        "scriptaddr=0x00c00000\0"       \
        "script_offset_f=0xffe000\0"    \