From patchwork Thu Jun 18 14:40:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1312172 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=wmADG28f; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nl442Prvz9sRf for ; Fri, 19 Jun 2020 00:41:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8418981F7E; Thu, 18 Jun 2020 16:40:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="wmADG28f"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35B29820D2; Thu, 18 Jun 2020 16:40:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 292CE81EAD for ; Thu, 18 Jun 2020 16:40:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x443.google.com with SMTP id b6so6314069wrs.11 for ; Thu, 18 Jun 2020 07:40:43 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=0MBZQhWY9QYuPOI13VuSlWNDpNn8l6ZkZ9KForLNtfM=; b=wmADG28f1Pbe/l2WIZcOGeWMCUrUzX0vatKqXNoOoDsqIUdiKlH14RUnmOqVyJhkyr bvzH7gCPP+7JumQcWlZ+XqT7A4ST03f6j0ph7rwUv+wBqYSrTx9PRF/PW+njTo35Syc9 ZTiHiuFEicm4qdqtszoiyeK41I2zO+3mqPrJ71rYhb4HqJHQdtMyulTfuY+NW+NWdKOD Pv0I8xr2iqOBfT1kIo1OXBHuqHGLtd3kw6pdxr4V2Nu0t4/dmthBvTcUHlKDBK/WjImN Zvb1cCsGAm8rx5KKLsOMp9aJokMO4IkIngVH0Gg4NRsfRhpshOtvKt5nDOqt5GwAJ9tM ZX8Q== 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:mime-version :content-transfer-encoding; bh=0MBZQhWY9QYuPOI13VuSlWNDpNn8l6ZkZ9KForLNtfM=; b=cAh+fEZ727L11oryylT4t/hqTy1YFME7EK3xMv1kUm1uUPQbZrtXpvAAuzhFXbEpuO pNUktibzMwGWiZrhGSrSLZMKTSAGqUkvmZT23IS9MoxtE9rjWEy5cBFf2EV5VlgVAIEo /ZUvYs+Up+3ZHv7C5yHR89gT6DDwxKF39kEamz85gFZZOeOUj2aqPDQ9tmkuouu14SUs U90Xo1bvkmhn+CeTV1rYHHW3uy4Boak3MmOFXePoJNa6St17nnmvzcykxvFNrokYALK/ /HHSOI94MsNL/fgbpxTZf3ZQmPh18RJopw7E/xwv168Eze8TQEb8znTQQrUoRW4TddXt rTkQ== X-Gm-Message-State: AOAM533hZdaugdvHT0Dklz0nG3VIzWlUAUGbX3BrDluerycokvJk8x6x ENxE6Qy+risqbrIBceL0VmgUZfF8Xncd4A== X-Google-Smtp-Source: ABdhPJxgM7PG8zk9NtC9dH11Xq1Jc60jV5gxdzd9CAOXOt+XKUEdIqIDlItRCblYuS20Om6J8RmdLw== X-Received: by 2002:adf:ed87:: with SMTP id c7mr4941699wro.108.1592491242746; Thu, 18 Jun 2020 07:40:42 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:2ec0:82b0:9902:c1f0:76c7:9dbc]) by smtp.gmail.com with ESMTPSA id e2sm1890680wrt.76.2020.06.18.07.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 07:40:42 -0700 (PDT) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Pascal Vizeli , Neil Armstrong Subject: [PATCH] board: amlogic: Add Odroid-N2 board support Date: Thu, 18 Jun 2020 16:40:37 +0200 Message-Id: <20200618144037.23392-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Pascal Vizeli Add a proper Odroid-N2 board support to handle the Ethernet MAC address stored in the in-SoC eFuses. Signed-off-by: Pascal Vizeli Signed-off-by: Neil Armstrong Tested-by: Anand Moon --- board/amlogic/odroid-n2/MAINTAINERS | 7 +++++ board/amlogic/odroid-n2/Makefile | 6 ++++ board/amlogic/odroid-n2/odroid-n2.c | 49 +++++++++++++++++++++++++++++ board/amlogic/w400/MAINTAINERS | 2 -- configs/odroid-n2_defconfig | 2 +- 5 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 board/amlogic/odroid-n2/MAINTAINERS create mode 100644 board/amlogic/odroid-n2/Makefile create mode 100644 board/amlogic/odroid-n2/odroid-n2.c diff --git a/board/amlogic/odroid-n2/MAINTAINERS b/board/amlogic/odroid-n2/MAINTAINERS new file mode 100644 index 0000000000..5627e54058 --- /dev/null +++ b/board/amlogic/odroid-n2/MAINTAINERS @@ -0,0 +1,7 @@ +ODROID-N2 +M: Neil Armstrong +S: Maintained +L: u-boot-amlogic@groups.io +F: board/amlogic/odroid-n2/ +F: configs/odroid-n2_defconfig +F: doc/board/amlogic/odroid-n2.rst diff --git a/board/amlogic/odroid-n2/Makefile b/board/amlogic/odroid-n2/Makefile new file mode 100644 index 0000000000..68e4e2a828 --- /dev/null +++ b/board/amlogic/odroid-n2/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2020 BayLibre, SAS +# Author: Neil Armstrong + +obj-y := odroid-n2.o diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c new file mode 100644 index 0000000000..caf7fd6810 --- /dev/null +++ b/board/amlogic/odroid-n2/odroid-n2.c @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2020 BayLibre, SAS + * Author: Neil Armstrong + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define EFUSE_MAC_OFFSET 20 +#define EFUSE_MAC_SIZE 12 +#define MAC_ADDR_LEN 6 + +int misc_init_r(void) +{ + u8 mac_addr[MAC_ADDR_LEN]; + char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3]; + ssize_t len; + + meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0); + + if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { + len = meson_sm_read_efuse(EFUSE_MAC_OFFSET, + efuse_mac_addr, EFUSE_MAC_SIZE); + if (len != EFUSE_MAC_SIZE) + return 0; + + /* MAC is stored in ASCII format, 1bytes = 2characters */ + for (int i = 0; i < 6; i++) { + tmp[0] = efuse_mac_addr[i * 2]; + tmp[1] = efuse_mac_addr[i * 2 + 1]; + tmp[2] = '\0'; + mac_addr[i] = simple_strtoul(tmp, NULL, 16); + } + + if (is_valid_ethaddr(mac_addr)) + eth_env_set_enetaddr("ethaddr", mac_addr); + else + meson_generate_serial_ethaddr(); + } + + return 0; +} diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS index 5e837cfaef..a1b0ac8636 100644 --- a/board/amlogic/w400/MAINTAINERS +++ b/board/amlogic/w400/MAINTAINERS @@ -5,8 +5,6 @@ L: u-boot-amlogic@groups.io F: board/amlogic/w400/ F: configs/khadas-vim3_defconfig F: configs/khadas-vim3l_defconfig -F: configs/odroid-n2_defconfig F: doc/board/amlogic/w400.rst F: doc/board/amlogic/khadas-vim3.rst F: doc/board/amlogic/khadas-vim3l.rst -F: doc/board/amlogic/odroid-n2.rst diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig index e0cc6e3729..063809416e 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_BOARD="w400" +CONFIG_SYS_BOARD="odroid-n2" CONFIG_ARCH_MESON=y CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_ENV_SIZE=0x2000