summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-11-13 14:22:10 -0700
committerSimon Glass <sjg@chromium.org>2016-11-25 17:59:31 -0700
commit5e9b15034b9e38a6908610229788cf0746d138fc (patch)
treef8255fa1add3d3715b3fdd268bd3ef6883643500
parent57db8c6d87a342c62f0c36475fb9c5faf821f9f2 (diff)
downloadu-boot-imx-5e9b15034b9e38a6908610229788cf0746d138fc.zip
u-boot-imx-5e9b15034b9e38a6908610229788cf0746d138fc.tar.gz
u-boot-imx-5e9b15034b9e38a6908610229788cf0746d138fc.tar.bz2
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>
-rw-r--r--arch/arm/dts/Makefile2
-rw-r--r--arch/arm/dts/rk3288-veyron-jerry.dts (renamed from arch/arm/dts/rk3288-jerry.dts)0
-rw-r--r--arch/arm/mach-rockchip/rk3288/Kconfig2
-rw-r--r--board/google/veyron/Kconfig (renamed from board/google/chromebook_jerry/Kconfig)4
-rw-r--r--board/google/veyron/MAINTAINERS (renamed from board/google/chromebook_jerry/MAINTAINERS)4
-rw-r--r--board/google/veyron/Makefile (renamed from board/google/chromebook_jerry/Makefile)2
-rw-r--r--board/google/veyron/veyron.c (renamed from board/google/chromebook_jerry/jerry.c)0
-rw-r--r--configs/chromebook_jerry_defconfig2
-rw-r--r--include/configs/veyron.h (renamed from include/configs/chromebook_jerry.h)0
9 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index cba7919..a345018 100644
--- a/arch/arm/dts/Makefile
+++ b/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 \
diff --git a/arch/arm/dts/rk3288-jerry.dts b/arch/arm/dts/rk3288-veyron-jerry.dts
index da37ea8..da37ea8 100644
--- a/arch/arm/dts/rk3288-jerry.dts
+++ b/arch/arm/dts/rk3288-veyron-jerry.dts
diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index c53d2e2..30c557b 100644
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/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"
diff --git a/board/google/chromebook_jerry/Kconfig b/board/google/veyron/Kconfig
index 3640513..b1f51ce 100644
--- a/board/google/chromebook_jerry/Kconfig
+++ b/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
diff --git a/board/google/chromebook_jerry/MAINTAINERS b/board/google/veyron/MAINTAINERS
index b01b6cd..d641eed 100644
--- a/board/google/chromebook_jerry/MAINTAINERS
+++ b/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
diff --git a/board/google/chromebook_jerry/Makefile b/board/google/veyron/Makefile
index d29a063..9868357 100644
--- a/board/google/chromebook_jerry/Makefile
+++ b/board/google/veyron/Makefile
@@ -4,4 +4,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-y += jerry.o
+obj-y += veyron.o
diff --git a/board/google/chromebook_jerry/jerry.c b/board/google/veyron/veyron.c
index 5119e95..5119e95 100644
--- a/board/google/chromebook_jerry/jerry.c
+++ b/board/google/veyron/veyron.c
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index 6f4ae18..46df1a6 100644
--- a/configs/chromebook_jerry_defconfig
+++ b/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
diff --git a/include/configs/chromebook_jerry.h b/include/configs/veyron.h
index b15cc26..b15cc26 100644
--- a/include/configs/chromebook_jerry.h
+++ b/include/configs/veyron.h