Browse Source

rockchip: Rename jerry files to veyron

At present we have a single rk3288-based Chromebook: chromebook_jerry. But
all such Chromebooks can use the same binary with only device-tree
differences. The family name is 'veyron', so rename the files accordingly.

Also update the device-tree filename since this currently differs from
Linux.

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 7 years ago
parent
commit
5e9b15034b

+ 1 - 1
arch/arm/dts/Makefile

@@ -30,7 +30,7 @@ dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3036-sdk.dtb \
 	rk3288-firefly.dtb \
-	rk3288-jerry.dtb \
+	rk3288-veyron-jerry.dtb \
 	rk3288-rock2-square.dtb \
 	rk3288-evb.dtb \
 	rk3288-fennec.dtb \

+ 0 - 0
arch/arm/dts/rk3288-jerry.dts → arch/arm/dts/rk3288-veyron-jerry.dts


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

@@ -88,7 +88,7 @@ source "board/chipspark/popmetal_rk3288/Kconfig"
 
 source "board/firefly/firefly-rk3288/Kconfig"
 
-source "board/google/chromebook_jerry/Kconfig"
+source "board/google/veyron/Kconfig"
 
 source "board/radxa/rock2/Kconfig"
 

+ 2 - 2
board/google/chromebook_jerry/Kconfig → board/google/veyron/Kconfig

@@ -1,13 +1,13 @@
 if TARGET_CHROMEBOOK_JERRY
 
 config SYS_BOARD
-	default "chromebook_jerry"
+	default "veyron"
 
 config SYS_VENDOR
 	default "google"
 
 config SYS_CONFIG_NAME
-	default "chromebook_jerry"
+	default "veyron"
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y

+ 2 - 2
board/google/chromebook_jerry/MAINTAINERS → board/google/veyron/MAINTAINERS

@@ -1,6 +1,6 @@
 CHROMEBOOK JERRY BOARD
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
-F:	board/google/chromebook_jerry/
-F:	include/configs/chromebook_jerry.h
+F:	board/google/veyron/
+F:	include/configs/veyron.h
 F:	configs/chromebook_jerry_defconfig

+ 1 - 1
board/google/chromebook_jerry/Makefile → board/google/veyron/Makefile

@@ -4,4 +4,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y	+= jerry.o
+obj-y	+= veyron.o

+ 0 - 0
board/google/chromebook_jerry/jerry.c → board/google/veyron/veyron.c


+ 1 - 1
configs/chromebook_jerry_defconfig

@@ -7,7 +7,7 @@ CONFIG_TARGET_CHROMEBOOK_JERRY=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_SPL_STACK_R_ADDR=0x80000
-CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
+CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry"
 CONFIG_SILENT_CONSOLE=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_STACK_R=y

+ 0 - 0
include/configs/chromebook_jerry.h → include/configs/veyron.h