| Message ID | 1479072136-14246-17-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 13 November 2016 at 14:22, Simon Glass <sjg@chromium.org> wrote: > 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> > --- > > Changes in v2: None > > arch/arm/dts/Makefile | 2 +- > arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} | 0 > arch/arm/mach-rockchip/rk3288/Kconfig | 2 +- > board/google/{chromebook_jerry => veyron}/Kconfig | 4 ++-- > board/google/{chromebook_jerry => veyron}/MAINTAINERS | 4 ++-- > board/google/{chromebook_jerry => veyron}/Makefile | 2 +- > board/google/{chromebook_jerry/jerry.c => veyron/veyron.c} | 0 > configs/chromebook_jerry_defconfig | 2 +- > include/configs/{chromebook_jerry.h => veyron.h} | 0 > 9 files changed, 8 insertions(+), 8 deletions(-) > rename arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} (100%) > rename board/google/{chromebook_jerry => veyron}/Kconfig (74%) > rename board/google/{chromebook_jerry => veyron}/MAINTAINERS (60%) > rename board/google/{chromebook_jerry => veyron}/Makefile (81%) > rename board/google/{chromebook_jerry/jerry.c => veyron/veyron.c} (100%) > rename include/configs/{chromebook_jerry.h => veyron.h} (100%) Applied to u-boot-rockchip.
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 836a8c4..af8b0de 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -29,7 +29,7 @@ dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ dtb-$(CONFIG_EXYNOS7420) += exynos7420-espresso7420.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ 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 similarity index 100% rename from arch/arm/dts/rk3288-jerry.dts rename to 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 similarity index 74% rename from board/google/chromebook_jerry/Kconfig rename to 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 similarity index 60% rename from board/google/chromebook_jerry/MAINTAINERS rename to 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 similarity index 81% rename from board/google/chromebook_jerry/Makefile rename to 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 similarity index 100% rename from board/google/chromebook_jerry/jerry.c rename to 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 similarity index 100% rename from include/configs/chromebook_jerry.h rename to include/configs/veyron.h
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> --- Changes in v2: None arch/arm/dts/Makefile | 2 +- arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} | 0 arch/arm/mach-rockchip/rk3288/Kconfig | 2 +- board/google/{chromebook_jerry => veyron}/Kconfig | 4 ++-- board/google/{chromebook_jerry => veyron}/MAINTAINERS | 4 ++-- board/google/{chromebook_jerry => veyron}/Makefile | 2 +- board/google/{chromebook_jerry/jerry.c => veyron/veyron.c} | 0 configs/chromebook_jerry_defconfig | 2 +- include/configs/{chromebook_jerry.h => veyron.h} | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename arch/arm/dts/{rk3288-jerry.dts => rk3288-veyron-jerry.dts} (100%) rename board/google/{chromebook_jerry => veyron}/Kconfig (74%) rename board/google/{chromebook_jerry => veyron}/MAINTAINERS (60%) rename board/google/{chromebook_jerry => veyron}/Makefile (81%) rename board/google/{chromebook_jerry/jerry.c => veyron/veyron.c} (100%) rename include/configs/{chromebook_jerry.h => veyron.h} (100%)