From: narmstrong@baylibre.com (Neil Armstrong)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH u-boot v2 05/19] board: amlogic: factorise gxbb boards
Date: Thu, 22 Nov 2018 10:07:26 +0100 [thread overview]
Message-ID: <20181122090740.29739-6-narmstrong@baylibre.com> (raw)
In-Reply-To: <20181122090740.29739-1-narmstrong@baylibre.com>
From: Jerome Brunet <jbrunet@baylibre.com>
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 <jbrunet@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
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 <narmstrong@baylibre.com>
-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 <common.h>
-#include <dm.h>
-#include <environment.h>
-#include <asm/io.h>
-#include <asm/arch/gx.h>
-#include <asm/arch/sm.h>
-#include <asm/arch/eth.h>
-#include <asm/arch/mem.h>
-
-#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 <b.galvani@gmail.com>
+M: Neil Armstrong <narmstrong@baylibre.com>
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"
--
2.19.1
next prev parent reply other threads:[~2018-11-22 9:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-22 9:07 [PATCH u-boot v2 00/19] Amlogic Meson cleanup for AXG SoC support Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 01/19] ARM: meson: clean-up platform selection Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 02/19] configs: meson: remove unnecessary MESON_FDTFILE_SETTING Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 03/19] board: amlogic: remove p212 derivatives Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 04/19] board: amlogic: move khadas-vim2 as q200 ref board Neil Armstrong
2018-11-22 9:07 ` Neil Armstrong [this message]
2018-11-22 9:07 ` [PATCH u-boot v2 06/19] ARM: rework amlogic configuration Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 07/19] configs: meson: change default load addresses Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 08/19] pinctrl: meson: rework gx pmx function Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 09/19] pinctrl: meson: select generic pinctrl Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 10/19] pinctrl: meson: add axg support Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 11/19] clk: meson: add static to meson_gates table Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 12/19] clk: meson: silence debug print Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 13/19] ARM: meson: rework soc arch file to prepare for new SoC Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 14/19] ARM: meson: Add support for AXG family Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 15/19] ARM: dts: Sync Amlogic Meson AXG DT from Linux 4.20-rc1 Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 16/19] clk: Add clock driver for AXG Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 17/19] board: amlogic: add support for S400 board Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 18/19] ARM: meson: factorize common code out amlogic's boards Neil Armstrong
2018-11-22 9:07 ` [PATCH u-boot v2 19/19] ARM: meson: Add boot device discovery Neil Armstrong
2018-11-26 8:59 ` [PATCH u-boot v2 00/19] Amlogic Meson cleanup for AXG SoC support Neil Armstrong
2018-11-26 12:58 ` Tom Rini
2018-11-26 13:34 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181122090740.29739-6-narmstrong@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=linus-amlogic@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox