From patchwork Wed Jan 18 03:03:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eddie Cai X-Patchwork-Id: 716488 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 3v3BfH08nLz9sxN for ; Wed, 18 Jan 2017 14:04:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X4tP8GKr"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 32784B3903; Wed, 18 Jan 2017 04:04:53 +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 H0wy0ODbZFSH; Wed, 18 Jan 2017 04:04:53 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6CA33B38D9; Wed, 18 Jan 2017 04:04:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0FD45B38D9 for ; Wed, 18 Jan 2017 04:04:38 +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 kAVwMqtXs8HB for ; Wed, 18 Jan 2017 04:04:37 +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 mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by theia.denx.de (Postfix) with ESMTPS id 7563BB38BF for ; Wed, 18 Jan 2017 04:04:33 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id e4so57223pfg.0 for ; Tue, 17 Jan 2017 19:04:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AyTARscy+zsFBeqmv3TsVvLUZmVZZGNjI4ZulENlgMA=; b=X4tP8GKrUsxuuJsT6PuORZj+8h90UH17/pBmzGzgAfxAvqmax5BA0Jo2EAhRLgdRaB a9eWPHkuAxx8fxLGsurP7dfY2xzRX6HIB2PEnKzPC/mUVc1Ot8pRlzoWCpsXcr09lHJq 647XIzxPprwHY4vE+741y+/HgEbpdPo90qhGJIqh2PpaqUeP3KMirjZp+jjPawu8ENjZ 4bo2qIBhLG3Fb/u2DxJO64mGfgIxFspRLv/Yqt5vYlchALJVAfITql0ucX8T6Km2dfAy mRA1LmF1DR7EHnezBAJZ4UtdUecmNmH1JfxBGYjrmhfhQRWtJjq+ya7VVJkFXwRguAI+ nVQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AyTARscy+zsFBeqmv3TsVvLUZmVZZGNjI4ZulENlgMA=; b=LA2ncF0eoJBAkAiwjK0ZUtN6WOdluBF8iJOTVNgH//iwi4+W0AnK6HWWOHjtPFIrbA ZOK+evv8r06FwvdkxiAdecekVlj4KJp6C0UcPWnjD3a51nJGjvz6FgZ21lPNs2zCoaZN DJT10o8kVUwpscGhhpcAaiiL8s3ixmnr7TCHX4XjSYPVGh7F34opQfYxJB425I5o4DTv ZSWnXeBvQ95bx5BYEZvFE3ABlPW3MxaAZmz0Chltx3TPp2rQyKNl+ooaVH7tibsHIqhM b3+KetNevGHEZMM36awwKsfX34eP3Ah+3X+Z+xubtYwxboE22GgeGcm/j7YiCk/7LoP6 1Itg== X-Gm-Message-State: AIkVDXKMfJDO1AMxjzApAwFBmrDKId9I7YdpbMpQczGMEZITd9752chnB+68xs1Y5RSdTw== X-Received: by 10.84.134.1 with SMTP id 1mr1598595plg.3.1484708672387; Tue, 17 Jan 2017 19:04:32 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id u64sm59235967pgc.39.2017.01.17.19.04.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 19:04:31 -0800 (PST) From: Eddie Cai X-Google-Original-From: Eddie Cai To: sjg@chromium.org, hl@rock-chips.com Date: Wed, 18 Jan 2017 11:03:54 +0800 Message-Id: <1484708635-14722-2-git-send-email-eddie.cai@rock-chips.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484708635-14722-1-git-send-email-eddie.cai@rock-chips.com> References: <1484708635-14722-1-git-send-email-eddie.cai@rock-chips.com> Cc: u-boot@lists.denx.de, eddie.cai@rock-chips.com Subject: [U-Boot] [PATCH 1/2] rockchip: rename miniarm to tinker board 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" Miniarm is the internal project code. Now it is officially named Tinker board. So rename it. Signed-off-by: Eddie Cai Reviewed-by: Simon Glass --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/{rk3288-miniarm.dts => rk3288-tinker.dts} | 6 +++--- arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} | 0 arch/arm/mach-rockchip/rk3288-board.c | 2 +- arch/arm/mach-rockchip/rk3288/Kconfig | 8 ++++---- board/rockchip/miniarm_rk3288/MAINTAINERS | 6 ------ board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig | 6 +++--- board/rockchip/tinker_rk3288/MAINTAINERS | 6 ++++++ board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile | 2 +- .../miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c} | 0 configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} | 4 ++-- doc/README.rockchip | 2 +- include/configs/{miniarm_rk3288.h => tinker_rk3288.h} | 0 13 files changed, 22 insertions(+), 22 deletions(-) rename arch/arm/dts/{rk3288-miniarm.dts => rk3288-tinker.dts} (86%) rename arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} (100%) delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig (64%) create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile (79%) rename board/rockchip/{miniarm_rk3288/miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c} (100%) rename configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} (95%) rename include/configs/{miniarm_rk3288.h => tinker_rk3288.h} (100%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 66ea0b3..b117b51 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -36,7 +36,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-rock2-square.dtb \ rk3288-evb.dtb \ rk3288-fennec.dtb \ - rk3288-miniarm.dtb \ + rk3288-tinker.dtb \ rk3288-popmetal.dtb \ rk3399-evb.dtb dtb-$(CONFIG_ARCH_MESON) += \ diff --git a/arch/arm/dts/rk3288-miniarm.dts b/arch/arm/dts/rk3288-tinker.dts similarity index 86% rename from arch/arm/dts/rk3288-miniarm.dts rename to arch/arm/dts/rk3288-tinker.dts index 9083028..4dacc76 100644 --- a/arch/arm/dts/rk3288-miniarm.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -5,11 +5,11 @@ */ /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 { stdout-path = &uart2; diff --git a/arch/arm/dts/rk3288-miniarm.dtsi b/arch/arm/dts/rk3288-tinker.dtsi similarity index 100% rename from arch/arm/dts/rk3288-miniarm.dtsi rename to arch/arm/dts/rk3288-tinker.dtsi diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c index 8bf45f7..9894a25 100644 --- a/arch/arm/mach-rockchip/rk3288-board.c +++ b/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); if (!fdt_node_check_compatible(gd->fdt_blob, 0, - "rockchip,rk3288-miniarm")) + "rockchip,rk3288-tinker")) { /* set isp qos to higher priority */ writel(val, CPU_AXI_QOS_PRIORITY + VIO1_ISP_R_QOS); diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 54545f3..c94df4e 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -33,10 +33,10 @@ config TARGET_POPMETAL_RK3288 2GB DDR3. Expansion connectors provide access to I2C, SPI, UART, GPIOs and display interface. -config TARGET_MINIARM_RK3288 - bool "miniarm-RK3288" +config TARGET_TINKER_RK3288 + bool "Tinker-RK3288" 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 8GB eMMC and 2GB of SDRAM. Expansion connectors provide access to I2C, SPI, UART, GPIOs. @@ -115,6 +115,6 @@ source "board/rockchip/evb_rk3288/Kconfig" source "board/rockchip/fennec_rk3288/Kconfig" -source "board/rockchip/miniarm_rk3288/Kconfig" +source "board/rockchip/tinker_rk3288/Kconfig" endif diff --git a/board/rockchip/miniarm_rk3288/MAINTAINERS b/board/rockchip/miniarm_rk3288/MAINTAINERS deleted file mode 100644 index 7537b8f..0000000 --- a/board/rockchip/miniarm_rk3288/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -MINIARM-RK3288 -M: Lin Huang -S: Maintained -F: board/rockchip/miniarm_rk3288 -F: include/configs/miniarm_rk3288.h -F: configs/miniarm-rk3288_defconfig diff --git a/board/rockchip/miniarm_rk3288/Kconfig b/board/rockchip/tinker_rk3288/Kconfig similarity index 64% rename from board/rockchip/miniarm_rk3288/Kconfig rename to board/rockchip/tinker_rk3288/Kconfig index 529c09f..bca6c37 100644 --- a/board/rockchip/miniarm_rk3288/Kconfig +++ b/board/rockchip/tinker_rk3288/Kconfig @@ -1,13 +1,13 @@ -if TARGET_MINIARM_RK3288 +if TARGET_TINKER_RK3288 config SYS_BOARD - default "miniarm_rk3288" + default "tinker_rk3288" config SYS_VENDOR default "rockchip" config SYS_CONFIG_NAME - default "miniarm_rk3288" + default "tinker_rk3288" config BOARD_SPECIFIC_OPTIONS # dummy def_bool y diff --git a/board/rockchip/tinker_rk3288/MAINTAINERS b/board/rockchip/tinker_rk3288/MAINTAINERS new file mode 100644 index 0000000..cddceaf --- /dev/null +++ b/board/rockchip/tinker_rk3288/MAINTAINERS @@ -0,0 +1,6 @@ +TINKER-RK3288 +M: Lin Huang +S: Maintained +F: board/rockchip/tinker_rk3288 +F: include/configs/tinker_rk3288.h +F: configs/tinker-rk3288_defconfig diff --git a/board/rockchip/miniarm_rk3288/Makefile b/board/rockchip/tinker_rk3288/Makefile similarity index 79% rename from board/rockchip/miniarm_rk3288/Makefile rename to board/rockchip/tinker_rk3288/Makefile index 9419b91..432367f 100644 --- a/board/rockchip/miniarm_rk3288/Makefile +++ b/board/rockchip/tinker_rk3288/Makefile @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += miniarm-rk3288.o +obj-y += tinker-rk3288.o diff --git a/board/rockchip/miniarm_rk3288/miniarm-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c similarity index 100% rename from board/rockchip/miniarm_rk3288/miniarm-rk3288.c rename to board/rockchip/tinker_rk3288/tinker-rk3288.c diff --git a/configs/miniarm-rk3288_defconfig b/configs/tinker-rk3288_defconfig similarity index 95% rename from configs/miniarm-rk3288_defconfig rename to configs/tinker-rk3288_defconfig index 2b6bd0b..bf7fec8 100644 --- a/configs/miniarm-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -3,9 +3,9 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=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_DEFAULT_DEVICE_TREE="rk3288-miniarm" +CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker" CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/doc/README.rockchip b/doc/README.rockchip index 43cafc7..186a1a0 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -42,7 +42,7 @@ At present seven RK3288 boards are supported: - Fennec RK3288 - use fennec-rk3288 configuration - Firefly RK3288 - use firefly-rk3288 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 - Radxa Rock 2 - use rock2 configuration diff --git a/include/configs/miniarm_rk3288.h b/include/configs/tinker_rk3288.h similarity index 100% rename from include/configs/miniarm_rk3288.h rename to include/configs/tinker_rk3288.h