Browse Source

rockchip: rename miniarm to tinker board

Miniarm is the internal project code. Now it is officially named Tinker board.
So rename it.

Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Eddie Cai 8 years ago
parent
commit
6f27976455

+ 1 - 1
arch/arm/dts/Makefile

@@ -36,7 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3288-rock2-square.dtb \
 	rk3288-rock2-square.dtb \
 	rk3288-evb.dtb \
 	rk3288-evb.dtb \
 	rk3288-fennec.dtb \
 	rk3288-fennec.dtb \
-	rk3288-miniarm.dtb \
+	rk3288-tinker.dtb \
 	rk3288-popmetal.dtb \
 	rk3288-popmetal.dtb \
 	rk3399-evb.dtb
 	rk3399-evb.dtb
 dtb-$(CONFIG_ARCH_MESON) += \
 dtb-$(CONFIG_ARCH_MESON) += \

+ 3 - 3
arch/arm/dts/rk3288-miniarm.dts → arch/arm/dts/rk3288-tinker.dts

@@ -5,11 +5,11 @@
  */
  */
 
 
 /dts-v1/;
 /dts-v1/;
-#include "rk3288-miniarm.dtsi"
+#include "rk3288-tinker.dtsi"
 
 
 / {
 / {
-	model = "Miniarm-RK3288";
-	compatible = "rockchip,rk3288-miniarm", "rockchip,rk3288";
+	model = "Tinker-RK3288";
+	compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
 
 
 	chosen {
 	chosen {
 		stdout-path = &uart2;
 		stdout-path = &uart2;

+ 0 - 0
arch/arm/dts/rk3288-miniarm.dtsi → arch/arm/dts/rk3288-tinker.dtsi


+ 1 - 1
arch/arm/mach-rockchip/rk3288-board.c

@@ -60,7 +60,7 @@ int rk3288_qos_init(void)
 	writel(val, CPU_AXI_QOS_PRIORITY + VIO1_VOP_QOS);
 	writel(val, CPU_AXI_QOS_PRIORITY + VIO1_VOP_QOS);
 
 
 	if (!fdt_node_check_compatible(gd->fdt_blob, 0,
 	if (!fdt_node_check_compatible(gd->fdt_blob, 0,
-				       "rockchip,rk3288-miniarm"))
+				       "rockchip,rk3288-tinker"))
 	{
 	{
 		/* set isp qos to higher priority */
 		/* set isp qos to higher priority */
 		writel(val, CPU_AXI_QOS_PRIORITY + VIO1_ISP_R_QOS);
 		writel(val, CPU_AXI_QOS_PRIORITY + VIO1_ISP_R_QOS);

+ 5 - 5
arch/arm/mach-rockchip/rk3288/Kconfig

@@ -37,11 +37,11 @@ config TARGET_POPMETAL_RK3288
 	  2GB DDR3. Expansion connectors provide access to I2C, SPI, UART,
 	  2GB DDR3. Expansion connectors provide access to I2C, SPI, UART,
 	  GPIOs and display interface.
 	  GPIOs and display interface.
 
 
-config TARGET_MINIARM_RK3288
-	bool "miniarm-RK3288"
-	select BOARD_LATE_INIT
+config TARGET_TINKER_RK3288
+	bool "Tinker-RK3288"
+        select BOARD_LATE_INIT
 	help
 	help
-	  Miniarm is a RK3288-based development board with 2 USB ports, HDMI,
+	  Tinker is a RK3288-based development board with 2 USB ports, HDMI,
 	  micro-SD card, audio, Gigabit Ethernet. It also includes on-board
 	  micro-SD card, audio, Gigabit Ethernet. It also includes on-board
 	  8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to
 	  8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to
 	  I2C, SPI, UART, GPIOs.
 	  I2C, SPI, UART, GPIOs.
@@ -124,6 +124,6 @@ source "board/rockchip/evb_rk3288/Kconfig"
 
 
 source "board/rockchip/fennec_rk3288/Kconfig"
 source "board/rockchip/fennec_rk3288/Kconfig"
 
 
-source "board/rockchip/miniarm_rk3288/Kconfig"
+source "board/rockchip/tinker_rk3288/Kconfig"
 
 
 endif
 endif

+ 0 - 6
board/rockchip/miniarm_rk3288/MAINTAINERS

@@ -1,6 +0,0 @@
-MINIARM-RK3288
-M:	Lin Huang <hl@rock-chips.com>
-S:	Maintained
-F:	board/rockchip/miniarm_rk3288
-F:	include/configs/miniarm_rk3288.h
-F:	configs/miniarm-rk3288_defconfig

+ 3 - 3
board/rockchip/miniarm_rk3288/Kconfig → board/rockchip/tinker_rk3288/Kconfig

@@ -1,13 +1,13 @@
-if TARGET_MINIARM_RK3288
+if TARGET_TINKER_RK3288
 
 
 config SYS_BOARD
 config SYS_BOARD
-	default "miniarm_rk3288"
+	default "tinker_rk3288"
 
 
 config SYS_VENDOR
 config SYS_VENDOR
 	default "rockchip"
 	default "rockchip"
 
 
 config SYS_CONFIG_NAME
 config SYS_CONFIG_NAME
-	default "miniarm_rk3288"
+	default "tinker_rk3288"
 
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	def_bool y

+ 6 - 0
board/rockchip/tinker_rk3288/MAINTAINERS

@@ -0,0 +1,6 @@
+TINKER-RK3288
+M:	Lin Huang <hl@rock-chips.com>
+S:	Maintained
+F:	board/rockchip/tinker_rk3288
+F:	include/configs/tinker_rk3288.h
+F:	configs/tinker-rk3288_defconfig

+ 1 - 1
board/rockchip/miniarm_rk3288/Makefile → board/rockchip/tinker_rk3288/Makefile

@@ -4,4 +4,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 # SPDX-License-Identifier:     GPL-2.0+
 #
 #
 
 
-obj-y	+= miniarm-rk3288.o
+obj-y	+= tinker-rk3288.o

+ 0 - 0
board/rockchip/miniarm_rk3288/miniarm-rk3288.c → board/rockchip/tinker_rk3288/tinker-rk3288.c


+ 2 - 2
configs/miniarm-rk3288_defconfig → configs/tinker-rk3288_defconfig

@@ -3,9 +3,9 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_ROCKCHIP_RK3288=y
 CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
-CONFIG_TARGET_MINIARM_RK3288=y
+CONFIG_TARGET_TINKER_RK3288=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
 CONFIG_SPL_STACK_R_ADDR=0x80000
-CONFIG_DEFAULT_DEVICE_TREE="rk3288-miniarm"
+CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker"
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SILENT_CONSOLE=y
 CONFIG_CONSOLE_MUX=y
 CONFIG_CONSOLE_MUX=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_CPUINFO is not set

+ 1 - 1
doc/README.rockchip

@@ -42,7 +42,7 @@ At present seven RK3288 boards are supported:
    - Fennec RK3288 - use fennec-rk3288 configuration
    - Fennec RK3288 - use fennec-rk3288 configuration
    - Firefly RK3288 - use firefly-rk3288 configuration
    - Firefly RK3288 - use firefly-rk3288 configuration
    - Hisense Chromebook - use chromebook_jerry configuration
    - Hisense Chromebook - use chromebook_jerry configuration
-   - Miniarm RK3288 - use miniarm-rk3288 configuration
+   - Tinker RK3288 - use tinker-rk3288 configuration
    - PopMetal RK3288 - use popmetal-rk3288 configuration
    - PopMetal RK3288 - use popmetal-rk3288 configuration
    - Radxa Rock 2 - use rock2 configuration
    - Radxa Rock 2 - use rock2 configuration
 
 

+ 0 - 0
include/configs/miniarm_rk3288.h → include/configs/tinker_rk3288.h