From c418addfa9e758b05531eb37498c6fa0317d2c64 Mon Sep 17 00:00:00 2001
From: Kever Yang <kever.yang@rock-chips.com>
Date: Fri, 8 Jul 2016 11:30:58 +0800
Subject: [PATCH] board: move all the rockchip board in one folder

The 'evb_rk3036' and 'kylin' is not a vendor name, let's replace them
to 'rockchip' which is a real _vendor_ name, and meet the architecure
'board/<vendor>/<board-name>/'.

More boards from rockchip like evb_rk3288, evb_rk3399 will comes later.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Eddie Cai <eddie.cai.kernel@gmail.com>
---
 arch/arm/mach-rockchip/rk3036/Kconfig                  | 4 ++--
 board/{evb_rk3036 => rockchip}/evb_rk3036/Kconfig      | 2 +-
 board/{evb_rk3036 => rockchip}/evb_rk3036/MAINTAINERS  | 0
 board/{evb_rk3036 => rockchip}/evb_rk3036/Makefile     | 0
 board/{evb_rk3036 => rockchip}/evb_rk3036/evb_rk3036.c | 0
 board/{kylin => rockchip}/kylin_rk3036/Kconfig         | 2 +-
 board/{kylin => rockchip}/kylin_rk3036/MAINTAINERS     | 0
 board/{kylin => rockchip}/kylin_rk3036/Makefile        | 0
 board/{kylin => rockchip}/kylin_rk3036/kylin_rk3036.c  | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename board/{evb_rk3036 => rockchip}/evb_rk3036/Kconfig (89%)
 rename board/{evb_rk3036 => rockchip}/evb_rk3036/MAINTAINERS (100%)
 rename board/{evb_rk3036 => rockchip}/evb_rk3036/Makefile (100%)
 rename board/{evb_rk3036 => rockchip}/evb_rk3036/evb_rk3036.c (100%)
 rename board/{kylin => rockchip}/kylin_rk3036/Kconfig (90%)
 rename board/{kylin => rockchip}/kylin_rk3036/MAINTAINERS (100%)
 rename board/{kylin => rockchip}/kylin_rk3036/Makefile (100%)
 rename board/{kylin => rockchip}/kylin_rk3036/kylin_rk3036.c (100%)

diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig
index cc03808847..f7562bd610 100644
--- a/arch/arm/mach-rockchip/rk3036/Kconfig
+++ b/arch/arm/mach-rockchip/rk3036/Kconfig
@@ -15,7 +15,7 @@ config SYS_MALLOC_F_LEN
 config ROCKCHIP_COMMON
 	bool "Support rk common fuction"
 
-source "board/evb_rk3036/evb_rk3036/Kconfig"
-source "board/kylin/kylin_rk3036/Kconfig"
+source "board/rockchip/evb_rk3036/Kconfig"
+source "board/rockchip/kylin_rk3036/Kconfig"
 
 endif
diff --git a/board/evb_rk3036/evb_rk3036/Kconfig b/board/rockchip/evb_rk3036/Kconfig
similarity index 89%
rename from board/evb_rk3036/evb_rk3036/Kconfig
rename to board/rockchip/evb_rk3036/Kconfig
index ae2a9ebe47..ef45f62925 100644
--- a/board/evb_rk3036/evb_rk3036/Kconfig
+++ b/board/rockchip/evb_rk3036/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "evb_rk3036"
 
 config SYS_VENDOR
-	default "evb_rk3036"
+	default "rockchip"
 
 config SYS_CONFIG_NAME
 	default "evb_rk3036"
diff --git a/board/evb_rk3036/evb_rk3036/MAINTAINERS b/board/rockchip/evb_rk3036/MAINTAINERS
similarity index 100%
rename from board/evb_rk3036/evb_rk3036/MAINTAINERS
rename to board/rockchip/evb_rk3036/MAINTAINERS
diff --git a/board/evb_rk3036/evb_rk3036/Makefile b/board/rockchip/evb_rk3036/Makefile
similarity index 100%
rename from board/evb_rk3036/evb_rk3036/Makefile
rename to board/rockchip/evb_rk3036/Makefile
diff --git a/board/evb_rk3036/evb_rk3036/evb_rk3036.c b/board/rockchip/evb_rk3036/evb_rk3036.c
similarity index 100%
rename from board/evb_rk3036/evb_rk3036/evb_rk3036.c
rename to board/rockchip/evb_rk3036/evb_rk3036.c
diff --git a/board/kylin/kylin_rk3036/Kconfig b/board/rockchip/kylin_rk3036/Kconfig
similarity index 90%
rename from board/kylin/kylin_rk3036/Kconfig
rename to board/rockchip/kylin_rk3036/Kconfig
index 5d75c1fc0f..8d35b4e62b 100644
--- a/board/kylin/kylin_rk3036/Kconfig
+++ b/board/rockchip/kylin_rk3036/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "kylin_rk3036"
 
 config SYS_VENDOR
-	default "kylin"
+	default "rockchip"
 
 config SYS_CONFIG_NAME
 	default "kylin_rk3036"
diff --git a/board/kylin/kylin_rk3036/MAINTAINERS b/board/rockchip/kylin_rk3036/MAINTAINERS
similarity index 100%
rename from board/kylin/kylin_rk3036/MAINTAINERS
rename to board/rockchip/kylin_rk3036/MAINTAINERS
diff --git a/board/kylin/kylin_rk3036/Makefile b/board/rockchip/kylin_rk3036/Makefile
similarity index 100%
rename from board/kylin/kylin_rk3036/Makefile
rename to board/rockchip/kylin_rk3036/Makefile
diff --git a/board/kylin/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c
similarity index 100%
rename from board/kylin/kylin_rk3036/kylin_rk3036.c
rename to board/rockchip/kylin_rk3036/kylin_rk3036.c
-- 
2.30.2