From patchwork Mon Oct 31 20:39:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 689611 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3t75sj08DXz9vFH for ; Tue, 1 Nov 2016 07:43:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 44D41B3839; Mon, 31 Oct 2016 21:41:46 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LefU9xwEabRe; Mon, 31 Oct 2016 21:41:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E46F8B3835; Mon, 31 Oct 2016 21:40:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0B5BCA75C2 for ; Mon, 31 Oct 2016 21:40:37 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BwfCLCAj5uev for ; Mon, 31 Oct 2016 21:40:36 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from kaki.bld.corp.google.com (unknown [104.132.211.80]) by theia.denx.de (Postfix) with ESMTPS id 41C77A75C9 for ; Mon, 31 Oct 2016 21:40:30 +0100 (CET) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id E538E4038C; Mon, 31 Oct 2016 14:40:28 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 31 Oct 2016 14:39:32 -0600 Message-Id: <1477946376-29471-17-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1477946376-29471-1-git-send-email-sjg@chromium.org> References: <1477946376-29471-1-git-send-email-sjg@chromium.org> Cc: Albert Aribaud , Stephen Warren , huang lin , Jeffy Chen , Ian Campbell , Stefan Roese Subject: [U-Boot] [PATCH 16/20] rockchip: Rename jerry files to veyron X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 --- 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%) 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 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