May 2020 - U-Boot

[PATCH 1/2] sun8i-emac: sun8i-v3s compatibility for sun8i-emac
by Benedikt-Alexander Mokroß 27 May '20

27 May '20

This patch expands the sun8i-emac driver to support the V3s. For this the CLK and RST gates for EMAC and EPHY were added in clk_v3s.c. Signed-off-by: Benedikt-Alexander Mokroß <u-boot(a)bamkrs.de> --- drivers/clk/sunxi/clk_v3s.c | 10 ++++++++-- drivers/net/sun8i_emac.c | 19 +++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/clk/sunxi/clk_v3s.c b/drivers/clk/sunxi/clk_v3s.c index b79446cc4f..bf870f3ded 100644 --- a/drivers/clk/sunxi/clk_v3s.c +++ b/drivers/clk/sunxi/clk_v3s.c @@ -17,6 +17,7 @@ static struct ccu_clk_gate v3s_gates[] = { [CLK_BUS_MMC0] = GATE(0x060, BIT(8)), [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), + [CLK_BUS_EMAC] = GATE(0x060, BIT(17)), [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), [CLK_BUS_OTG] = GATE(0x060, BIT(24)), @@ -24,9 +25,11 @@ static struct ccu_clk_gate v3s_gates[] = { [CLK_BUS_UART1] = GATE(0x06c, BIT(17)), [CLK_BUS_UART2] = GATE(0x06c, BIT(18)), - [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_BUS_EPHY] = GATE(0x070, BIT(0)), - [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), }; static struct ccu_reset v3s_resets[] = { @@ -35,12 +38,15 @@ static struct ccu_reset v3s_resets[] = { [RST_BUS_MMC0] = RESET(0x2c0, BIT(8)), [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), + [RST_BUS_EMAC] = RESET(0x2c0, BIT(17)), [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), [RST_BUS_OTG] = RESET(0x2c0, BIT(24)), [RST_BUS_UART0] = RESET(0x2d8, BIT(16)), [RST_BUS_UART1] = RESET(0x2d8, BIT(17)), [RST_BUS_UART2] = RESET(0x2d8, BIT(18)), + + [RST_BUS_EPHY] = RESET(0x2c8, BIT(2)), }; static const struct ccu_desc v3s_ccu_desc = { diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 99e24c6348..f69b8be957 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -56,9 +56,11 @@ #define RX_TOTAL_BUFSIZE (CONFIG_ETH_BUFSIZE * CONFIG_RX_DESCR_NUM) #define H3_EPHY_DEFAULT_VALUE 0x58000 +#define V3S_EPHY_DEFAULT_VALUE 0x38000 #define H3_EPHY_DEFAULT_MASK GENMASK(31, 15) #define H3_EPHY_ADDR_SHIFT 20 #define REG_PHY_ADDR_MASK GENMASK(4, 0) +#define H3_EPHY_CLK_SEL BIT(18) /* 1: 24MHz, 0: 25MHz */ #define H3_EPHY_LED_POL BIT(17) /* 1: active low, 0: active high */ #define H3_EPHY_SHUTDOWN BIT(16) /* 1: shutdown, 0: power up */ #define H3_EPHY_SELECT BIT(15) /* 1: internal PHY, 0: external PHY */ @@ -111,6 +113,7 @@ enum emac_variant { H3_EMAC, A64_EMAC, R40_GMAC, + V3S_EMAC, }; struct emac_dma_desc { @@ -278,10 +281,11 @@ static int sun8i_emac_set_syscon_ephy(struct emac_eth_dev *priv, u32 *reg) * needs to be configured and powered up before use */ *reg &= ~H3_EPHY_DEFAULT_MASK; - *reg |= H3_EPHY_DEFAULT_VALUE; + *reg |= ((priv->variant == V3S_EMAC) ? V3S_EPHY_DEFAULT_VALUE : H3_EPHY_DEFAULT_VALUE); *reg |= priv->phyaddr << H3_EPHY_ADDR_SHIFT; *reg &= ~H3_EPHY_SHUTDOWN; *reg |= H3_EPHY_SELECT; + *reg |= H3_EPHY_CLK_SEL; } else /* This is to select External Gigabit PHY on * the boards with H3 SoC. @@ -310,14 +314,14 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata, reg = readl(priv->sysctl_reg + 0x30); - if (priv->variant == H3_EMAC) { + if (priv->variant == H3_EMAC || priv->variant == V3S_EMAC) { ret = sun8i_emac_set_syscon_ephy(priv, &reg); if (ret) return ret; } reg &= ~(SC_ETCS_MASK | SC_EPIT); - if (priv->variant == H3_EMAC || priv->variant == A64_EMAC) + if (priv->variant == H3_EMAC || priv->variant == V3S_EMAC || priv->variant == A64_EMAC) reg &= ~SC_RMII_EN; switch (priv->interface) { @@ -837,7 +841,7 @@ static int sun8i_emac_eth_probe(struct udevice *dev) sun8i_mdio_init(dev->name, dev); priv->bus = miiphy_get_dev_by_name(dev->name); - + return sun8i_phy_init(priv, dev); } @@ -981,7 +985,7 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } - if (priv->variant == H3_EMAC) { + if (priv->variant == H3_EMAC || priv->variant == V3S_EMAC) { ret = sun8i_get_ephy_nodes(priv); if (ret) return ret; @@ -1025,13 +1029,16 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) } static const struct udevice_id sun8i_emac_eth_ids[] = { - {.compatible = "allwinner,sun8i-h3-emac", .data = (uintptr_t)H3_EMAC }, + {.compatible = "allwinner,sun8i-h3-emac", + .data = (uintptr_t)H3_EMAC }, {.compatible = "allwinner,sun50i-a64-emac", .data = (uintptr_t)A64_EMAC }, {.compatible = "allwinner,sun8i-a83t-emac", .data = (uintptr_t)A83T_EMAC }, {.compatible = "allwinner,sun8i-r40-gmac", .data = (uintptr_t)R40_GMAC }, + {.compatible = "allwinner,sun8i-v3s-emac", + .data = (uintptr_t)V3S_EMAC }, { } }; -- 2.20.1

1 0

[PATCH 0/2] sun8i-emac: sun8i-v3s compatibility for sun8i-emac
by Benedikt-Alexander Mokroß 27 May '20

27 May '20

The V3s shares nearly the same mac and phy to the H3. Therefore, the sun8i-emac driver which already supports the H3 can be extended to support the V3s with some small adjustments. For this the CLK and RST gates for EMAC and EPHY were added and the sun8i-emac driver was extended to accept the V3s in the first patch. The second (optional) patch adds the sun8i-v3s-emac node to sun8i-v3s.dtsi. Benedikt-Alexander Mokroß (2): sun8i-emac: sun8i-v3s compatibility for sun8i-emac sun8i-emac: Added sun8i-v3s-emac example to sun8i-v3s.dtsi arch/arm/dts/sun8i-v3s.dtsi | 48 +++++++++++++++++++++++++++++++++++++ drivers/clk/sunxi/clk_v3s.c | 10 ++++++-- drivers/net/sun8i_emac.c | 19 ++++++++++----- 3 files changed, 69 insertions(+), 8 deletions(-) -- 2.20.1

1 0

8e35bb07eb mkimage: Support automatic creating of a FIT without a .its
by Wolfgang Denk 27 May '20

27 May '20

Hi Simon, your commit 8e35bb07eb (2016-03-14) "mkimage: Support automatic creating of a FIT without a .its" added the "-f auto" option to mkimage. While convenient in many situation, I had to notice that with "-f auto" there is no checksum information included with any of the blobs stored in the FIT image. I guess the rationale was that the primary use case for this was to generate combinations of a U-Boot image with several device tree blobs to be used / selected by the SPL, as one can see for example in scripts/Makefile.spl : MKIMAGEFLAGS_$(SPL_BIN).multidtb.fit = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -n "Multi DTB fit image for $(SPL_BIN)" -E \ $(patsubst %,-b %,$(SHRUNK_ARCH_DTB)) And - at least at that time - most implementations of the SPL did not need/want checksum verification. However I'm asking myself if this is not an unfortunate choice. It is trivial for a not-checksum-enabled SPL to ignore any checksum in the image, but not the other way round: if there is no checksum in the images, the SPL will never be able to verify one. Would it not be a more reasonable default for operation unter the "-f auto" flag to enable at least simple checksumming, say by auto-adding something like hash-1 { algo = "crc32"; }; to the generated descriptions? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "It is better to have tried and failed than to have failed to try, but the result's the same." - Mike Dennison

2 1

[PATCH 0/3] x86: Correct SPI memory-mapping query
by Simon Glass 27 May '20

27 May '20

This little series makes the SPI memory-mapping query work on all current x86 boards where possible, returning an error code (rather than hanging) when it fails. It replaces the previous patch at [1]. Unfortunately it is quite a bit more complicated. This fixes booting on link and samus. [1] http://patchwork.ozlabs.org/project/uboot/patch/20200324074524.1.Ibc9c511db… Simon Glass (3): x86: spi: Add a way to access the SPI mapping via registers x86: spi: Rewrite logic for obtaining the SPI memory map x86: spl: Print the error on SPL failure arch/x86/cpu/intel_common/fast_spi.c | 19 +++-- arch/x86/include/asm/fast_spi.h | 19 +++++ arch/x86/lib/spl.c | 4 +- drivers/spi/ich.c | 103 +++++++++++++++++++++++---- 4 files changed, 123 insertions(+), 22 deletions(-) -- 2.26.2.761.g0e0b3e54be-goog

2 5

[PATCH 00/14] spi: dm-conversion (part1)
by Jagan Teki 27 May '20

27 May '20

This series dropped nondm code from omap3 and fsl_dspi drivers. Few omap boards are removed since they still in nondm with no OF_CONTROL. So removed the same since the dm conversion deadline expired few months ago. Travis-CI: https://travis-ci.org/github/openedev/u-boot-amarula/builds/691404323 Any inputs? Jagan. Jagan Teki (14): spi: fsl_dspi: Drop nondm code configs: igep00x0: Enable DM_SPI compulab: Drop cm_t54 compulab: Drop cm_t54 Overo: Drop omap3 overo Pandora: Drop omap3 pandora logicpd: Drop omap3 zoom1 quipos: Drop omap3 cairo gumstix: Drop duovero ti: Drop panda board ti: Drop sdp4430 board ti: Drop omap5 uevm spi: omap3: Drop nondm code doc: driver-model: Update SPI migration status arch/arm/mach-omap2/omap3/Kconfig | 42 -- arch/arm/mach-omap2/omap4/Kconfig | 12 - arch/arm/mach-omap2/omap5/Kconfig | 8 - board/compulab/cm_t35/Kconfig | 12 - board/compulab/cm_t35/MAINTAINERS | 6 - board/compulab/cm_t35/Makefile | 8 - board/compulab/cm_t35/cm_t35.c | 513 ----------------------- board/compulab/cm_t54/Kconfig | 12 - board/compulab/cm_t54/MAINTAINERS | 6 - board/compulab/cm_t54/Makefile | 8 - board/compulab/cm_t54/cm_t54.c | 261 ------------ board/compulab/cm_t54/mux.c | 94 ----- board/compulab/cm_t54/spl.c | 65 --- board/gumstix/duovero/Kconfig | 12 - board/gumstix/duovero/MAINTAINERS | 6 - board/gumstix/duovero/Makefile | 6 - board/gumstix/duovero/duovero.c | 273 ------------ board/gumstix/duovero/duovero_mux_data.h | 198 --------- board/logicpd/zoom1/Kconfig | 12 - board/logicpd/zoom1/MAINTAINERS | 6 - board/logicpd/zoom1/Makefile | 6 - board/logicpd/zoom1/config.mk | 14 - board/logicpd/zoom1/zoom1.c | 148 ------- board/logicpd/zoom1/zoom1.h | 122 ------ board/overo/Kconfig | 9 - board/overo/MAINTAINERS | 6 - board/overo/Makefile | 10 - board/overo/common.c | 368 ---------------- board/overo/overo.c | 411 ------------------ board/overo/overo.h | 169 -------- board/overo/spl.c | 61 --- board/pandora/Kconfig | 9 - board/pandora/MAINTAINERS | 6 - board/pandora/Makefile | 6 - board/pandora/pandora.c | 149 ------- board/pandora/pandora.h | 391 ----------------- board/quipos/cairo/Kconfig | 12 - board/quipos/cairo/MAINTAINERS | 6 - board/quipos/cairo/Makefile | 6 - board/quipos/cairo/cairo.c | 98 ----- board/quipos/cairo/cairo.h | 318 -------------- board/ti/omap5_uevm/Kconfig | 12 - board/ti/omap5_uevm/MAINTAINERS | 6 - board/ti/omap5_uevm/Makefile | 6 - board/ti/omap5_uevm/README | 25 -- board/ti/omap5_uevm/evm.c | 283 ------------- board/ti/omap5_uevm/mux_data.h | 57 --- board/ti/panda/Kconfig | 12 - board/ti/panda/MAINTAINERS | 6 - board/ti/panda/Makefile | 6 - board/ti/panda/panda.c | 346 --------------- board/ti/panda/panda_mux_data.h | 86 ---- board/ti/sdp4430/Kconfig | 15 - board/ti/sdp4430/MAINTAINERS | 6 - board/ti/sdp4430/Makefile | 10 - board/ti/sdp4430/cmd_bat.c | 41 -- board/ti/sdp4430/sdp.c | 100 ----- board/ti/sdp4430/sdp4430_mux_data.h | 67 --- configs/cairo_defconfig | 40 -- configs/cm_t35_defconfig | 65 --- configs/cm_t54_defconfig | 53 --- configs/duovero_defconfig | 42 -- configs/igep00x0_defconfig | 1 + configs/omap3_overo_defconfig | 53 --- configs/omap3_pandora_defconfig | 40 -- configs/omap3_zoom1_defconfig | 41 -- configs/omap4_panda_defconfig | 42 -- configs/omap4_sdp4430_defconfig | 42 -- configs/omap5_uevm_defconfig | 55 --- doc/README.omap3 | 16 - doc/driver-model/migration.rst | 2 - drivers/spi/Kconfig | 14 +- drivers/spi/fsl_dspi.c | 132 ------ drivers/spi/omap3_spi.c | 136 ------ include/configs/cm_t35.h | 249 ----------- include/configs/cm_t54.h | 120 ------ include/configs/duovero.h | 36 -- include/configs/omap3_cairo.h | 215 ---------- include/configs/omap3_overo.h | 184 -------- include/configs/omap3_pandora.h | 62 --- include/configs/omap3_zoom1.h | 131 ------ include/configs/omap4_panda.h | 34 -- include/configs/omap4_sdp4430.h | 25 -- include/configs/omap5_uevm.h | 62 --- include/configs/ti_omap4_common.h | 2 - 85 files changed, 8 insertions(+), 6855 deletions(-) delete mode 100644 board/compulab/cm_t35/Kconfig delete mode 100644 board/compulab/cm_t35/MAINTAINERS delete mode 100644 board/compulab/cm_t35/Makefile delete mode 100644 board/compulab/cm_t35/cm_t35.c delete mode 100644 board/compulab/cm_t54/Kconfig delete mode 100644 board/compulab/cm_t54/MAINTAINERS delete mode 100644 board/compulab/cm_t54/Makefile delete mode 100644 board/compulab/cm_t54/cm_t54.c delete mode 100644 board/compulab/cm_t54/mux.c delete mode 100644 board/compulab/cm_t54/spl.c delete mode 100644 board/gumstix/duovero/Kconfig delete mode 100644 board/gumstix/duovero/MAINTAINERS delete mode 100644 board/gumstix/duovero/Makefile delete mode 100644 board/gumstix/duovero/duovero.c delete mode 100644 board/gumstix/duovero/duovero_mux_data.h delete mode 100644 board/logicpd/zoom1/Kconfig delete mode 100644 board/logicpd/zoom1/MAINTAINERS delete mode 100644 board/logicpd/zoom1/Makefile delete mode 100644 board/logicpd/zoom1/config.mk delete mode 100644 board/logicpd/zoom1/zoom1.c delete mode 100644 board/logicpd/zoom1/zoom1.h delete mode 100644 board/overo/Kconfig delete mode 100644 board/overo/MAINTAINERS delete mode 100644 board/overo/Makefile delete mode 100644 board/overo/common.c delete mode 100644 board/overo/overo.c delete mode 100644 board/overo/overo.h delete mode 100644 board/overo/spl.c delete mode 100644 board/pandora/Kconfig delete mode 100644 board/pandora/MAINTAINERS delete mode 100644 board/pandora/Makefile delete mode 100644 board/pandora/pandora.c delete mode 100644 board/pandora/pandora.h delete mode 100644 board/quipos/cairo/Kconfig delete mode 100644 board/quipos/cairo/MAINTAINERS delete mode 100644 board/quipos/cairo/Makefile delete mode 100644 board/quipos/cairo/cairo.c delete mode 100644 board/quipos/cairo/cairo.h delete mode 100644 board/ti/omap5_uevm/Kconfig delete mode 100644 board/ti/omap5_uevm/MAINTAINERS delete mode 100644 board/ti/omap5_uevm/Makefile delete mode 100644 board/ti/omap5_uevm/README delete mode 100644 board/ti/omap5_uevm/evm.c delete mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 board/ti/panda/Kconfig delete mode 100644 board/ti/panda/MAINTAINERS delete mode 100644 board/ti/panda/Makefile delete mode 100644 board/ti/panda/panda.c delete mode 100644 board/ti/panda/panda_mux_data.h delete mode 100644 board/ti/sdp4430/Kconfig delete mode 100644 board/ti/sdp4430/MAINTAINERS delete mode 100644 board/ti/sdp4430/Makefile delete mode 100644 board/ti/sdp4430/cmd_bat.c delete mode 100644 board/ti/sdp4430/sdp.c delete mode 100644 board/ti/sdp4430/sdp4430_mux_data.h delete mode 100644 configs/cairo_defconfig delete mode 100644 configs/cm_t35_defconfig delete mode 100644 configs/cm_t54_defconfig delete mode 100644 configs/duovero_defconfig delete mode 100644 configs/omap3_overo_defconfig delete mode 100644 configs/omap3_pandora_defconfig delete mode 100644 configs/omap3_zoom1_defconfig delete mode 100644 configs/omap4_panda_defconfig delete mode 100644 configs/omap4_sdp4430_defconfig delete mode 100644 configs/omap5_uevm_defconfig delete mode 100644 include/configs/cm_t35.h delete mode 100644 include/configs/cm_t54.h delete mode 100644 include/configs/duovero.h delete mode 100644 include/configs/omap3_cairo.h delete mode 100644 include/configs/omap3_overo.h delete mode 100644 include/configs/omap3_pandora.h delete mode 100644 include/configs/omap3_zoom1.h delete mode 100644 include/configs/omap4_panda.h delete mode 100644 include/configs/omap4_sdp4430.h delete mode 100644 include/configs/omap5_uevm.h -- 2.25.1

2 12

[PATCH 1/4] x86: coral: Correct some FSP-M settings
by Simon Glass 27 May '20

27 May '20

Some settings were modified slightly in the device-tree conversion. Return these to their original values. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/x86/dts/chromebook_coral.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts index aad12f2c4d..5ee056fc95 100644 --- a/arch/x86/dts/chromebook_coral.dts +++ b/arch/x86/dts/chromebook_coral.dts @@ -517,6 +517,11 @@ 20 23 22 21 18 19 16 17 /* DQB[7:15] pins of LPDDR4 module with offset of 16 */ 25 28 30 31 26 27 24 29>; + + fspm,dimm0-spd-address = <0>; + fspm,dimm1-spd-address = <0>; + fspm,skip-cse-rbp = <1>; + fspm,enable-s3-heci2 = <0>; }; &fsp_s { -- 2.27.0.rc0.183.gde8f92d652-goog

2 8

[PATCH 1/2] riscv: sbi: Remove sbi_spec_version
by Bin Meng 27 May '20

27 May '20

From: Bin Meng <bin.meng(a)windriver.com> U-Boot defaults to use SBI v0.2. Howerver there is a global variable sbi_spec_version that stills refers to v0.1. Since it is not used anywhere, let's remove it. Signed-off-by: Bin Meng <bin.meng(a)windriver.com> --- arch/riscv/include/asm/sbi.h | 2 -- arch/riscv/lib/sbi.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 453cb5c..08e1ac0 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -77,7 +77,6 @@ enum sbi_ext_rfence_fid { #define SBI_FID_REMOTE_SFENCE_VMA_ASID SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID #endif -#define SBI_SPEC_VERSION_DEFAULT 0x1 #define SBI_SPEC_VERSION_MAJOR_SHIFT 24 #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f #define SBI_SPEC_VERSION_MINOR_MASK 0xffffff @@ -90,7 +89,6 @@ enum sbi_ext_rfence_fid { #define SBI_ERR_DENIED -4 #define SBI_ERR_INVALID_ADDRESS -5 -extern unsigned long sbi_spec_version; struct sbiret { long error; long value; diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c index 993597e..f298846 100644 --- a/arch/riscv/lib/sbi.c +++ b/arch/riscv/lib/sbi.c @@ -11,9 +11,6 @@ #include <asm/encoding.h> #include <asm/sbi.h> -/* default SBI version is 0.1 */ -unsigned long sbi_spec_version = SBI_SPEC_VERSION_DEFAULT; - struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4, -- 2.7.4

1 1

[PATCH] arm: mvebu: Convert CRS305-1G-4S board to CRS3xx-98DX3236
by Luka Kovacic 27 May '20

27 May '20

Convert the CRS305-1G-4S board to CRS3xx-98DX3236 to enable easier implementation of new CRS3xx series boards, based on Marvell Prestera 98DX3236. Signed-off-by: Luka Kovacic <luka.kovacic(a)sartura.hr> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Jakov Petrina <jakov.petrina(a)sartura.hr> --- arch/arm/dts/armada-xp-crs305-1g-4s.dts | 103 +--------------- arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 111 ++++++++++++++++++ arch/arm/mach-mvebu/Kconfig | 10 +- board/mikrotik/crs305-1g-4s/MAINTAINERS | 7 -- .../.gitignore | 0 board/mikrotik/crs3xx-98dx3236/MAINTAINERS | 11 ++ .../Makefile | 2 +- .../{crs305-1g-4s => crs3xx-98dx3236}/README | 12 +- .../binary.0 | 0 .../crs3xx-98dx3236.c} | 0 .../kwbimage.cfg.in | 2 +- configs/crs305-1g-4s_defconfig | 44 +++---- .../{crs305-1g-4s.h => crs3xx-98dx3236.h} | 6 +- 13 files changed, 165 insertions(+), 143 deletions(-) create mode 100644 arch/arm/dts/armada-xp-crs305-1g-4s.dtsi delete mode 100644 board/mikrotik/crs305-1g-4s/MAINTAINERS rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/.gitignore (100%) create mode 100644 board/mikrotik/crs3xx-98dx3236/MAINTAINERS rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/Makefile (93%) rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/README (64%) rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/binary.0 (100%) rename board/mikrotik/{crs305-1g-4s/crs305-1g-4s.c => crs3xx-98dx3236/crs3xx-98dx3236.c} (100%) rename board/mikrotik/{crs305-1g-4s => crs3xx-98dx3236}/kwbimage.cfg.in (75%) rename include/configs/{crs305-1g-4s.h => crs3xx-98dx3236.h} (87%) diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dts b/arch/arm/dts/armada-xp-crs305-1g-4s.dts index 1116f5c96c..010b83b542 100644 --- a/arch/arm/dts/armada-xp-crs305-1g-4s.dts +++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dts @@ -1,110 +1,17 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Device Tree file for CRS305-1G-4S board + * Device Tree file for MikroTik CRS305-1G-4S+ board * - * Copyright (C) 2016 Allied Telesis Labs - * - * Based on armada-xp-db.dts - * - * Note: this Device Tree assumes that the bootloader has remapped the - * internal registers to 0xf1000000 (instead of the default - * 0xd0000000). The 0xf1000000 is the default used by the recent, - * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier - * boards were delivered with an older version of the bootloader that - * left internal registers mapped at 0xd0000000. If you are in this - * situation, you should either update your bootloader (preferred - * solution) or the below Device Tree should be adjusted. + * Copyright (C) 2020 Sartura Ltd. + * Author: Luka Kovacic <luka.kovacic(a)sartura.hr> */ -/dts-v1/; -#include "armada-xp-98dx3236.dtsi" -#include "armada-xp-crs305-1g-4s-u-boot.dtsi" +#include "armada-xp-crs305-1g-4s.dtsi" / { - model = "CRS305-1G-4S"; - compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; - - chosen { - stdout-path = "serial0:115200n8"; - bootargs = "console=ttyS0,115200 earlyprintk"; - }; - - aliases { - spi0 = &spi0; - }; - - memory { - device_type = "memory"; - reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ - }; -}; - -&L2 { - arm,parity-enable; - marvell,ecc-enable; -}; - -&devbus_bootcs { - status = "okay"; - - /* Device Bus parameters are required */ - - /* Read parameters */ - devbus,bus-width = <16>; - devbus,turn-off-ps = <60000>; - devbus,badr-skew-ps = <0>; - devbus,acc-first-ps = <124000>; - devbus,acc-next-ps = <248000>; - devbus,rd-setup-ps = <0>; - devbus,rd-hold-ps = <0>; - - /* Write parameters */ - devbus,sync-enable = <0>; - devbus,wr-high-ps = <60000>; - devbus,wr-low-ps = <60000>; - devbus,ale-wr-ps = <60000>; -}; - -&uart0 { - status = "okay"; -}; - -&uart1 { - status = "okay"; -}; - -&i2c0 { - clock-frequency = <100000>; - status = "okay"; -}; - -&usb0 { - status = "okay"; + model = "MikroTik CRS305-1G-4S+"; }; &spi0 { status = "okay"; - - spi-flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "spi-flash", "jedec,spi-nor"; - reg = <0>; /* Chip select 0 */ - spi-max-frequency = <108000000>; - m25p,fast-read; - - partition@u-boot { - reg = <0x00000000 0x00100000>; - label = "u-boot"; - }; - partition@u-boot-env { - reg = <0x00100000 0x00040000>; - label = "u-boot-env"; - }; - partition@unused { - reg = <0x00140000 0x00ec0000>; - label = "unused"; - }; - - }; }; diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi new file mode 100644 index 0000000000..c8839eac94 --- /dev/null +++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Device Tree file for CRS305-1G-4S board + * + * Copyright (C) 2016 Allied Telesis Labs + * Copyright (C) 2020 Sartura Ltd. + * + * Based on armada-xp-db.dts + * + * Note: this Device Tree assumes that the bootloader has remapped the + * internal registers to 0xf1000000 (instead of the default + * 0xd0000000). The 0xf1000000 is the default used by the recent, + * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier + * boards were delivered with an older version of the bootloader that + * left internal registers mapped at 0xd0000000. If you are in this + * situation, you should either update your bootloader (preferred + * solution) or the below Device Tree should be adjusted. + */ + +/dts-v1/; +#include "armada-xp-98dx3236.dtsi" +#include "armada-xp-crs305-1g-4s-u-boot.dtsi" + +/ { + model = "CRS305-1G-4S+"; + compatible = "marvell,armadaxp-98dx3236", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + aliases { + spi0 = &spi0; + }; + + memory { + device_type = "memory"; + reg = <0 0x00000000 0 0x20000000>; /* 512 MB */ + }; +}; + +&L2 { + arm,parity-enable; + marvell,ecc-enable; +}; + +&devbus_bootcs { + status = "okay"; + + /* Device Bus parameters are required */ + + /* Read parameters */ + devbus,bus-width = <16>; + devbus,turn-off-ps = <60000>; + devbus,badr-skew-ps = <0>; + devbus,acc-first-ps = <124000>; + devbus,acc-next-ps = <248000>; + devbus,rd-setup-ps = <0>; + devbus,rd-hold-ps = <0>; + + /* Write parameters */ + devbus,sync-enable = <0>; + devbus,wr-high-ps = <60000>; + devbus,wr-low-ps = <60000>; + devbus,ale-wr-ps = <60000>; +}; + +&uart0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; + +&i2c0 { + clock-frequency = <100000>; + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&spi0 { + status = "okay"; + + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-flash", "jedec,spi-nor"; + reg = <0>; /* Chip select 0 */ + spi-max-frequency = <108000000>; + m25p,fast-read; + + partition@u-boot { + reg = <0x00000000 0x00080000>; + label = "u-boot"; + }; + partition@u-boot-env { + reg = <0x00080000 0x00010000>; + label = "u-boot-env"; + }; + partition@firmware { + reg = <0x00090000 0x00f70000>; + label = "firmware"; + }; + + }; +}; diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 161dee937f..50382e8069 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -165,8 +165,8 @@ config TARGET_DB_XC3_24G4XG bool "Support DB-XC3-24G4XG" select 98DX3336 -config TARGET_CRS305_1G_4S - bool "Support CRS305-1G-4S" +config TARGET_CRS3XX_98DX3236 + bool "Support CRS3XX-98DX3236" select 98DX3236 endchoice @@ -188,7 +188,7 @@ config SYS_BOARD default "a38x" if TARGET_CONTROLCENTERDC default "x530" if TARGET_X530 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG - default "crs305-1g-4s" if TARGET_CRS305_1G_4S + default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 config SYS_CONFIG_NAME default "clearfog" if TARGET_CLEARFOG @@ -207,7 +207,7 @@ config SYS_CONFIG_NAME default "controlcenterdc" if TARGET_CONTROLCENTERDC default "x530" if TARGET_X530 default "db-xc3-24g4xg" if TARGET_DB_XC3_24G4XG - default "crs305-1g-4s" if TARGET_CRS305_1G_4S + default "crs3xx-98dx3236" if TARGET_CRS3XX_98DX3236 config SYS_VENDOR default "Marvell" if TARGET_DB_MV784MP_GP @@ -225,7 +225,7 @@ config SYS_VENDOR default "CZ.NIC" if TARGET_TURRIS_MOX default "gdsys" if TARGET_CONTROLCENTERDC default "alliedtelesis" if TARGET_X530 - default "mikrotik" if TARGET_CRS305_1G_4S + default "mikrotik" if TARGET_CRS3XX_98DX3236 config SYS_SOC default "mvebu" diff --git a/board/mikrotik/crs305-1g-4s/MAINTAINERS b/board/mikrotik/crs305-1g-4s/MAINTAINERS deleted file mode 100644 index 3823489600..0000000000 --- a/board/mikrotik/crs305-1g-4s/MAINTAINERS +++ /dev/null @@ -1,7 +0,0 @@ -CRS305-1G-4S BOARD -M: Luka Kovacic <me(a)lukakovacic.xyz> -S: Maintained -F: board/mikrotik/crs305-1g-4s/ -F: include/configs/crs305-1g-4s.h -F: configs/crs305-1g-4s_defconfig -F: arch/arm/dts/armada-xp-crs305-1g-4s.dts diff --git a/board/mikrotik/crs305-1g-4s/.gitignore b/board/mikrotik/crs3xx-98dx3236/.gitignore similarity index 100% rename from board/mikrotik/crs305-1g-4s/.gitignore rename to board/mikrotik/crs3xx-98dx3236/.gitignore diff --git a/board/mikrotik/crs3xx-98dx3236/MAINTAINERS b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS new file mode 100644 index 0000000000..127e0eac60 --- /dev/null +++ b/board/mikrotik/crs3xx-98dx3236/MAINTAINERS @@ -0,0 +1,11 @@ +CRS3XX-98DX3236 BOARD +M: Luka Kovacic <luka.kovacic(a)sartura.hr> +S: Maintained +F: board/mikrotik/crs3xx-98dx3236/ +F: include/configs/crs3xx-98dx3236.h + +CRS305-1G-4S BOARD +M: Luka Kovacic <luka.kovacic(a)sartura.hr> +S: Maintained +F: configs/crs305-1g-4s_defconfig +F: arch/arm/dts/armada-xp-crs305-1g-4s.dts diff --git a/board/mikrotik/crs305-1g-4s/Makefile b/board/mikrotik/crs3xx-98dx3236/Makefile similarity index 93% rename from board/mikrotik/crs305-1g-4s/Makefile rename to board/mikrotik/crs3xx-98dx3236/Makefile index c03f534e48..0b2930d3e2 100644 --- a/board/mikrotik/crs305-1g-4s/Makefile +++ b/board/mikrotik/crs3xx-98dx3236/Makefile @@ -2,7 +2,7 @@ # # Copyright (C) 2015 Stefan Roese <sr(a)denx.de> -obj-y := crs305-1g-4s.o +obj-y := crs3xx-98dx3236.o extra-y := kwbimage.cfg quiet_cmd_sed = SED $@ diff --git a/board/mikrotik/crs305-1g-4s/README b/board/mikrotik/crs3xx-98dx3236/README similarity index 64% rename from board/mikrotik/crs305-1g-4s/README rename to board/mikrotik/crs3xx-98dx3236/README index f420aabfbf..952f774ab7 100644 --- a/board/mikrotik/crs305-1g-4s/README +++ b/board/mikrotik/crs3xx-98dx3236/README @@ -1,13 +1,13 @@ -MikroTik CRS305-1G-4S+IN +MikroTik CRS3XX-98DX3236 ======================== -CRS305-1G-4S+IN is a 4x SFP+ switch with a Gigabit Ethernet port for management. -Specifications: +CRS3XX-98DX3236 is a U-Boot port that supports a series of MikroTik switches +based on the Marvell Prestera 98DX3236 switch with an integrated CPU. + +Common specifications: - Marvell Prestera 98DX3236 switch with an integrated ARMv7 CPU - 512 MB DDR3 RAM - UART @ 115200bps - - 4x SFP+ - - Gigabit Ethernet (AR8033) - 16 MB SPI flash (Winbond 25Q128JVSM) Currently supported hardware: @@ -15,7 +15,7 @@ Currently supported hardware: - SPI boot, environment and load kernel Planned: - - Gigabit Ethernet support + - Gigabit Ethernet support (internal CPU <-> switch fabric connection) Getting binary.0 ================ diff --git a/board/mikrotik/crs305-1g-4s/binary.0 b/board/mikrotik/crs3xx-98dx3236/binary.0 similarity index 100% rename from board/mikrotik/crs305-1g-4s/binary.0 rename to board/mikrotik/crs3xx-98dx3236/binary.0 diff --git a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c b/board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c similarity index 100% rename from board/mikrotik/crs305-1g-4s/crs305-1g-4s.c rename to board/mikrotik/crs3xx-98dx3236/crs3xx-98dx3236.c diff --git a/board/mikrotik/crs305-1g-4s/kwbimage.cfg.in b/board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in similarity index 75% rename from board/mikrotik/crs305-1g-4s/kwbimage.cfg.in rename to board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in index 2dbbbd0246..9a58b33a6f 100644 --- a/board/mikrotik/crs305-1g-4s/kwbimage.cfg.in +++ b/board/mikrotik/crs3xx-98dx3236/kwbimage.cfg.in @@ -9,4 +9,4 @@ VERSION 1 BOOT_FROM spi # Binary Header (bin_hdr) with DDR3 training code -BINARY board/mikrotik/crs305-1g-4s/binary.0 0000005b 00000068 +BINARY board/mikrotik/crs3xx-98dx3236/binary.0 0000005b 00000068 diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index 257dbc16e9..27043bf69a 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -3,46 +3,46 @@ CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_CRS305_1G_4S=y +CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_SECT_SIZE=0x40000 -CONFIG_ENV_OFFSET=0x100000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_ENV_OFFSET=0x80000 +# CONFIG_EFI_LOADER is not set CONFIG_BUILD_TARGET="u-boot.kwb" CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" +CONFIG_AUTOBOOT_STOP_STR="s" +CONFIG_AUTOBOOT_KEYED_CTRLC=y CONFIG_CMD_BOOTZ=y -CONFIG_CMD_MEMTEST=y -CONFIG_SYS_ALT_MEMTEST=y # CONFIG_CMD_FLASH is not set -CONFIG_CMD_I2C=y +# CONFIG_CMD_I2C is not set CONFIG_CMD_SPI=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_TIME=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_UBI=y +# CONFIG_CMD_UBI is not set +CONFIG_CMD_MTD=y +CONFIG_CMD_MTDPARTS=y CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_BLK=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_MVTWSI=y +# CONFIG_DM_I2C is not set +# CONFIG_SYS_I2C_MVTWSI is not set # CONFIG_MMC is not set CONFIG_MTD=y +CONFIG_MTD_PARTITIONS=y CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_MTD=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y +CONFIG_FIT_VERBOSE=y +CONFIG_FIT_BEST_MATCH=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y diff --git a/include/configs/crs305-1g-4s.h b/include/configs/crs3xx-98dx3236.h similarity index 87% rename from include/configs/crs305-1g-4s.h rename to include/configs/crs3xx-98dx3236.h index 617c8af83a..e2ba7b8126 100644 --- a/include/configs/crs305-1g-4s.h +++ b/include/configs/crs3xx-98dx3236.h @@ -3,8 +3,8 @@ * Copyright (C) 2014 Stefan Roese <sr(a)denx.de> */ -#ifndef _CONFIG_CRS305_1G_4S_H -#define _CONFIG_CRS305_1G_4S_H +#ifndef _CONFIG_CRS3XX_98DX3236_H +#define _CONFIG_CRS3XX_98DX3236_H /* * High Level Configuration Options (easy to change) @@ -32,4 +32,4 @@ #undef CONFIG_SYS_MAXARGS #define CONFIG_SYS_MAXARGS 96 -#endif /* _CONFIG_CRS305_1G_4S_H */ +#endif /* _CONFIG_CRS3XX_98DX3236_H */ -- 2.24.1

2 5

[PATCH] arch: arm: uDPU: fix PHY mode definition to sgmii-2500
by Jakov Petrina 27 May '20

27 May '20

Commit f49ac7e1c4 switched the default PHY speed to 3.125Gbit to resolve issues with SFP modules. However, U-Boot does not have a "2500base-x" phy-mode. Resolve this by using "sgmii-2500" instead. Signed-off-by: Jakov Petrina <jakov.petrina(a)sartura.hr> Signed-off-by: Vladimir Vid <vladimir.vid(a)sartura.hr> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Stefan Roese <sr(a)denx.de> --- arch/arm/dts/armada-3720-uDPU.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts index 07c7b91175..7f4b8222f4 100644 --- a/arch/arm/dts/armada-3720-uDPU.dts +++ b/arch/arm/dts/armada-3720-uDPU.dts @@ -125,14 +125,14 @@ &eth0 { pinctrl-0 = <&pcie_pins>; status = "okay"; - phy-mode = "2500base-x"; + phy-mode = "sgmii-2500"; managed = "in-band-status"; phy = <&ethphy0>; }; &eth1 { status = "okay"; - phy-mode = "2500base-x"; + phy-mode = "sgmii-2500"; managed = "in-band-status"; phy = <&ethphy1>; }; -- 2.26.2

2 3

[PATCH v2 0/2] Fix boot from SPI flash on Synology DS414
by Ezra Buehler 27 May '20

27 May '20

Booting from SPI flash on Synology DS414 (or DS214+) devices has been broken for quite some time now. As far as I can tell this is due to following commits: 3c265bbe4d rm: sync armada-xp dts files from Linux 5.0 7ddf8cfb0d kwbimage: Rename CONFIG_SYS_SPI_U_BOOT_OFFS to CONFIG_SYS_U_BOOT_OFFS Changes for v2: - Moved U-Boot-specific properties to *-u-boot.dtsi file - Tweaked commit message Ezra Buehler (2): arm: mvebu: ds414: add u-boot,dm-pre-reloc to spi0 arm: mvebu: ds414: define CONFIG_SYS_U_BOOT_OFFS arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi | 9 +++++++++ include/configs/ds414.h | 3 +++ 2 files changed, 12 insertions(+) create mode 100644 arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi -- 2.26.2

3 6