From 31f88018d924fffaa9b710017261e415850ef2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Wed, 6 Apr 2022 11:39:33 +0200 Subject: arm: mvebu: turris_omnia: Define CONFIG_ETHPRIME instead of ethact= ENV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Behún --- include/configs/turris_omnia.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index b35299b2fbb..e8130ac858d 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 -- cgit v1.2.3 From 9efc5b7a4b40bbb18689a2c3b5c73de3272c136e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Wed, 6 Apr 2022 11:39:34 +0200 Subject: arm: mvebu: turris_omnia: Always enable MMC, SCSI and USB boot targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit U-Boot for Turris Omnia is always compiled with MMC, SCSI and USB support, so always enable macros for booting from these devices. Signed-off-by: Pali Rohár --- include/configs/turris_omnia.h | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'include') diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index e8130ac858d..f2fc374ad14 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -52,28 +52,10 @@ /* Include the common distro boot environment */ #ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_MMC -#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) -#else -#define BOOT_TARGET_DEVICES_MMC(func) -#endif - -#ifdef CONFIG_USB_STORAGE -#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) -#else -#define BOOT_TARGET_DEVICES_USB(func) -#endif - -#ifdef CONFIG_SCSI -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) -#else -#define BOOT_TARGET_DEVICES_SCSI(func) -#endif - #define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_DEVICES_MMC(func) \ - BOOT_TARGET_DEVICES_SCSI(func) \ - BOOT_TARGET_DEVICES_USB(func) \ + func(MMC, mmc, 0) \ + func(SCSI, scsi, 0) \ + func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -- cgit v1.2.3 From 0ddc1e5aa3e1e91fe1618798a523f75de7266657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Wed, 6 Apr 2022 11:39:35 +0200 Subject: arm: mvebu: turris_omnia: Add NVMe to boot targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit U-Boot for Turris Omnia has already enabled NVMe support. So add NVMe to boot targets. Signed-off-by: Pali Rohár --- include/configs/turris_omnia.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index f2fc374ad14..8119340b112 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -54,6 +54,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ + func(NVME, nvme, 0) \ func(SCSI, scsi, 0) \ func(USB, usb, 0) \ func(PXE, pxe, na) \ -- cgit v1.2.3 From b8b91a0f08884b754d10751661bb6a15a21a2b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Wed, 6 Apr 2022 11:39:36 +0200 Subject: arm: mvebu: turris_mox: Add NVMe and SCSI to boot targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit U-Boot for Turris Mox has already enabled NVMe and SCSI support. So add NVMe and SCSI to boot targets. Signed-off-by: Pali Rohár --- include/configs/turris_mox.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index dc2fdcc654a..6640ee495d2 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -25,6 +25,8 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ + func(NVME, nvme, 0) \ + func(SCSI, scsi, 0) \ func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -- cgit v1.2.3 From dbd2a382c15543365ec55b9812759efd5bbdbe9a Mon Sep 17 00:00:00 2001 From: Tony Dinh Date: Sun, 17 Apr 2022 13:42:42 -0700 Subject: arm: kirkwood: nsa310s: Use Marvell uclass mvgbe and PHY driver for DM Ethernet The Zyxel NSA310s board has the network chip Marvell Alaska 88E1318S. Use uclass mvgbe and the compatible driver M88E1310 driver to bring up Ethernet. - Use uclass mvgbe to bring up the network. And remove ad-hoc code. - Remove CONFIG_RESET_PHY_R. - Enable CONFIG_PHY_MARVELL to properly configure the network. - Add phy mode RGMII to kirkwood-nsa310s.dts - Miscellaneous changes: Move constants to .c file and remove header file board/zyxel/nsa310s/nsa310s.h, add support for large USB and SATA HDDs, use BIT macro, add/cleanup comments, and cosmetic changes. Note that this patch is depended on the following patch: https://patchwork.ozlabs.org/project/uboot/patch/20220412201820.10291-1-mibodhi@gmail.com/ Signed-off-by: Tony Dinh --- include/configs/nsa310s.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 485a3fe42dc..1e6b8d8b0e7 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2015, 2021 Tony Dinh + * Copyright (C) 2015, 2021-2022 Tony Dinh * Copyright (C) 2015 * Gerald Kerma * Luka Perkov @@ -11,8 +11,6 @@ #include "mv-common.h" -/* environment variables configuration */ - /* default environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -24,14 +22,11 @@ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0" /* Ethernet driver configuration */ -#ifdef CONFIG_CMD_NET #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 1 -#endif /* CONFIG_CMD_NET */ -/* SATA driver configuration */ -#ifdef CONFIG_SATA +/* Support large HDDs for USB and SATA */ #define CONFIG_LBA48 -#endif /* CONFIG_SATA */ +#define CONFIG_SYS_64BIT_LBA #endif /* _CONFIG_NSA310S_H */ -- cgit v1.2.3