diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-08 16:02:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-08 16:02:19 -0400 |
| commit | 0b7f1a95df8fe312ff8f1f548f51e6d656e8e67e (patch) | |
| tree | 8ecfb7fedd9c1b7fa115054b218f7549d836d9a4 /board/amlogic | |
| parent | f5e73a34eddea4fb7c5e3d984b86f395996a64cd (diff) | |
| parent | 3f1f9f08eb2031e14a7e2037feed18a69f1437c6 (diff) | |
Merge tag 'u-boot-amlogic-20190704' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- fix khadas-vim README
- add support for unique generated MAC adresses from SoC serial,
limited to Amlogic GXL/GXM boards for now
Diffstat (limited to 'board/amlogic')
| -rw-r--r-- | board/amlogic/p212/README.khadas-vim | 2 | ||||
| -rw-r--r-- | board/amlogic/p212/p212.c | 2 | ||||
| -rw-r--r-- | board/amlogic/q200/q200.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/board/amlogic/p212/README.khadas-vim b/board/amlogic/p212/README.khadas-vim index b1942364f8..a2c7606454 100644 --- a/board/amlogic/p212/README.khadas-vim +++ b/board/amlogic/p212/README.khadas-vim @@ -50,7 +50,7 @@ the git tree published by the board vendor: > git clone https://github.com/khadas/u-boot -b Vim vim-u-boot > cd vim-u-boot > make kvim_defconfig - > make + > make CROSS_COMPILE=aarch64-none-elf- > export FIPDIR=$PWD/fip Go back to mainline U-Boot source tree then : diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c index 546c4d9c86..1159cee4ce 100644 --- a/board/amlogic/p212/p212.c +++ b/board/amlogic/p212/p212.c @@ -32,6 +32,8 @@ int misc_init_r(void) mac_addr, EFUSE_MAC_SIZE); if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("ethaddr", mac_addr); + else + meson_generate_serial_ethaddr(); } if (!env_get("serial#")) { diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c index de97d6ad58..2ea97c362e 100644 --- a/board/amlogic/q200/q200.c +++ b/board/amlogic/q200/q200.c @@ -31,6 +31,8 @@ int misc_init_r(void) mac_addr, EFUSE_MAC_SIZE); if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("ethaddr", mac_addr); + else + meson_generate_serial_ethaddr(); } if (!env_get("serial#")) { |