Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: amlogic: factorise gxbb boards

Browse Source 
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>
This commit is contained in:
Jerome Brunet 2018-10-19 13:27:40 +02:00 committed by Neil Armstrong
parent 302987b6c5
commit d54e03b612
9 changed files with 3 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-meson/Kconfig
View File

@ -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"

12
board/amlogic/nanopi-k2/Kconfig
View File

@ -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

6
board/amlogic/nanopi-k2/MAINTAINERS
View File

@ -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

7
board/amlogic/nanopi-k2/Makefile
View File

@ -1,7 +0,0 @@
#
# (C) Copyright 2018 Thomas McKahan
#
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := nanopi-k2.o

55
board/amlogic/nanopi-k2/nanopi-k2.c
View File

@ -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;
}

1
board/amlogic/odroid-c2/MAINTAINERS
View File

@ -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

0
board/amlogic/nanopi-k2/README → board/amlogic/odroid-c2/README.nanopi-k2
View File

0
board/amlogic/odroid-c2/README → board/amlogic/odroid-c2/README.odroid-c2
View File

2
configs/nanopi-k2_defconfig
View File

@ -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"