From patchwork Thu Nov 22 09:07:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 151734 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp484747ljp; Thu, 22 Nov 2018 01:10:18 -0800 (PST) X-Google-Smtp-Source: AFSGD/WgZlFjHwshfNAtWPM/NbA9Uxfj8ZIE9RXNfNkLvF7xdP7+jAUwd6InX1b8Y/XZ1oykorXy X-Received: by 2002:a50:d78b:: with SMTP id w11-v6mr8872488edi.19.1542877818678; Thu, 22 Nov 2018 01:10:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542877818; cv=none; d=google.com; s=arc-20160816; b=S9FLpgsHKr8Um8cy+M9f76oEStsBeLe7/cprSclPCG6OaELj8mcS4lekjn2onGXcCg TcbJCIEGPPnunJUD1XTeN80XWSIpEPc0J02kEYKxiWd24+MtQ/2rFBFpdm2wo8XPMDWv Y+Mot1+y18uaFDzjzfMTasJSXyEkpL6nihJEZ7FuydPVLfUOmSypO1ujvl0QhY7n144v TYCAgRkNPrYaItYrbh2kCAY1TLIS7awhhUpAZU8syHqMYGAchKzHHc2uIwqWrnckkOes IL7LhmodObPq8AO4d89kYtBLrbR1MKTPevxxP/nghnHK258VBfvegMrt6D2J83agTeMs Qkwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=4xYKKCrLYiqpf1vMKCPk9MWEZsVJroPoKLWcsXb8ZDI=; b=ae65gTRg2DFAlDbTVH9RQ2q/hBGZTNQjwy8zCj9NA/CkZd0QhzawM18guydOlJXv8d O3yNhtjh5VDPibq6k1vLEXbuELHWMbVdnNiaiWsM37mKLd2kzKWHv+bw0dzMnr6fInM4 1j2XGp0iNmWmUfHjDa8bmMugvbNNKp1j5qcW8wwAu7n9mnIzqEWg66oa263JboJ7jH31 Dd9YeRxSSIvhUaYVhh4PCVu7A1oE6aiViGzP8+g6JTzcvf+NmSBPn3O6xyCDO469dJUw C/FBuA5RtrzgE3tTnekwx38PsaINj7mmZ24TKlv9WMr5yLrZl2dpfQKt72oKwBwIZgbX XYdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=aOKPGu0y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id p11si521495edm.136.2018.11.22.01.10.18; Thu, 22 Nov 2018 01:10:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=aOKPGu0y; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 3FECFC21F31; Thu, 22 Nov 2018 09:10:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9F360C21FC0; Thu, 22 Nov 2018 09:07:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B8276C21F29; Thu, 22 Nov 2018 09:07:56 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id CE316C21F8E for ; Thu, 22 Nov 2018 09:07:49 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id t3so8441865wrr.3 for ; Thu, 22 Nov 2018 01:07:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wUetj3FSyjOoNhfjkR7/JNYOs+lmAq6PVGym8rFfP6w=; b=aOKPGu0yrD2eQ2XWh63q7kqo/HuvqqZQ3wF+2IkuTo4QsOnPRDuwc+R1oBvnhVGglG i1DUrd3PeOnh7qr+ftfUh5SF16khC1khcBgfYzndXdPS5QMhi7Ul929Gq1PrQboiQwB0 /wHHwNrYAkjepJmkdGXZA9CXQGtQR4A3YMFrxUNxcjndKDb+TAQBRWBhNotWOCO615NK OYAfNbeWaJR0KAK1AFqXpWSOUzUAk9AviRxeDSYl/K2AYpAbQuQNnfdOoBDFG+jUu6K9 ssySsZLqx7HXBgUbYOYkNrHTB69UxucG5stqkxZdy2HUtTshdu0pm9oGgRrtI0ECeUq8 SCKw== 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:mime-version:content-transfer-encoding; bh=wUetj3FSyjOoNhfjkR7/JNYOs+lmAq6PVGym8rFfP6w=; b=KmoN+nzZU3LrzZiUKNjTU6hroDpnFBWVogNHnG308KCZ2MixWDXl1IpeShWvFBctYk W+ss5yyXmIXU2wpMZCxFajE6GzsmIwQIX7wW5cRM2mJtevT7rU2h+PcGhxOh3ufTn6U/ RQsln1BkCfomZ0KGMOK0/N85yISf/GWhd7kqABVHrr/GdsG1MwO7UY/cs0HKTiEGA/bo N2n+4/6YRFO+bEUmcmCx2Xio4bEvXS/UHyCd1y6zgor28EBaVsNxT4LNYW2sw45vzSxJ 1kC7fA8ZwN8jUmn9mYhzxRRGWtAIf2rzplvffM8JPqwXnl9WBgcaXxJNLdKto7SXltct BTCQ== X-Gm-Message-State: AA+aEWaX8YRWHdKiHQTyvBSOM4QUkk36imZR4WJzP6gRdNz/1+6U4KtU tbdesZX6U5lWlafXmqHxjeHmpqDb6rZHqw== X-Received: by 2002:adf:e846:: with SMTP id d6mr9127580wrn.72.1542877668928; Thu, 22 Nov 2018 01:07:48 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id y9sm13856434wrq.55.2018.11.22.01.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Nov 2018 01:07:48 -0800 (PST) From: Neil Armstrong To: u-boot@lists.denx.de Date: Thu, 22 Nov 2018 10:07:26 +0100 Message-Id: <20181122090740.29739-6-narmstrong@baylibre.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181122090740.29739-1-narmstrong@baylibre.com> References: <20181122090740.29739-1-narmstrong@baylibre.com> MIME-Version: 1.0 Cc: linux-amlogic@lists.infradead.org, trini@konsulko.com Subject: [U-Boot] [PATCH u-boot v2 05/19] board: amlogic: factorise gxbb boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Jerome Brunet The nanopi-k2 and the odroid-c2 are similar enough to be supported by the same u-boot board. This change use odroid-c2 u-boot board for the nanopi-k2 as well. Dedicated defconfig are kept to customize the names and device tree. Signed-off-by: Jerome Brunet Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/Kconfig | 11 +--- board/amlogic/nanopi-k2/Kconfig | 12 ---- board/amlogic/nanopi-k2/MAINTAINERS | 6 -- board/amlogic/nanopi-k2/Makefile | 7 --- board/amlogic/nanopi-k2/nanopi-k2.c | 55 ------------------- board/amlogic/odroid-c2/MAINTAINERS | 1 + .../README => odroid-c2/README.nanopi-k2} | 0 .../odroid-c2/{README => README.odroid-c2} | 0 configs/nanopi-k2_defconfig | 2 +- 9 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 board/amlogic/nanopi-k2/Kconfig delete mode 100644 board/amlogic/nanopi-k2/MAINTAINERS delete mode 100644 board/amlogic/nanopi-k2/Makefile delete mode 100644 board/amlogic/nanopi-k2/nanopi-k2.c rename board/amlogic/{nanopi-k2/README => odroid-c2/README.nanopi-k2} (100%) rename board/amlogic/odroid-c2/{README => README.odroid-c2} (100%) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 98303dbda1..d86b1bed78 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -31,14 +31,7 @@ config TARGET_ODROID_C2 ODROID-C2 is a single board computer based on Meson GXBaby with 2 GiB of RAM, Gigabit Ethernet, HDMI, 4 USB, micro-SD slot, eMMC, IR receiver and a 40-pin GPIO header. - -config TARGET_NANOPI_K2 - bool "NANOPI_K2" - select MESON_GXBB - help - NANOPI_K2 is a single board computer based on Meson GXBaby - with 2 GiB of RAM, Gigabit Ethernet,AP6212 Wifi, HDMI, 4 USB, - micro-SD slot, eMMC, IR receiver and a 40-pin GPIO header. + You should also select this TARGET if you have an nanopi-k2 config TARGET_P212 bool "P212" @@ -69,8 +62,6 @@ config SYS_MALLOC_F_LEN source "board/amlogic/odroid-c2/Kconfig" -source "board/amlogic/nanopi-k2/Kconfig" - source "board/amlogic/p212/Kconfig" source "board/amlogic/q200/Kconfig" diff --git a/board/amlogic/nanopi-k2/Kconfig b/board/amlogic/nanopi-k2/Kconfig deleted file mode 100644 index 374bda200c..0000000000 --- a/board/amlogic/nanopi-k2/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_NANOPI_K2 - -config SYS_BOARD - default "nanopi-k2" - -config SYS_VENDOR - default "amlogic" - -config SYS_CONFIG_NAME - default "nanopi-k2" - -endif diff --git a/board/amlogic/nanopi-k2/MAINTAINERS b/board/amlogic/nanopi-k2/MAINTAINERS deleted file mode 100644 index 0452bd1fa1..0000000000 --- a/board/amlogic/nanopi-k2/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -NANOPI-K2 -M: Neil Armstrong -S: Maintained -F: board/amlogic/nanopi-k2/ -F: include/configs/nanopi-k2.h -F: configs/nanopi-k2_defconfig diff --git a/board/amlogic/nanopi-k2/Makefile b/board/amlogic/nanopi-k2/Makefile deleted file mode 100644 index 7d9b666e76..0000000000 --- a/board/amlogic/nanopi-k2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -# (C) Copyright 2018 Thomas McKahan -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := nanopi-k2.o diff --git a/board/amlogic/nanopi-k2/nanopi-k2.c b/board/amlogic/nanopi-k2/nanopi-k2.c deleted file mode 100644 index ae29dd6fa4..0000000000 --- a/board/amlogic/nanopi-k2/nanopi-k2.c +++ /dev/null @@ -1,55 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2018 Thomas McKahan - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#define EFUSE_SN_OFFSET 20 -#define EFUSE_SN_SIZE 16 -#define EFUSE_MAC_OFFSET 52 -#define EFUSE_MAC_SIZE 6 - -int board_init(void) -{ - return 0; -} - -int misc_init_r(void) -{ - u8 mac_addr[EFUSE_MAC_SIZE]; - char serial[EFUSE_SN_SIZE]; - ssize_t len; - - meson_gx_eth_init(PHY_INTERFACE_MODE_RGMII, 0); - - if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { - len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, - mac_addr, EFUSE_MAC_SIZE); - if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) - eth_env_set_enetaddr("ethaddr", mac_addr); - } - - if (!env_get("serial#")) { - len = meson_sm_read_efuse(EFUSE_SN_OFFSET, serial, - EFUSE_SN_SIZE); - if (len == EFUSE_SN_SIZE) - env_set("serial#", serial); - } - - return 0; -} - -int ft_board_setup(void *blob, bd_t *bd) -{ - meson_gx_init_reserved_memory(blob); - - return 0; -} diff --git a/board/amlogic/odroid-c2/MAINTAINERS b/board/amlogic/odroid-c2/MAINTAINERS index 699850fd0c..fd74d53bfe 100644 --- a/board/amlogic/odroid-c2/MAINTAINERS +++ b/board/amlogic/odroid-c2/MAINTAINERS @@ -1,5 +1,6 @@ ODROID-C2 M: Beniamino Galvani +M: Neil Armstrong S: Maintained F: board/amlogic/odroid-c2/ F: include/configs/odroid-c2.h diff --git a/board/amlogic/nanopi-k2/README b/board/amlogic/odroid-c2/README.nanopi-k2 similarity index 100% rename from board/amlogic/nanopi-k2/README rename to board/amlogic/odroid-c2/README.nanopi-k2 diff --git a/board/amlogic/odroid-c2/README b/board/amlogic/odroid-c2/README.odroid-c2 similarity index 100% rename from board/amlogic/odroid-c2/README rename to board/amlogic/odroid-c2/README.odroid-c2 diff --git a/configs/nanopi-k2_defconfig b/configs/nanopi-k2_defconfig index 5c8c747bf3..01196d6655 100644 --- a/configs/nanopi-k2_defconfig +++ b/configs/nanopi-k2_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MESON=y CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_MESON_GXBB=y -CONFIG_TARGET_NANOPI_K2=y +CONFIG_TARGET_ODROID_C2=y CONFIG_DEBUG_UART_BASE=0xc81004c0 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" nanopi-k2"