From 80340dcf8634d6a8e0920c5696cad5293fc8b64b Mon Sep 17 00:00:00 2001
From: ZHANG Yuntian <yt@radxa.com>
Date: Thu, 6 Feb 2025 19:13:51 +0800
Subject: [PATCH] rockchip/rk3399: reverse dependency order

This order works better when we have more SoCs.
---
 radxa/rock-4c-plus/default.nix | 2 +-
 rockchip/default.nix           | 4 ++++
 rockchip/rk3399/default.nix    | 6 +-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/radxa/rock-4c-plus/default.nix b/radxa/rock-4c-plus/default.nix
index 5fb9d5d3..5f1b0278 100644
--- a/radxa/rock-4c-plus/default.nix
+++ b/radxa/rock-4c-plus/default.nix
@@ -9,7 +9,7 @@ let
 in {
   imports = [
     ../.
-    ../../rockchip/rk3399
+    ../../rockchip
   ];
 
   options.hardware.radxa.rock-4c-plus = {
diff --git a/rockchip/default.nix b/rockchip/default.nix
index 461baedd..d8d26720 100644
--- a/rockchip/default.nix
+++ b/rockchip/default.nix
@@ -6,6 +6,10 @@
 let
   cfg = config.hardware.rockchip;
 in {
+  imports = [
+    ./rk3399
+  ];
+
   options.hardware.rockchip = {
     enable = lib.mkEnableOption "Rockchip SoC support";
     diskoImageName = lib.mkOption {
diff --git a/rockchip/rk3399/default.nix b/rockchip/rk3399/default.nix
index 3aea18fd..5748c33e 100644
--- a/rockchip/rk3399/default.nix
+++ b/rockchip/rk3399/default.nix
@@ -6,12 +6,8 @@
 let
   cfg = config.hardware.rockchip.rk3399;
 in {
-  imports = [
-    ../.
-  ];
-
   options.hardware.rockchip.rk3399 = {
-      enable = lib.mkEnableOption "Rockchip RK3399 support";
+    enable = lib.mkEnableOption "Rockchip RK3399 support";
   };
 
   config = lib.mkIf cfg.enable {