diff options
65 files changed, 481 insertions, 293 deletions
@@ -37,6 +37,8 @@ Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com> Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net> Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org> Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com> +Marek Behún <kabel@kernel.org> <marek.behun@nic.cz> +Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz> Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com> Marek Vasut <marex@denx.de> <marek.vasut@gmail.com> Marek Vasut <marex@denx.de> <marex at denx.de> diff --git a/MAINTAINERS b/MAINTAINERS index 7701a9d6be..cd54e6663d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -248,14 +248,6 @@ F: drivers/net/cortina_ni.h F: drivers/net/phy/ca_phy.c F: configs/cortina_presidio-asic-pnand_defconfig -ARM/CZ.NIC TURRIS MOX SUPPORT -M: Marek Behun <marek.behun@nic.cz> -S: Maintained -F: arch/arm/dts/armada-3720-turris-mox.dts -F: board/CZ.NIC/ -F: configs/turris_*_defconfig -F: include/configs/turris_*.h - ARM FREESCALE IMX M: Stefano Babic <sbabic@denx.de> M: Fabio Estevam <festevam@gmail.com> @@ -379,6 +371,14 @@ F: tools/mtk_image.c F: tools/mtk_image.h N: mediatek +ARM METHODE SUPPORT +M: Robert Marko <robert.marko@sartura.hr> +S: Maintained +F: arch/arm/dts/armada-3720-eDPU* +F: arch/arm/dts/armada-3720-uDPU* +F: configs/eDPU_defconfig +F: configs/uDPU_defconfig + ARM MICROCHIP/ATMEL AT91 M: Eugen Hristev <eugen.hristev@microchip.com> S: Maintained @@ -752,7 +752,7 @@ F: net/eth_bootdevice.c F: test/boot/ BTRFS -M: Marek Behun <marek.behun@nic.cz> +M: Marek Behún <kabel@kernel.org> R: Qu Wenruo <wqu@suse.com> L: linux-btrfs@vger.kernel.org S: Maintained @@ -956,7 +956,7 @@ F: drivers/i2c/ KWBIMAGE / KWBOOT TOOLS M: Pali Rohár <pali@kernel.org> -M: Marek Behún <marek.behun@nic.cz> +M: Marek Behún <kabel@kernel.org> M: Stefan Roese <sr@denx.de> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-marvell.git diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 66c719908c..42c7790ee8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -236,6 +236,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-3720-db.dtb \ armada-3720-espressobin.dtb \ armada-3720-turris-mox.dtb \ + armada-3720-eDPU.dtb \ armada-3720-uDPU.dtb \ armada-375-db.dtb \ armada-385-atl-x530.dtb \ diff --git a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi new file mode 100644 index 0000000000..1b2648f64d --- /dev/null +++ b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + product = "eDPU"; + }; + + baseboard { + product = "eDPU"; + }; + + chassis { + product = "eDPU"; + }; + }; + }; +}; + +&spi0 { + u-boot,dm-pre-reloc; + + spi-flash@0 { + u-boot,dm-pre-reloc; + }; +}; + +&sdhci0 { + u-boot,dm-pre-reloc; +}; + +ð0 { + /* G.hn does not work without additional configuration */ + status = "disabled"; +}; + +ð1 { + fixed-link { + speed = <1000>; + full-duplex; + }; +}; diff --git a/arch/arm/dts/armada-3720-eDPU.dts b/arch/arm/dts/armada-3720-eDPU.dts new file mode 100644 index 0000000000..57fc698e55 --- /dev/null +++ b/arch/arm/dts/armada-3720-eDPU.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "armada-3720-uDPU.dtsi" + +/ { + model = "Methode eDPU Board"; + compatible = "methode,edpu", "marvell,armada3720", "marvell,armada3710"; +}; + +ð0 { + phy-mode = "2500base-x"; +}; diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index 1f534c0c65..a75734d88a 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -1,66 +1,12 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Device tree for the uDPU board. - * Based on Marvell Armada 3720 development board (DB-88F3720-DDR3) - * Copyright (C) 2016 Marvell - * Copyright (C) 2019 Methode Electronics - * Copyright (C) 2019 Telus - * - * Vladimir Vid <vladimir.vid@sartura.hr> - */ /dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include "armada-372x.dtsi" +#include "armada-3720-uDPU.dtsi" / { model = "Methode uDPU Board"; - compatible = "methode,udpu", "marvell,armada3720"; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - memory@0 { - device_type = "memory"; - reg = <0x00000000 0x00000000 0x00000000 0x20000000>; - }; - - leds { - pinctrl-names = "default"; - compatible = "gpio-leds"; - - power1 { - label = "udpu:green:power"; - gpios = <&gpionb 11 GPIO_ACTIVE_LOW>; - }; - - power2 { - label = "udpu:red:power"; - gpios = <&gpionb 12 GPIO_ACTIVE_LOW>; - }; - - network1 { - label = "udpu:green:network"; - gpios = <&gpionb 13 GPIO_ACTIVE_LOW>; - }; - - network2 { - label = "udpu:red:network"; - gpios = <&gpionb 14 GPIO_ACTIVE_LOW>; - }; - - alarm1 { - label = "udpu:green:alarm"; - gpios = <&gpionb 15 GPIO_ACTIVE_LOW>; - }; - - alarm2 { - label = "udpu:red:alarm"; - gpios = <&gpionb 16 GPIO_ACTIVE_LOW>; - }; - }; + compatible = "methode,udpu", "marvell,armada3720", "marvell,armada3710"; sfp_eth0: sfp-eth0 { compatible = "sff,sfp"; @@ -71,55 +17,6 @@ tx-fault-gpio = <&gpiosb 5 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt = <3000>; }; - - sfp_eth1: sfp-eth1 { - compatible = "sff,sfp"; - i2c-bus = <&i2c1>; - los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>; - maximum-power-milliwatt = <3000>; - }; -}; - -&sdhci0 { - status = "okay"; - bus-width = <8>; - mmc-ddr-1_8v; - mmc-hs400-1_8v; - marvell,pad-type = "fixed-1-8v"; - non-removable; - no-sd; - no-sdio; -}; - -&spi0 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&spi_quad_pins>; - - spi-flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <54000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "firmware"; - reg = <0x0 0x180000>; - }; - - partition@180000 { - label = "u-boot-env"; - reg = <0x180000 0x10000>; - }; - }; - }; }; &pinctrl_nb { @@ -127,11 +24,6 @@ groups = "i2c1"; function = "gpio"; }; - - i2c2_recovery_pins: i2c2-recovery-pins { - groups = "i2c2"; - function = "gpio"; - }; }; &i2c0 { @@ -144,50 +36,7 @@ sda-gpios = <&gpionb 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; }; -&i2c1 { - status = "okay"; - pinctrl-names = "default", "recovery"; - pinctrl-0 = <&i2c2_pins>; - pinctrl-1 = <&i2c2_recovery_pins>; - /delete-property/mrvl,i2c-fast-mode; - scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - - nct375@48 { - status = "okay"; - compatible = "ti,tmp75c"; - reg = <0x48>; - }; - - nct375@49 { - status = "okay"; - compatible = "ti,tmp75c"; - reg = <0x49>; - }; -}; - ð0 { phy-mode = "sgmii"; - status = "okay"; - managed = "in-band-status"; - phys = <&comphy1 0>; sfp = <&sfp_eth0>; }; - -ð1 { - phy-mode = "sgmii"; - status = "okay"; - managed = "in-band-status"; - phys = <&comphy0 1>; - sfp = <&sfp_eth1>; -}; - -&usb3 { - status = "okay"; - phys = <&usb2_utmi_otg_phy>; - phy-names = "usb2-utmi-otg-phy"; -}; - -&uart0 { - status = "okay"; -}; diff --git a/arch/arm/dts/armada-3720-uDPU.dtsi b/arch/arm/dts/armada-3720-uDPU.dtsi new file mode 100644 index 0000000000..3f79923376 --- /dev/null +++ b/arch/arm/dts/armada-3720-uDPU.dtsi @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device tree for the uDPU board. + * Based on Marvell Armada 3720 development board (DB-88F3720-DDR3) + * Copyright (C) 2016 Marvell + * Copyright (C) 2019 Methode Electronics + * Copyright (C) 2019 Telus + * + * Vladimir Vid <vladimir.vid@sartura.hr> + */ + +/dts-v1/; + +#include <dt-bindings/gpio/gpio.h> +#include "armada-372x.dtsi" + +/ { + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x00000000 0x00000000 0x20000000>; + }; + + leds { + compatible = "gpio-leds"; + + led-power1 { + label = "udpu:green:power"; + gpios = <&gpionb 11 GPIO_ACTIVE_LOW>; + }; + + led-power2 { + label = "udpu:red:power"; + gpios = <&gpionb 12 GPIO_ACTIVE_LOW>; + }; + + led-network1 { + label = "udpu:green:network"; + gpios = <&gpionb 13 GPIO_ACTIVE_LOW>; + }; + + led-network2 { + label = "udpu:red:network"; + gpios = <&gpionb 14 GPIO_ACTIVE_LOW>; + }; + + led-alarm1 { + label = "udpu:green:alarm"; + gpios = <&gpionb 15 GPIO_ACTIVE_LOW>; + }; + + led-alarm2 { + label = "udpu:red:alarm"; + gpios = <&gpionb 16 GPIO_ACTIVE_LOW>; + }; + }; + + sfp_eth1: sfp-eth1 { + compatible = "sff,sfp"; + i2c-bus = <&i2c1>; + los-gpio = <&gpiosb 7 GPIO_ACTIVE_HIGH>; + mod-def0-gpio = <&gpiosb 8 GPIO_ACTIVE_LOW>; + tx-disable-gpio = <&gpiosb 9 GPIO_ACTIVE_HIGH>; + tx-fault-gpio = <&gpiosb 10 GPIO_ACTIVE_HIGH>; + maximum-power-milliwatt = <3000>; + }; +}; + +&sdhci0 { + status = "okay"; + bus-width = <8>; + mmc-ddr-1_8v; + mmc-hs400-1_8v; + marvell,pad-type = "fixed-1-8v"; + non-removable; + no-sd; + no-sdio; +}; + +&spi0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&spi_quad_pins>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <54000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "firmware"; + reg = <0x0 0x180000>; + }; + + partition@180000 { + label = "u-boot-env"; + reg = <0x180000 0x10000>; + }; + }; + }; +}; + +&pinctrl_nb { + i2c2_recovery_pins: i2c2-recovery-pins { + groups = "i2c2"; + function = "gpio"; + }; +}; + +&i2c1 { + status = "okay"; + pinctrl-names = "default", "recovery"; + pinctrl-0 = <&i2c2_pins>; + pinctrl-1 = <&i2c2_recovery_pins>; + /delete-property/mrvl,i2c-fast-mode; + scl-gpios = <&gpionb 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&gpionb 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + + temp-sensor@48 { + compatible = "ti,tmp75c"; + reg = <0x48>; + }; + + temp-sensor@49 { + compatible = "ti,tmp75c"; + reg = <0x49>; + }; +}; + +ð0 { + status = "okay"; + managed = "in-band-status"; + phys = <&comphy1 0>; +}; + +ð1 { + phy-mode = "sgmii"; + status = "okay"; + managed = "in-band-status"; + phys = <&comphy0 1>; + sfp = <&sfp_eth1>; +}; + +&usb3 { + status = "okay"; + phys = <&usb2_utmi_otg_phy>; + phy-names = "usb2-utmi-otg-phy"; +}; + +&uart0 { + status = "okay"; +}; diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi index 64ebe2c6d4..5a22cc64a1 100644 --- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2017 Marek Behún <kabel@kernel.org> */ / { diff --git a/arch/arm/dts/armada-385-turris-omnia.dts b/arch/arm/dts/armada-385-turris-omnia.dts index 5511c84849..7f1478edfd 100644 --- a/arch/arm/dts/armada-385-turris-omnia.dts +++ b/arch/arm/dts/armada-385-turris-omnia.dts @@ -55,6 +55,12 @@ stdout-path = &uart0; }; + aliases { + ethernet0 = ð0; + ethernet1 = ð1; + ethernet2 = ð2; + }; + memory { device_type = "memory"; reg = <0x00000000 0x40000000>; /* 1024 MB */ diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 5357aa554d..238edbe6ba 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -28,14 +28,13 @@ DECLARE_GLOBAL_DATA_PTR; * Currently only 2GiB are mapped for system memory. This is what * we pass to the U-Boot subsystem here. */ -#define USABLE_RAM_SIZE 0x80000000 +#define USABLE_RAM_SIZE 0x80000000ULL ulong board_get_usable_ram_top(ulong total_size) { - if (gd->ram_size > USABLE_RAM_SIZE) - return USABLE_RAM_SIZE; + unsigned long top = CONFIG_SYS_SDRAM_BASE + min(gd->ram_size, USABLE_RAM_SIZE); - return gd->ram_size; + return (gd->ram_top > top) ? top : gd->ram_top; } /* diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index 52b5109b73..ab72b304e5 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Stefan Roese <sr@denx.de> - * Copyright (C) 2020 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2020 Marek Behún <kabel@kernel.org> */ #include <common.h> diff --git a/arch/arm/mach-mvebu/armada3700/mbox.c b/arch/arm/mach-mvebu/armada3700/mbox.c index eb1f82845f..6555b8673c 100644 --- a/arch/arm/mach-mvebu/armada3700/mbox.c +++ b/arch/arm/mach-mvebu/armada3700/mbox.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> * Copyright (C) 2021 Pali Rohár <pali@kernel.org> */ diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index 173d95a760..1457af1d6a 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -54,33 +54,6 @@ void reset_cpu(void) ; } -int mvebu_soc_family(void) -{ - u16 devid = (readl(MVEBU_REG_PCIE_DEVID) >> 16) & 0xffff; - - switch (devid) { - case SOC_MV78230_ID: - case SOC_MV78260_ID: - case SOC_MV78460_ID: - return MVEBU_SOC_AXP; - - case SOC_88F6720_ID: - return MVEBU_SOC_A375; - - case SOC_88F6810_ID: - case SOC_88F6820_ID: - case SOC_88F6828_ID: - return MVEBU_SOC_A38X; - - case SOC_98DX3236_ID: - case SOC_98DX3336_ID: - case SOC_98DX4251_ID: - return MVEBU_SOC_MSYS; - } - - return MVEBU_SOC_UNKNOWN; -} - u32 get_boot_device(void) { u32 val; @@ -305,7 +278,10 @@ int print_cpuinfo(void) break; } - if (mvebu_soc_family() == MVEBU_SOC_AXP) { + switch (devid) { + case SOC_MV78230_ID: + case SOC_MV78260_ID: + case SOC_MV78460_ID: switch (revid) { case 1: puts("A0"); @@ -317,9 +293,9 @@ int print_cpuinfo(void) printf("?? (%x)", revid); break; } - } + break; - if (mvebu_soc_family() == MVEBU_SOC_A375) { + case SOC_88F6720_ID: switch (revid) { case MV_88F67XX_A0_ID: puts("A0"); @@ -328,9 +304,11 @@ int print_cpuinfo(void) printf("?? (%x)", revid); break; } - } + break; - if (mvebu_soc_family() == MVEBU_SOC_A38X) { + case SOC_88F6810_ID: + case SOC_88F6820_ID: + case SOC_88F6828_ID: switch (revid) { case MV_88F68XX_Z1_ID: puts("Z1"); @@ -345,9 +323,11 @@ int print_cpuinfo(void) printf("?? (%x)", revid); break; } - } + break; - if (mvebu_soc_family() == MVEBU_SOC_MSYS) { + case SOC_98DX3236_ID: + case SOC_98DX3336_ID: + case SOC_98DX4251_ID: switch (revid) { case 3: puts("A0"); @@ -359,6 +339,11 @@ int print_cpuinfo(void) printf("?? (%x)", revid); break; } + break; + + default: + printf("?? (%x)", revid); + break; } get_sar_freq(&sar_freq); @@ -463,7 +448,7 @@ int arch_cpu_init(void) struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE; - if (mvebu_soc_family() == MVEBU_SOC_A38X) { + if (IS_ENABLED(CONFIG_ARMADA_38X)) { /* * To fully release / unlock this area from cache, we need * to flush all caches and disable the L2 cache. @@ -492,7 +477,7 @@ int arch_cpu_init(void) */ mvebu_mbus_probe(NULL, 0); - if (mvebu_soc_family() == MVEBU_SOC_AXP) { + if (IS_ENABLED(CONFIG_ARMADA_XP)) { /* * Now the SDRAM access windows can be reconfigured using * the information in the SDRAM scratch pad registers @@ -506,7 +491,7 @@ int arch_cpu_init(void) */ mvebu_mbus_probe(windows, ARRAY_SIZE(windows)); - if (mvebu_soc_family() == MVEBU_SOC_AXP) { + if (IS_ENABLED(CONFIG_ARMADA_XP)) { /* Enable GBE0, GBE1, LCD and NFC PUP */ clrsetbits_le32(ARMADA_XP_PUP_ENABLE, 0, GE0_PUP_EN | GE1_PUP_EN | LCD_PUP_EN | @@ -530,9 +515,9 @@ u32 mvebu_get_nand_clock(void) { u32 reg; - if (mvebu_soc_family() == MVEBU_SOC_A38X) + if (IS_ENABLED(CONFIG_ARMADA_38X)) reg = MVEBU_DFX_DIV_CLK_CTRL(1); - else if (mvebu_soc_family() == MVEBU_SOC_MSYS) + else if (IS_ENABLED(CONFIG_ARMADA_MSYS)) reg = MVEBU_DFX_DIV_CLK_CTRL(8); else reg = MVEBU_CORE_DIV_CLK_CTRL(1); @@ -678,7 +663,7 @@ void enable_caches(void) * ethernet driver (mvpp2). So lets keep the d-cache disabled * until this is solved. */ - if (mvebu_soc_family() != MVEBU_SOC_A375) { + if (IS_ENABLED(CONFIG_ARMADA_375)) { /* Enable D-cache. I-cache is already enabled in start.S */ dcache_enable(); } @@ -686,7 +671,7 @@ void enable_caches(void) void v7_outer_cache_enable(void) { - if (mvebu_soc_family() == MVEBU_SOC_AXP) { + if (IS_ENABLED(CONFIG_ARMADA_XP)) { struct pl310_regs *const pl310 = (struct pl310_regs *)CONFIG_SYS_PL310_BASE; u32 u; diff --git a/arch/arm/mach-mvebu/dram.c b/arch/arm/mach-mvebu/dram.c index 349e0cc4c1..d398d0f767 100644 --- a/arch/arm/mach-mvebu/dram.c +++ b/arch/arm/mach-mvebu/dram.c @@ -220,7 +220,7 @@ static int ecc_enabled(void) return 0; } -/* Return the width of the DRAM bus, or 0 for unknown. */ +/* Return the width of the DRAM bus. */ static int bus_width(void) { int full_width = 0; @@ -228,17 +228,11 @@ static int bus_width(void) if (reg_read(REG_SDRAM_CONFIG_ADDR) & (1 << REG_SDRAM_CONFIG_WIDTH_OFFS)) full_width = 1; - switch (mvebu_soc_family()) { - case MVEBU_SOC_AXP: - return full_width ? 64 : 32; - break; - case MVEBU_SOC_A375: - case MVEBU_SOC_A38X: - case MVEBU_SOC_MSYS: - return full_width ? 32 : 16; - default: - return 0; - } +#ifdef CONFIG_ARMADA_XP + return full_width ? 64 : 32; +#else + return full_width ? 32 : 16; +#endif } static int cycle_mode(void) diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index b99d86a87a..689c96bd4e 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -61,14 +61,6 @@ enum cpu_attrib { CPU_ATTR_DEV_CS3 = 0x37, }; -enum { - MVEBU_SOC_AXP, - MVEBU_SOC_A375, - MVEBU_SOC_A38X, - MVEBU_SOC_MSYS, - MVEBU_SOC_UNKNOWN, -}; - #define MVEBU_SDRAM_SIZE_MAX 0xc0000000 /* @@ -140,7 +132,6 @@ unsigned int mvebu_sdram_bar(enum memory_bank bank); unsigned int mvebu_sdram_bs(enum memory_bank bank); void mvebu_sdram_size_adjust(enum memory_bank bank); int mvebu_mbus_probe(struct mbus_win windows[], int count); -int mvebu_soc_family(void); u32 mvebu_get_nand_clock(void); void __noreturn return_to_bootrom(void); diff --git a/arch/arm/mach-mvebu/include/mach/mbox.h b/arch/arm/mach-mvebu/include/mach/mbox.h index f1cb55f2bf..fcc7a46c1d 100644 --- a/arch/arm/mach-mvebu/include/mach/mbox.h +++ b/arch/arm/mach-mvebu/include/mach/mbox.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> * Copyright (C) 2021 Pali Rohár <pali@kernel.org> */ diff --git a/board/CZ.NIC/turris_atsha_otp.c b/board/CZ.NIC/turris_atsha_otp.c index 8c39f5e524..aa4e29b156 100644 --- a/board/CZ.NIC/turris_atsha_otp.c +++ b/board/CZ.NIC/turris_atsha_otp.c @@ -1,11 +1,12 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2017 Marek Behún <kabel@kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz> */ #include <env.h> #include <net.h> +#include <dm/device.h> #include <dm/uclass.h> #include <atsha204a-i2c.h> @@ -16,12 +17,14 @@ #define TURRIS_ATSHA_OTP_MAC0 3 #define TURRIS_ATSHA_OTP_MAC1 4 +extern U_BOOT_DRIVER(atsha204); + static struct udevice *get_atsha204a_dev(void) { /* Cannot be static because BSS does not have to be ready at this early stage */ struct udevice *dev; - if (uclass_get_device_by_name(UCLASS_MISC, "crypto@64", &dev)) { + if (uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(atsha204), &dev)) { puts("Cannot find ATSHA204A on I2C bus!\n"); dev = NULL; } diff --git a/board/CZ.NIC/turris_mox/MAINTAINERS b/board/CZ.NIC/turris_mox/MAINTAINERS index 2b9c1132f5..b29ce92ccd 100644 --- a/board/CZ.NIC/turris_mox/MAINTAINERS +++ b/board/CZ.NIC/turris_mox/MAINTAINERS @@ -1,6 +1,8 @@ -TURRIS OMNIA BOARD -M: Marek Behún <marek.behun@nic.cz> +TURRIS MOX BOARD +M: Marek Behún <kabel@kernel.org> +M: Pali Rohár <pali@kernel.org> S: Maintained +F: arch/arm/dts/armada-3720-turris-mox*.dts* F: board/CZ.NIC/turris_mox/ F: include/configs/turris_mox.h F: configs/turris_mox_defconfig diff --git a/board/CZ.NIC/turris_mox/Makefile b/board/CZ.NIC/turris_mox/Makefile index 33a52b63d7..2196821b81 100644 --- a/board/CZ.NIC/turris_mox/Makefile +++ b/board/CZ.NIC/turris_mox/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -# Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> +# Copyright (C) 2018 Marek Behún <kabel@kernel.org> obj-y := turris_mox.o mox_sp.o diff --git a/board/CZ.NIC/turris_mox/mox_sp.c b/board/CZ.NIC/turris_mox/mox_sp.c index 93e96b014f..87f67512fb 100644 --- a/board/CZ.NIC/turris_mox/mox_sp.c +++ b/board/CZ.NIC/turris_mox/mox_sp.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> */ #include <common.h> diff --git a/board/CZ.NIC/turris_mox/mox_sp.h b/board/CZ.NIC/turris_mox/mox_sp.h index 49a4ed80ea..83b6037458 100644 --- a/board/CZ.NIC/turris_mox/mox_sp.h +++ b/board/CZ.NIC/turris_mox/mox_sp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> */ #ifndef _BOARD_CZNIC_TURRIS_MOX_MOX_SP_H_ diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 68bc315a9c..28259e7140 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> */ #include <common.h> diff --git a/board/CZ.NIC/turris_omnia/MAINTAINERS b/board/CZ.NIC/turris_omnia/MAINTAINERS index ed15e11d3e..8258f4fc5b 100644 --- a/board/CZ.NIC/turris_omnia/MAINTAINERS +++ b/board/CZ.NIC/turris_omnia/MAINTAINERS @@ -1,6 +1,9 @@ TURRIS OMNIA BOARD -M: Marek Behún <marek.behun@nic.cz> +M: Marek Behún <kabel@kernel.org> +M: Pali Rohár <pali@kernel.org> S: Maintained +F: arch/arm/dts/armada-385-turris-omnia*.dts* +F: board/CZ.NIC/turris_atsha_otp.* F: board/CZ.NIC/turris_omnia/ -F: include/configs/turris_omnia.h F: configs/turris_omnia_defconfig +F: include/configs/turris_omnia.h diff --git a/board/CZ.NIC/turris_omnia/Makefile b/board/CZ.NIC/turris_omnia/Makefile index b79555ab46..dc39b44ae1 100644 --- a/board/CZ.NIC/turris_omnia/Makefile +++ b/board/CZ.NIC/turris_omnia/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -# Copyright (C) 2017 Marek Behun <marek.behun@nic.cz> +# Copyright (C) 2017 Marek Behún <kabel@kernel.org> obj-y := turris_omnia.o ../turris_atsha_otp.o diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index b169abca09..5921769f1e 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2017 Marek Behún <kabel@kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz> * * Derived from the code for diff --git a/board/Marvell/mvebu_armada-37xx/MAINTAINERS b/board/Marvell/mvebu_armada-37xx/MAINTAINERS index f2c0a582d7..9b0afeef10 100644 --- a/board/Marvell/mvebu_armada-37xx/MAINTAINERS +++ b/board/Marvell/mvebu_armada-37xx/MAINTAINERS @@ -9,8 +9,3 @@ ESPRESSOBin BOARD M: Konstantin Porotchkin <kostap@marvell.com> S: Maintained F: configs/mvebu_espressobin-88f3720_defconfig - -uDPU BOARD -M: Vladimir Vid <vladimir.vid@sartura.hr> -S: Maintained -F: configs/uDPU_defconfig diff --git a/cmd/Kconfig b/cmd/Kconfig index d5f842136c..b3820f1e04 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -184,6 +184,7 @@ config CMD_REGINFO config CMD_TLV_EEPROM bool "tlv_eeprom" depends on I2C_EEPROM + select CRC32 help Display and program the system EEPROM data block in ONIE Tlvinfo format. TLV stands for Type-Length-Value. @@ -192,6 +193,7 @@ config SPL_CMD_TLV_EEPROM bool "tlv_eeprom for SPL" depends on SPL_I2C_EEPROM select SPL_DRIVERS_MISC + select SPL_CRC32 help Read system EEPROM data block in ONIE Tlvinfo format from SPL. diff --git a/cmd/btrfs.c b/cmd/btrfs.c index 7e3cbe12ce..98daea99e9 100644 --- a/cmd/btrfs.c +++ b/cmd/btrfs.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * 2017 by Marek Behun <marek.behun@nic.cz> + * 2017 by Marek Behún <kabel@kernel.org> */ #include <common.h> diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 908d7d17fd..b8c21f557f 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -294,6 +294,7 @@ config SPL_BOOTCOUNT_LIMIT config SPL_RAW_IMAGE_SUPPORT bool "Support SPL loading and booting of RAW images" + default n if ARCH_MVEBU default n if (ARCH_MX6 && (SPL_MMC || SPL_SATA)) default y depends on !TI_SECURE_DEVICE @@ -304,6 +305,7 @@ config SPL_RAW_IMAGE_SUPPORT config SPL_LEGACY_IMAGE_FORMAT bool "Support SPL loading and booting of Legacy images" + default n if ARCH_MVEBU default y if !SPL_LOAD_FIT depends on !TI_SECURE_DEVICE help diff --git a/configs/eDPU_defconfig b/configs/eDPU_defconfig new file mode 100644 index 0000000000..5b2f2e9720 --- /dev/null +++ b/configs/eDPU_defconfig @@ -0,0 +1,99 @@ +CONFIG_ARM=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_TARGET_MVEBU_ARMADA_37XX=y +CONFIG_MVEBU_EFUSE=y +CONFIG_ENV_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x180000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="armada-3720-eDPU" +CONFIG_DEBUG_UART_BASE=0xd0012000 +CONFIG_SYS_LOAD_ADDR=0x6000000 +CONFIG_DEBUG_UART=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xff0000 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_USE_PREBOOT=y +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_ARCH_EARLY_INIT_R=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SYS_PROMPT="eDPU>> " +CONFIG_SYS_MAXARGS=32 +CONFIG_SYS_PBSIZE=1048 +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_FUSE=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_MVEBU_BUBT=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_MAC_PARTITION=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ARP_TIMEOUT=200 +CONFIG_NET_RETRY_COUNT=50 +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_LBA48=y +CONFIG_SYS_64BIT_LBA=y +CONFIG_CLK=y +CONFIG_CLK_MVEBU=y +CONFIG_DM_I2C=y +CONFIG_DM_I2C_GPIO=y +CONFIG_SYS_I2C_MV=y +CONFIG_MISC=y +CONFIG_MMC_HS200_SUPPORT=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_XENON=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_SPI_FLASH_SFDP_SUPPORT=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_SPI_FLASH_MTD=y +CONFIG_PHYLIB_10G=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_FIXED=y +CONFIG_PHY_GIGE=y +CONFIG_MVNETA=y +CONFIG_MVMDIO=y +CONFIG_PHY=y +CONFIG_MVEBU_COMPHY_SUPPORT=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_ARMADA_37XX=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +# CONFIG_SCSI is not set +CONFIG_MVEBU_A3700_UART=y +CONFIG_MVEBU_A3700_SPI=y +CONFIG_SYSINFO=y +CONFIG_SYSINFO_SMBIOS=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_RTL8152=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_LZO=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index 4085fac232..cbe0617394 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -74,7 +74,7 @@ CONFIG_CMD_FS_UUID=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_ETHPRIME=y -CONFIG_ETHPRIME="ethernet@34000" +CONFIG_ETHPRIME="eth2" CONFIG_ARP_TIMEOUT=200 CONFIG_NET_RETRY_COUNT=50 CONFIG_NETCONSOLE=y diff --git a/configs/uDPU_defconfig b/configs/uDPU_defconfig index 2b2dc16646..505fda4bd3 100644 --- a/configs/uDPU_defconfig +++ b/configs/uDPU_defconfig @@ -12,7 +12,6 @@ CONFIG_DEFAULT_DEVICE_TREE="armada-3720-uDPU" CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_SYS_LOAD_ADDR=0x6000000 CONFIG_DEBUG_UART=y -CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xff0000 @@ -37,7 +36,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_MTD=y -CONFIG_CMD_PCI=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set @@ -53,7 +51,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ARP_TIMEOUT=200 CONFIG_NET_RETRY_COUNT=50 CONFIG_NET_RANDOM_ETHADDR=y -CONFIG_AHCI_MVEBU=y CONFIG_LBA48=y CONFIG_SYS_64BIT_LBA=y CONFIG_CLK=y @@ -78,17 +75,15 @@ CONFIG_PHYLIB_10G=y CONFIG_PHY_MARVELL=y CONFIG_PHY_FIXED=y CONFIG_PHY_GIGE=y -CONFIG_E1000=y CONFIG_MVNETA=y CONFIG_MVMDIO=y -CONFIG_PCI=y -CONFIG_PCI_AARDVARK=y CONFIG_PHY=y CONFIG_MVEBU_COMPHY_SUPPORT=y CONFIG_PINCTRL=y CONFIG_PINCTRL_ARMADA_37XX=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +# CONFIG_SCSI is not set CONFIG_MVEBU_A3700_UART=y CONFIG_MVEBU_A3700_SPI=y CONFIG_SYSINFO=y diff --git a/disk/Kconfig b/disk/Kconfig index 359af3b27e..81d8867ed7 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -60,6 +60,7 @@ config DOS_PARTITION config SPL_DOS_PARTITION bool "Enable MS Dos partition table for SPL" depends on SPL + default n if ARCH_MVEBU default n if ARCH_SUNXI default y if DOS_PARTITION select SPL_PARTITIONS @@ -130,6 +131,7 @@ config EFI_PARTITION_ENTRIES_OFF config SPL_EFI_PARTITION bool "Enable EFI GPT partition table for SPL" depends on SPL + default n if ARCH_MVEBU default n if ARCH_SUNXI default y if EFI_PARTITION select SPL_PARTITIONS diff --git a/doc/kwboot.1 b/doc/kwboot.1 index d663bf1f77..0863d197fd 100644 --- a/doc/kwboot.1 +++ b/doc/kwboot.1 @@ -194,4 +194,4 @@ David Purdy <david.c.purdy@gmail.com> .br Pali Rohár <pali@kernel.org> .br -Marek Behún <marek.behun@nic.cz> +Marek Behún <kabel@kernel.org> diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c index 3b767d7060..e75052f383 100644 --- a/drivers/clk/mvebu/armada-37xx-periph.c +++ b/drivers/clk/mvebu/armada-37xx-periph.c @@ -2,7 +2,7 @@ /* * Marvell Armada 37xx SoC Peripheral clocks * - * Marek Behun <marek.behun@nic.cz> + * Marek Behún <kabel@kernel.org> * * Based on Linux driver by: * Gregory CLEMENT <gregory.clement@free-electrons.com> diff --git a/drivers/clk/mvebu/armada-37xx-tbg.c b/drivers/clk/mvebu/armada-37xx-tbg.c index 054aff5e6a..846a73cd6b 100644 --- a/drivers/clk/mvebu/armada-37xx-tbg.c +++ b/drivers/clk/mvebu/armada-37xx-tbg.c @@ -2,7 +2,7 @@ /* * Marvell Armada 37xx SoC Time Base Generator clocks * - * Marek Behun <marek.behun@nic.cz> + * Marek Behún <kabel@kernel.org> * * Based on Linux driver by: * Gregory CLEMENT <gregory.clement@free-electrons.com> diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c index 81ecb5b617..e7c6be593d 100644 --- a/drivers/misc/atsha204a-i2c.c +++ b/drivers/misc/atsha204a-i2c.c @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com * 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 6ff00a7cbd..6e9fcf5751 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -45,6 +45,7 @@ config DM_MMC config SPL_DM_MMC bool "Enable MMC controllers using Driver Model in SPL" depends on SPL_DM && DM_MMC + default n if ARCH_MVEBU && !MVEBU_SPL_BOOT_DEVICE_MMC default y help This enables the MultiMediaCard (MMC) uclass which supports MMC and diff --git a/drivers/rtc/armada38x.c b/drivers/rtc/armada38x.c index 2af64e3912..d0fe5dd7a8 100644 --- a/drivers/rtc/armada38x.c +++ b/drivers/rtc/armada38x.c @@ -2,7 +2,7 @@ /* * RTC driver for the Armada 38x Marvell SoCs * - * Copyright (C) 2021 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2021 Marek Behún <kabel@kernel.org> * * Based on Linux' driver by Gregory Clement and Marvell */ diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 86804166de..fd13cf31b5 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -50,6 +50,7 @@ config DM_USB config SPL_DM_USB bool "Enable driver model for USB host most in SPL" depends on SPL_DM && DM_USB + default n if ARCH_MVEBU default y config DM_USB_GADGET diff --git a/drivers/watchdog/armada-37xx-wdt.c b/drivers/watchdog/armada-37xx-wdt.c index bacebbc792..e09f5ac9e3 100644 --- a/drivers/watchdog/armada-37xx-wdt.c +++ b/drivers/watchdog/armada-37xx-wdt.c @@ -2,7 +2,7 @@ /* * Marvell Armada 37xx SoC Watchdog Driver * - * Marek Behun <marek.behun@nic.cz> + * Marek Behún <kabel@kernel.org> */ #include <common.h> diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index c30ed82217..127766df58 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -5,7 +5,7 @@ * * Authors: Tomas Hlavacek <tmshlvck@gmail.com> * Sylver Bruneau <sylver.bruneau@googlemail.com> - * Marek Behun <marek.behun@nic.cz> + * Marek Behún <kabel@kernel.org> * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index fc074c84d2..31b426d572 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -# 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz +# 2017 Marek Behún, CZ.NIC, kabel@kernel.org obj-y := btrfs.o compression.o ctree.o dev.o dir-item.o \ extent-io.o inode.o subvolume.o crypto/hash.o disk-io.o \ diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c index 741c6e20f5..4cdbbbe3d0 100644 --- a/fs/btrfs/btrfs.c +++ b/fs/btrfs/btrfs.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <config.h> diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index a52587e063..2bc2f0fd6d 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __BTRFS_BTRFS_H__ diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 7adfbb04a7..c69524d38e 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include "btrfs.h" diff --git a/fs/btrfs/conv-funcs.h b/fs/btrfs/conv-funcs.h index 30791cd628..0a7af9dc87 100644 --- a/fs/btrfs/conv-funcs.h +++ b/fs/btrfs/conv-funcs.h @@ -2,7 +2,7 @@ /* * Functions to convert BTRFS structures from disk to CPU endianness and back. * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __BTRFS_CONV_FUNCS_H__ diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 5ffced9160..8e932adc42 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <linux/kernel.h> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 55112318a3..ffd095ffdd 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3,7 +3,7 @@ * From linux/fs/btrfs/ctree.h * Copyright (C) 2007,2008 Oracle. All rights reserved. * - * Modified in 2017 by Marek Behun, CZ.NIC, marek.behun@nic.cz + * Modified in 2017 by Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __BTRFS_CTREE_H__ diff --git a/fs/btrfs/dev.c b/fs/btrfs/dev.c index 1e5b83235a..cb3b9713a5 100644 --- a/fs/btrfs/dev.c +++ b/fs/btrfs/dev.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <common.h> diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index aab197a6d5..5f81d6414f 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include "btrfs.h" diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c index 774e29eb60..f4d56a084b 100644 --- a/fs/btrfs/extent-io.c +++ b/fs/btrfs/extent-io.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <linux/kernel.h> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0173d30cd8..40025662f2 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <linux/kernel.h> diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c index 2815673bcd..d446e7a2c4 100644 --- a/fs/btrfs/subvolume.c +++ b/fs/btrfs/subvolume.c @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #include <malloc.h> diff --git a/fs/fs_internal.c b/fs/fs_internal.c index bfc35c996c..ae1cb8584c 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * 2017 by Marek Behun <marek.behun@nic.cz> + * 2017 by Marek Behún <kabel@kernel.org> * * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c */ diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h index 39fc0e9ca7..c35f5992e2 100644 --- a/include/atsha204a-i2c.h +++ b/include/atsha204a-i2c.h @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com * 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as diff --git a/include/btrfs.h b/include/btrfs.h index a7605e1589..2d73add18e 100644 --- a/include/btrfs.h +++ b/include/btrfs.h @@ -2,7 +2,7 @@ /* * BTRFS filesystem implementation for U-Boot * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __U_BOOT_BTRFS_H__ diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 51f7e16ece..6d3cb99b2d 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -32,13 +32,50 @@ */ #define DEFAULT_ENV_IS_RW /* required for configuring default fdtfile= */ +#ifdef CONFIG_MMC +#define BOOT_TARGET_DEVICES_MMC(func, i) func(MMC, mmc, i) +#else +#define BOOT_TARGET_DEVICES_MMC(func, i) +#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 + +#ifdef CONFIG_NVME +#define BOOT_TARGET_DEVICES_NVME(func) func(NVME, nvme, 0) +#else +#define BOOT_TARGET_DEVICES_NVME(func) +#endif + +#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE) +#define BOOT_TARGET_DEVICES_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_DEVICES_PXE(func) +#endif + +#ifdef CONFIG_CMD_DHCP +#define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DEVICES_DHCP(func) +#endif + #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) \ - func(USB, usb, 0) \ - func(SCSI, scsi, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_DEVICES_MMC(func, 1) \ + BOOT_TARGET_DEVICES_MMC(func, 0) \ + BOOT_TARGET_DEVICES_USB(func) \ + BOOT_TARGET_DEVICES_NVME(func) \ + BOOT_TARGET_DEVICES_SCSI(func) \ + BOOT_TARGET_DEVICES_PXE(func) \ + BOOT_TARGET_DEVICES_DHCP(func) #include <config_distro_bootcmd.h> diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 401627a47a..b8ff705ac9 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2018 Marek Behún <kabel@kernel.org> * * Based on mvebu_armada-37xx.h by Stefan Roese <sr@denx.de> */ diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h index 9013d9a693..52de4cdc78 100644 --- a/include/configs/turris_omnia.h +++ b/include/configs/turris_omnia.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright (C) 2017 Marek Behun <marek.behun@nic.cz> + * Copyright (C) 2017 Marek Behún <kabel@kernel.org> * Copyright (C) 2016 Tomas Hlavacek <tomas.hlavacek@nic.cz> */ diff --git a/include/fs_internal.h b/include/fs_internal.h index 3d4d25da96..07f6bc5ea4 100644 --- a/include/fs_internal.h +++ b/include/fs_internal.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * 2017 by Marek Behun <marek.behun@nic.cz> + * 2017 by Marek Behún <kabel@kernel.org> * * Derived from code in ext4/dev.c, which was based on reiserfs/dev.c */ diff --git a/include/u-boot/variadic-macro.h b/include/u-boot/variadic-macro.h index cb815d0fee..c5fa1b80e3 100644 --- a/include/u-boot/variadic-macro.h +++ b/include/u-boot/variadic-macro.h @@ -2,7 +2,7 @@ /* * Helper for work with variadic macros * - * 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz + * 2017 Marek Behún, CZ.NIC, kabel@kernel.org */ #ifndef __VARIADIC_MACRO_H__ diff --git a/scripts/gen_ll_addressable_symbols.sh b/scripts/gen_ll_addressable_symbols.sh index b8840dd011..d0864804aa 100755 --- a/scripts/gen_ll_addressable_symbols.sh +++ b/scripts/gen_ll_addressable_symbols.sh @@ -1,6 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0+ -# Copyright (C) 2020 Marek Behún <marek.behun@nic.cz> +# Copyright (C) 2020 Marek Behún <kabel@kernel.org> # Generate __ADDRESSABLE(symbol) for every linker list entry symbol, so that LTO # does not optimize these symbols away diff --git a/tools/kwboot.c b/tools/kwboot.c index b697d3b60e..16bcd4d9a7 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -5,7 +5,7 @@ * * (c) 2012 Daniel Stodden <daniel.stodden@gmail.com> * (c) 2021 Pali Rohár <pali@kernel.org> - * (c) 2021 Marek Behún <marek.behun@nic.cz> + * (c) 2021 Marek Behún <kabel@kernel.org> * * References: * - "88F6180, 88F6190, 88F6192, and 88F6281: Integrated Controller: Functional diff --git a/tools/termios_linux.h b/tools/termios_linux.h index e100c8e4eb..45f5c1233c 100644 --- a/tools/termios_linux.h +++ b/tools/termios_linux.h @@ -3,7 +3,7 @@ * termios fuctions to support arbitrary baudrates (on Linux) * * Copyright (c) 2021 Pali Rohár <pali@kernel.org> - * Copyright (c) 2021 Marek Behún <marek.behun@nic.cz> + * Copyright (c) 2021 Marek Behún <kabel@kernel.org> */ #ifndef _TERMIOS_LINUX_H_ |