summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-04-06 11:39:33 +0200
committerStefan Roese <sr@denx.de>2022-05-02 07:47:26 +0200
commit31f88018d924fffaa9b710017261e415850ef2b2 (patch)
tree1ec652cb99992c7fcd725980a6c4d376ce360985
parent1ae8a5fb6a59c3712f1e3adf25989ac23c9ec1bc (diff)
arm: mvebu: turris_omnia: Define CONFIG_ETHPRIME instead of ethact= ENV
CONFIG_ETHPRIME defines primary ethernet device and env variable $ethact stores currently active ethernet device. So there is no point to set ethact= in default environment. Instead set CONFIG_ETHPRIME properly. Signed-off-by: Pali Rohár <pali@kernel.org> Reviewed-by: Marek Behún <marek.behun@nic.cz>
-rw-r--r--configs/turris_omnia_defconfig2
-rw-r--r--include/configs/turris_omnia.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index f310debe6f..5591c9716b 100644
--- a/configs/turris_omnia_defconfig
+++ b/configs/turris_omnia_defconfig
@@ -64,6 +64,8 @@ CONFIG_CMD_FS_UUID=y
# CONFIG_SPL_PARTITION_UUIDS is not set
CONFIG_ENV_OVERWRITE=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_USE_ETHPRIME=y
+CONFIG_ETHPRIME="ethernet@34000"
CONFIG_ARP_TIMEOUT=200
CONFIG_NET_RETRY_COUNT=50
CONFIG_SPL_OF_TRANSLATE=y
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index b35299b2fb..e8130ac858 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -119,7 +119,6 @@
LOAD_ADDRESS_ENV_SETTINGS \
"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
"console=ttyS0,115200\0" \
- "ethact=ethernet@34000\0" \
"bootcmd_rescue=" TURRIS_OMNIA_BOOTCMD_RESCUE "\0" \
BOOTENV