mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
board: amlogic: remove p212 derivatives
The Khadas vim and the libretech aml-s905x-cc (aka Potato) derive from amlogic s905x reference design (P212). All the code in these board is a copy/paste from the p212, which is tedious to maintain. This change use p212 u-boot board for all these boards, while keeping a dedicated defconfig 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:
parent
e4623f75e4
commit
8bbfb40e57
14 changed files with 4 additions and 184 deletions
|
@ -47,22 +47,8 @@ config TARGET_P212
|
|||
P212 is a reference dessign board based on Meson GXL S905X SoC
|
||||
with 2 GiB of RAM, Ethernet, HDMI, 2 USB, micro-SD slot,
|
||||
eMMC, IR receiver, CVBS+Audio jack and a SDIO WiFi module.
|
||||
|
||||
config TARGET_LIBRETECH_CC
|
||||
bool "LIBRETECH-CC"
|
||||
select MESON_GXL
|
||||
help
|
||||
LibreTech CC is a single board computer based on Meson GXL
|
||||
with 2 GiB of RAM, Ethernet, HDMI, 4 USB, micro-SD slot,
|
||||
eMMC, IR receiver and a 40-pin GPIO header.
|
||||
|
||||
config TARGET_KHADAS_VIM
|
||||
bool "KHADAS-VIM"
|
||||
select MESON_GXL
|
||||
help
|
||||
Khadas VIM is a single board computer based on Meson GXL
|
||||
with 2 GiB of RAM, Ethernet, HDMI, 4 USB, micro-SD slot,
|
||||
eMMC, IR receiver and a 40-pin GPIO header.
|
||||
You should also select this TARGET if you have Khadas Vim or
|
||||
a libretech aml-s905x-cc
|
||||
|
||||
config TARGET_KHADAS_VIM2
|
||||
bool "KHADAS-VIM2"
|
||||
|
@ -86,10 +72,6 @@ source "board/amlogic/nanopi-k2/Kconfig"
|
|||
|
||||
source "board/amlogic/p212/Kconfig"
|
||||
|
||||
source "board/amlogic/libretech-cc/Kconfig"
|
||||
|
||||
source "board/amlogic/khadas-vim/Kconfig"
|
||||
|
||||
source "board/amlogic/khadas-vim2/Kconfig"
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
if TARGET_KHADAS_VIM
|
||||
|
||||
config SYS_BOARD
|
||||
default "khadas-vim"
|
||||
|
||||
config SYS_VENDOR
|
||||
default "amlogic"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "khadas-vim"
|
||||
|
||||
endif
|
|
@ -1,6 +0,0 @@
|
|||
KHADAS-VIM
|
||||
M: Neil Armstrong <narmstrong@baylibre.com>
|
||||
S: Maintained
|
||||
F: board/amlogic/khadas-vim/
|
||||
F: include/configs/khadas-vim.h
|
||||
F: configs/khadas-vim_defconfig
|
|
@ -1,6 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
# (C) Copyright 2016 BayLibre, SAS
|
||||
# Author: Neil Armstrong <narmstrong@baylibre.com>
|
||||
|
||||
obj-y := khadas-vim.o
|
|
@ -1,57 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/*
|
||||
* Copyright (C) 2016 BayLibre, SAS
|
||||
* Author: Neil Armstrong <narmstrong@baylibre.com>
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <environment.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/gx.h>
|
||||
#include <asm/arch/mem.h>
|
||||
#include <asm/arch/sm.h>
|
||||
#include <asm/arch/eth.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_RMII,
|
||||
MESON_GXL_USE_INTERNAL_RMII_PHY);
|
||||
|
||||
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,12 +0,0 @@
|
|||
if TARGET_LIBRETECH_CC
|
||||
|
||||
config SYS_BOARD
|
||||
default "libretech-cc"
|
||||
|
||||
config SYS_VENDOR
|
||||
default "amlogic"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "libretech-cc"
|
||||
|
||||
endif
|
|
@ -1,6 +0,0 @@
|
|||
LIBRETECH-CC
|
||||
M: Neil Armstrong <narmstrong@baylibre.com>
|
||||
S: Maintained
|
||||
F: board/amlogic/libretech-cc/
|
||||
F: include/configs/libretech-cc.h
|
||||
F: configs/libretech-cc_defconfig
|
|
@ -1,6 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
# (C) Copyright 2016 BayLibre, SAS
|
||||
# Author: Neil Armstrong <narmstrong@baylibre.com>
|
||||
|
||||
obj-y := libretech-cc.o
|
|
@ -1,57 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/*
|
||||
* Copyright (C) 2016 BayLibre, SAS
|
||||
* Author: Neil Armstrong <narmstrong@baylibre.com>
|
||||
*/
|
||||
|
||||
#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_RMII,
|
||||
MESON_GXL_USE_INTERNAL_RMII_PHY);
|
||||
|
||||
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;
|
||||
}
|
|
@ -2,7 +2,7 @@ CONFIG_ARM=y
|
|||
CONFIG_ARCH_MESON=y
|
||||
CONFIG_SYS_TEXT_BASE=0x01000000
|
||||
CONFIG_MESON_GXL=y
|
||||
CONFIG_TARGET_KHADAS_VIM=y
|
||||
CONFIG_TARGET_P212=y
|
||||
CONFIG_DEBUG_UART_BASE=0xc81004c0
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_IDENT_STRING=" khadas-vim"
|
||||
|
|
|
@ -2,7 +2,7 @@ CONFIG_ARM=y
|
|||
CONFIG_ARCH_MESON=y
|
||||
CONFIG_SYS_TEXT_BASE=0x01000000
|
||||
CONFIG_MESON_GXL=y
|
||||
CONFIG_TARGET_LIBRETECH_CC=y
|
||||
CONFIG_TARGET_P212=y
|
||||
CONFIG_DEBUG_UART_BASE=0xc81004c0
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_IDENT_STRING=" libretech-cc"
|
||||
|
|
Loading…
Reference in a new issue