brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

Browse Source 
- Espressobin: Fix compatible string check
- Espressobin: Extend README for more MAC addresses
This commit is contained in:
Tom Rini 2020-10-01 08:55:20 -04:00
commit 4f48163201
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/Marvell/mvebu_armada-37xx/board.c
View File

@ -88,14 +88,14 @@ int board_late_init(void)
if (env_get("fdtfile"))
return 0;
if (!of_machine_is_compatible("globalscale,espressobin"))
if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
return 0;
/* If the memory controller has been configured for DDR4, we're running on v7 */
ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");
if (ddr4 && emmc)
env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");

23
doc/README.marvell
View File

@ -27,7 +27,7 @@ Build Procedure
- For the Armada-70x0/80x0 DB board use "mvebu_db_armada8k_defconfig"
- For the Armada-80x0 MacchiatoBin use "make mvebu_mcbin-88f8040_defconfig"
- For the Armada-3700 DB board use "make mvebu_db-88f3720_defconfig"
- For the Armada-3700 EsspressoBin use "make mvebu_espressobin-88f3720_defconfig"
- For the Armada-3700 EspressoBin use "make mvebu_espressobin-88f3720_defconfig"
5. Configure the device-tree and build the U-Boot image:
@ -62,11 +62,15 @@ Configuration update
Permanent ethernet MAC address
-------------------------------
Prior flashing new U-Boot version (as part of ATF image) it is suggested to backup
permanent ethernet MAC address as it is stored only in U-Boot env storage (SPI or eMMC).
Some boards like EspressoBin have MAC address printed on sticker. To print current MAC
address run:
permanent ethernet MAC addresses as they are stored only in U-Boot env storage (SPI or eMMC).
Some boards like EspressoBin have MAC addresses printed on sticker. Some boards got assigned
only one address other may also more than one. To print current MAC addresses run:
# echo $ethaddr
# echo $eth1addr
# echo $eth2addr
# echo $eth3addr
# ...
MAC addresses 00:51:82:11:22:00, 00:51:82:11:22:01, 00:51:82:11:22:02, 00:51:82:11:22:03
and F0:AD:4E:03:64:7F are default hardcoded values found in Marvell's and Armbian U-Boot
@ -75,13 +79,20 @@ Permanent ethernet MAC address
suggested to generate new random one.
After flashing new U-Boot version it is suggested to reset U-Boot env variables to default
and then set correct permanent ethernet MAC address.
and then set correct permanent ethernet MAC addresses.
# env default -a
# setenv ethaddr XX:XX:XX:XX:XX:XX
# setenv eth1addr XX:XX:XX:XX:XX:XX
# setenv eth2addr YY:YY:YY:YY:YY:YY
# setenv eth3addr ZZ:ZZ:ZZ:ZZ:ZZ:ZZ
# ...
# saveenv
Where XX:XX:XX:XX:XX:XX is permanent ethernet MAC address.
Where value for ethaddr is required permanent ethernet MAC address and values for ethNaddr
are optional per-port MAC addresses. When optional ethNaddr variables are not defined then
they are inherited from required ethaddr variable. eth1addr contains MAC address for the
wan port, other for particular lan ports.
Recent Linux kernel versions use correct permanent ethernet MAC address from U-Boot env as
U-Boot will inject it into kernel's device-tree.