diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig
index cc038088472..f7562bd610f 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 ae2a9ebe479..ef45f629252 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 5d75c1fc0f6..8d35b4e62bd 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