diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-08 10:40:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-08 10:40:32 -0400 |
| commit | 186529953fd10a97e6343418095edd1c535aaeb2 (patch) | |
| tree | a6c0d4866228903806a32a20674344b6acf26cae /board | |
| parent | 7012865e961ca2645d783adf4b75ca4abdbfe5a7 (diff) | |
| parent | d9c967792b7830d51a1fe596f9a27ea6dfd4bcfe (diff) | |
| download | u-boot-186529953fd10a97e6343418095edd1c535aaeb2.zip u-boot-186529953fd10a97e6343418095edd1c535aaeb2.tar.gz u-boot-186529953fd10a97e6343418095edd1c535aaeb2.tar.bz2 | |
Merge tag 'u-boot-amlogic-20200708' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- Add proper Odroid-N2 board support code
- Add support for Odroid-C4 single board computer
Diffstat (limited to 'board')
| -rw-r--r-- | board/amlogic/odroid-n2/MAINTAINERS | 9 | ||||
| -rw-r--r-- | board/amlogic/odroid-n2/Makefile | 6 | ||||
| -rw-r--r-- | board/amlogic/odroid-n2/odroid-n2.c | 49 | ||||
| -rw-r--r-- | board/amlogic/w400/MAINTAINERS | 2 |
4 files changed, 64 insertions, 2 deletions
diff --git a/board/amlogic/odroid-n2/MAINTAINERS b/board/amlogic/odroid-n2/MAINTAINERS new file mode 100644 index 0000000..77f7746 --- /dev/null +++ b/board/amlogic/odroid-n2/MAINTAINERS @@ -0,0 +1,9 @@ +ODROID-N2 +M: Neil Armstrong <narmstrong@baylibre.com> +S: Maintained +L: u-boot-amlogic@groups.io +F: board/amlogic/odroid-n2/ +F: configs/odroid-n2_defconfig +F: configs/odroid-c4_defconfig +F: doc/board/amlogic/odroid-n2.rst +F: doc/board/amlogic/odroid-c4.rst diff --git a/board/amlogic/odroid-n2/Makefile b/board/amlogic/odroid-n2/Makefile new file mode 100644 index 0000000..68e4e2a --- /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 <narmstrong@baylibre.com> + +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 0000000..caf7fd6 --- /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 <narmstrong@baylibre.com> + */ + +#include <common.h> +#include <dm.h> +#include <env.h> +#include <init.h> +#include <net.h> +#include <asm/io.h> +#include <asm/arch/sm.h> +#include <asm/arch/eth.h> + +#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 5e837cf..a1b0ac8 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 |