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>

diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index f310debe6f9f97617eb8e273f3eecd9b6268dc0e..5591c9716b26673e6e3406fa443e0295750c5bcc 100644 (file)
--- 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 b35299b2fbb36fdba68dca0851e538568d4f0f3c..e8130ac858d8f819f62b2015de452b240fe2e188 100644 (file)
--- 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