April 2020 - U-Boot

[RESEND PATCH v5 0/6] RISC-V DT related fixes for reserved memory & UEFI
by Atish Patra 19 Apr '20

19 Apr '20

This series adds few DT related fixes required for Linux EFI stub to work on RISC-V. Patch 1 adds the boot hartid property under /chosen node. The related discussion can be found here. https://patchwork.ozlabs.org/patch/1233664/ https://lists.denx.de/pipermail/u-boot/2020-March/402085.html Patch 2 fixes a generic issue in fdtdec related to reserved memory node. Patch 3,4,5 provide one of the option to update reserved-memory node for next stage. It depends on master OpenSBI branch. The other options are SBI extension and trap/emulate on PMP csr access. The detaild discussion can be found here. https://github.com/riscv/riscv-sbi-doc/pull/37 Patch 1 & 2 can be applied independently from 3 and 4. I want to keep all the patches together to provide a holistic view of changes required for RISC-V UEFI. Changes v4->v5: 1. Added comments for new functions. Changes v3->v4: 1. Dropped generic efi fix patch as it is already merged. 2. Moved all the fdt fixups to a common file. 3. Addressed few nit comments. Changes from v2->v3: 1. Update the DT meant for OS if it is different from the one used by U-Boot 2. Use different FDT api to obtain "reg" address & size to honor the cell count. Changes from v1->v2: 1. Fix the issue if chosen node is not present. Changes from previous version: 1. Renamed the DT node property to "boot-hartid" from "efi-boot-hartid". 2. Changed the property type to u32 instead of u64 for RV32 compatibility. Atish Patra (6): riscv: Add boot hartid to Device tree fdtdec: Fix boundary check riscv: Provide a mechanism to fix DT for reserved memory riscv: Setup reserved-memory node for FU540 riscv: Copy the reserved-memory nodes to final DT riscv: Move all fdt fixups together arch/riscv/cpu/start.S | 1 + arch/riscv/include/asm/global_data.h | 1 + arch/riscv/include/asm/u-boot-riscv.h | 2 + arch/riscv/lib/Makefile | 1 + arch/riscv/lib/asm-offsets.c | 1 + arch/riscv/lib/bootm.c | 5 - arch/riscv/lib/fdt_fixup.c | 150 ++++++++++++++++++++++++++ configs/sifive_fu540_defconfig | 1 + lib/fdtdec.c | 3 +- 9 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 arch/riscv/lib/fdt_fixup.c -- 2.25.1

3 11

[PATCH 0/4] imx: Fixes for i.MX53 based HSC|DDC boards
by Lukasz Majewski 19 Apr '20

19 Apr '20

This short patch series fixes i.MX53 based boards from K+P, namely HSC and DDC. It also requires a USB fix patch: "usb: ehci-mx5: Fix bus enumeration for DM case" https://patchwork.ozlabs.org/patch/1119811/ Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/654970410 Applied on top of SHA1: 133276f14acfbad4268acd19a70d3cda0a60b5e3 Lukasz Majewski (4): config: cosmetic: Cleanup of imx53 - HSC and DDC config file dts: imx: Add fixed-link property to HSC and DDC (imx53) devices config: imx: Enable CONFIG_PHY_FIXED on HSC and DDC i.MX53 boards imx: pmic: Set proper pmic name for iMX53 HSC|DDC boards arch/arm/dts/imx53-kp-u-boot.dtsi | 7 +++++++ board/k+p/kp_imx53/kp_imx53.c | 2 +- configs/kp_imx53_defconfig | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) -- 2.20.1

3 8

[PATCH v3 16/19] ARM: dts: imxrt1050: allow this dtsi file to be compiled in Linux
by Giulio Benetti 19 Apr '20

19 Apr '20

Linux doesn't provide skeleton.dtsi file so let's remove its include and provide #address-cells/size-cells = <1> that were defined in skeleton.dtsi before. Signed-off-by: Giulio Benetti <giulio.benetti(a)benettiengineering.com> --- arch/arm/dts/imxrt1050.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imxrt1050.dtsi b/arch/arm/dts/imxrt1050.dtsi index 0123f4788c..7cfe5f5c95 100644 --- a/arch/arm/dts/imxrt1050.dtsi +++ b/arch/arm/dts/imxrt1050.dtsi @@ -4,7 +4,6 @@ * Author(s): Giulio Benetti <giulio.benetti(a)benettiengineering.com> */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/imxrt1050-clock.h> @@ -12,6 +11,9 @@ #include <dt-bindings/memory/imxrt-sdram.h> / { + #address-cells = <1>; + #size-cells = <1>; + aliases { display0 = &lcdif; gpio0 = &gpio1; -- 2.20.1

3 12

[PATCH v3 00/19] i.MXRT1050 add LCDIF support
by Giulio Benetti 19 Apr '20

19 Apr '20

This patchset add support for LCDIF on i.MXRT1050 evk. This requires PLL5 to be setup, mxsfb needs to use display_timing to retrieve if Lcd has inverted PIXCLOCK from dts. With this patchset applied we temporary loose DCache support until it will get implemented, since a function in mxsfb.c is needed for setting cache behaviour. Anyway this way Lcd will show the console same way as serial does. Also I've moved private sunxi_ctfb_mode_to_display_timing() to videomodes since I need it for mxfsb.c too, then having a unified function to convert from ctfb_mode to display_timing. Changes: V1->V2: * moved hard-coded LCDIF's parent clock from clk-imxrt1050.c to imxrt1050-evk.dts * reworded some commit log V2->V3: * added comment to describe what is a ctfb in videomodes Giulio Benetti (19): clk: imx: pllv3: add enable_bit clk: imx: clk-imxrt1050: fix typo in clock name "video:" clk: imx: clk-imxrt1050: setup PLL5 for video in non-SPL clk: imx: clk-imxrt1050: add set_parent() callback videomodes: add helper function to convert from ctfb to display_timing sunxi: display: use common video_ctfb_mode_to_display_timing() video: mxsfb: add support for DM CLK video: mxsfb: add support for i.MXRT video: mxsfb: refactor for using display_timings video: mxsfb: enable setting HSYNC negative polarity video: mxsfb: enable setting VSYNC negative polarity video: mxsfb: enable setting PIXDATA on negative edge video: mxsfb: enable setting ENABLE negative polarity imxrt1050_evk: add 16bpp video support if video layer enabled ARM: dts: i.mxrt1050: add lcdif node ARM: dts: imxrt1050: allow this dtsi file to be compiled in Linux arch: arm: dts: imxrt1050-evk: add lcdif node configs: imxrt1050-evk: enable video support/console configs: imxrt1050-evk: temporary disable DCACHE arch/arm/dts/imxrt1050-evk.dts | 60 ++++++++++++++ arch/arm/dts/imxrt1050.dtsi | 14 +++- arch/arm/include/asm/arch-imxrt/imx-regs.h | 6 ++ arch/arm/include/asm/mach-imx/regs-lcdif.h | 6 +- configs/imxrt1050-evk_defconfig | 6 ++ drivers/clk/imx/clk-imxrt1050.c | 30 ++++++- drivers/clk/imx/clk-pllv3.c | 9 +++ drivers/video/mxsfb.c | 94 ++++++++++++++-------- drivers/video/sunxi/sunxi_display.c | 33 +------- drivers/video/videomodes.c | 29 +++++++ drivers/video/videomodes.h | 11 +++ include/configs/imxrt1050-evk.h | 15 ++++ 12 files changed, 242 insertions(+), 71 deletions(-) -- 2.20.1

4 44

[PATCH 0/5] i.MXRT1020 add basic support
by Giulio Benetti 19 Apr '20

19 Apr '20

Add Soc i.MXRT1020 to i.MXRT family and its evk support. This Soc has many in common with i.MXRT1050 except clock init and pins listing. Giulio Benetti (5): clk: imx: add i.IMXRT1020 clk driver Add i.MXRT1020 support ARM: dts: imxrt1020: add dtsi file dt-bindings: pinctrl: add i.MXRT1020 pins definition Add support for i.MXRT1020-EVK board arch/arm/dts/Makefile | 3 +- arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 44 + arch/arm/dts/imxrt1020-evk.dts | 198 +++++ arch/arm/dts/imxrt1020.dtsi | 133 +++ arch/arm/mach-imx/imxrt/Kconfig | 9 + board/freescale/imxrt1020-evk/Kconfig | 22 + board/freescale/imxrt1020-evk/MAINTAINERS | 6 + board/freescale/imxrt1020-evk/Makefile | 6 + board/freescale/imxrt1020-evk/README | 31 + board/freescale/imxrt1020-evk/imximage.cfg | 36 + board/freescale/imxrt1020-evk/imxrt1020-evk.c | 81 ++ configs/imxrt1020-evk_defconfig | 67 ++ drivers/clk/imx/Kconfig | 16 + drivers/clk/imx/Makefile | 1 + drivers/clk/imx/clk-imxrt1020.c | 227 ++++++ include/configs/imxrt1020-evk.h | 46 ++ include/dt-bindings/clock/imxrt1020-clock.h | 52 ++ include/dt-bindings/pinctrl/pins-imxrt1020.h | 763 ++++++++++++++++++ 18 files changed, 1740 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imxrt1020-evk-u-boot.dtsi create mode 100644 arch/arm/dts/imxrt1020-evk.dts create mode 100644 arch/arm/dts/imxrt1020.dtsi create mode 100644 board/freescale/imxrt1020-evk/Kconfig create mode 100644 board/freescale/imxrt1020-evk/MAINTAINERS create mode 100644 board/freescale/imxrt1020-evk/Makefile create mode 100644 board/freescale/imxrt1020-evk/README create mode 100644 board/freescale/imxrt1020-evk/imximage.cfg create mode 100644 board/freescale/imxrt1020-evk/imxrt1020-evk.c create mode 100644 configs/imxrt1020-evk_defconfig create mode 100644 drivers/clk/imx/clk-imxrt1020.c create mode 100644 include/configs/imxrt1020-evk.h create mode 100644 include/dt-bindings/clock/imxrt1020-clock.h create mode 100644 include/dt-bindings/pinctrl/pins-imxrt1020.h -- 2.20.1

4 21

[PATCH v2 1/5] wandboard: Fix version detection for mx6q/mx6dl revD1
by Fabio Estevam 19 Apr '20

19 Apr '20

The detection of the revD1 version is based on the presence of the PMIC. Currently revb1 device trees are used for mx6q/mx6dl variants, which do not have the PMIC nodes. This causes revD1 boards to be incorrectly be detected as revB1. Fix this issue by using the revd1 device trees, so that the PMIC node can be found and then the PMIC can be detected by reading its register ID. Imported the revd1 device trees from mainline kernel version 5.7-rc1. Reported-by: Heiko Schocher <hs(a)denx.de> Reported-by: Derek Atkins <derek(a)ihtfp.com> Signed-off-by: Fabio Estevam <festevam(a)gmail.com> Tested-by: Derek Atkins <derek(a)ihtfp.com> --- Changes since v1: - Also use the revd1 dtb's inside board_fit_config_name_match(), which fixes truncated console output on i.MX6DL wandboard as reported by Heiko. - Added Tested-by from Derek as he confirmed it works on a imx6q revd1. arch/arm/dts/Makefile | 4 ++-- ...{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} | 4 ++-- .../{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts} | 4 ++-- board/wandboard/wandboard.c | 4 ++-- configs/wandboard_defconfig | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename arch/arm/dts/{imx6dl-wandboard-revb1.dts => imx6dl-wandboard-revd1.dts} (78%) rename arch/arm/dts/{imx6q-wandboard-revb1.dts => imx6q-wandboard-revd1.dts} (80%) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 820ee9733a..2a71917c92 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -622,7 +622,7 @@ dtb-y += \ imx6dl-pico.dtb \ imx6dl-sabreauto.dtb \ imx6dl-sabresd.dtb \ - imx6dl-wandboard-revb1.dtb \ + imx6dl-wandboard-revd1.dtb \ endif @@ -654,7 +654,7 @@ dtb-y += \ imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \ imx6q-tbs2910.dtb \ - imx6q-wandboard-revb1.dtb \ + imx6q-wandboard-revd1.dtb \ imx6qp-sabreauto.dtb \ imx6qp-sabresd.dtb \ imx6qp-wandboard-revd1.dtb \ diff --git a/arch/arm/dts/imx6dl-wandboard-revb1.dts b/arch/arm/dts/imx6dl-wandboard-revd1.dts similarity index 78% rename from arch/arm/dts/imx6dl-wandboard-revb1.dts rename to arch/arm/dts/imx6dl-wandboard-revd1.dts index c2946fbaa0..6d1d863c2e 100644 --- a/arch/arm/dts/imx6dl-wandboard-revb1.dts +++ b/arch/arm/dts/imx6dl-wandboard-revd1.dts @@ -6,10 +6,10 @@ */ /dts-v1/; #include "imx6dl.dtsi" -#include "imx6qdl-wandboard-revb1.dtsi" +#include "imx6qdl-wandboard-revd1.dtsi" / { - model = "Wandboard i.MX6 Dual Lite Board rev B1"; + model = "Wandboard i.MX6 Dual Lite Board revD1"; compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; memory@10000000 { diff --git a/arch/arm/dts/imx6q-wandboard-revb1.dts b/arch/arm/dts/imx6q-wandboard-revd1.dts similarity index 80% rename from arch/arm/dts/imx6q-wandboard-revb1.dts rename to arch/arm/dts/imx6q-wandboard-revd1.dts index f6ccbecff9..55331021d8 100644 --- a/arch/arm/dts/imx6q-wandboard-revb1.dts +++ b/arch/arm/dts/imx6q-wandboard-revd1.dts @@ -6,10 +6,10 @@ */ /dts-v1/; #include "imx6q.dtsi" -#include "imx6qdl-wandboard-revb1.dtsi" +#include "imx6qdl-wandboard-revd1.dtsi" / { - model = "Wandboard i.MX6 Quad Board rev B1"; + model = "Wandboard i.MX6 Quad Board revD1"; compatible = "wand,imx6q-wandboard", "fsl,imx6q"; memory@10000000 { diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 5725c5816c..90957167b2 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -484,13 +484,13 @@ int checkboard(void) int board_fit_config_name_match(const char *name) { if (is_mx6dq()) { - if (!strcmp(name, "imx6q-wandboard-revb1")) + if (!strcmp(name, "imx6q-wandboard-revd1")) return 0; } else if (is_mx6dqp()) { if (!strcmp(name, "imx6qp-wandboard-revd1")) return 0; } else if (is_mx6dl() || is_mx6solo()) { - if (!strcmp(name, "imx6dl-wandboard-revb1")) + if (!strcmp(name, "imx6dl-wandboard-revd1")) return 0; } diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index 82e517b90f..ee70758f3a 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -46,8 +46,8 @@ CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revb1" -CONFIG_OF_LIST="imx6q-wandboard-revb1 imx6qp-wandboard-revd1 imx6dl-wandboard-revb1" +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-wandboard-revd1" +CONFIG_OF_LIST="imx6q-wandboard-revd1 imx6qp-wandboard-revd1 imx6dl-wandboard-revd1" CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -- 2.17.1

4 15

[PATCH v4] ARM: imx6: DHCOM i.MX6 PDK: Convert to DM_ETH
by Harald Seiler 19 Apr '20

19 Apr '20

Use DM_ETH instead of legacy networking. Add VIO as a fixed regulator to the relevant device-trees and augment the FEC node with properties for the reset GPIO. It should be noted that the relevant properties for the reset GPIO already exist in the PHY node (reset-gpios, reset-delay-us, reset-post-delay-us) but U-Boot currently ignores those and only supports the bus-level reset properties in the FEC node (phy-reset-gpios, phy-reset-duration, phy-reset-post-delay). Signed-off-by: Harald Seiler <hws(a)denx.de> --- Notes: Changes in v2: - Move reset and VIO to device-tree. - Always enable the clock, not just if CONFIG_FEC_MXC=y. Changes in v3: - Rename the dt file to imx6qdl-dhcom-pdk2-u-boot.dtsi because the PHY is pdk2 specific. - More verbose commit message. Changes in v4: - Remove regulator-always-on. - Change ACTIVE_HIGH to ACTIVE_LOW to properly reflect the non-DM code. arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi | 6 +++ arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi | 2 + arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi | 21 +++++++++ board/dhelectronics/dh_imx6/dh_imx6.c | 51 +-------------------- configs/dh_imx6_defconfig | 2 + 5 files changed, 33 insertions(+), 49 deletions(-) create mode 100644 arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi diff --git a/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi new file mode 100644 index 000000000000..fc7dffea2a69 --- /dev/null +++ b/arch/arm/dts/imx6dl-dhcom-pdk2-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+) +/* + * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> + */ + +#include "imx6qdl-dhcom-pdk2-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi index b94231edb3fb..026342df5a4a 100644 --- a/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/imx6q-dhcom-pdk2-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright (C) 2019 Claudius Heine <ch(a)denx.de> */ +#include "imx6qdl-dhcom-pdk2-u-boot.dtsi" + / { wdt-reboot { compatible = "wdt-reboot"; diff --git a/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi new file mode 100644 index 000000000000..a54e421de3e4 --- /dev/null +++ b/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: (GPL-2.0+) +/* + * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> + */ + +/ { + fec_vio: regulator-fec { + compatible = "regulator-fixed"; + + regulator-name = "fec-vio"; + gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; + }; +}; + +&fec { + phy-reset-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; + phy-reset-duration = <1>; + phy-reset-post-delay = <10>; + + phy-supply = <&fec_vio>; +}; diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 33ce7e8ff115..b6f8b11a10cc 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -28,10 +28,7 @@ #include <fsl_esdhc_imx.h> #include <fuse.h> #include <i2c_eeprom.h> -#include <miiphy.h> #include <mmc.h> -#include <net.h> -#include <netdev.h> #include <usb.h> #include <usb/ehci-ci.h> @@ -52,24 +49,6 @@ int overwrite_console(void) return 1; } -#ifdef CONFIG_FEC_MXC -static void eth_phy_reset(void) -{ - /* Reset PHY */ - gpio_direction_output(IMX_GPIO_NR(5, 0) , 0); - udelay(500); - gpio_set_value(IMX_GPIO_NR(5, 0), 1); - - /* Enable VIO */ - gpio_direction_output(IMX_GPIO_NR(1, 7) , 0); - - /* - * KSZ9021 PHY needs at least 10 mSec after PHY reset - * is released to stabilize - */ - mdelay(10); -} - static int setup_fec_clock(void) { struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; @@ -80,34 +59,6 @@ static int setup_fec_clock(void) return enable_fec_anatop_clock(0, ENET_50MHZ); } -int board_eth_init(bd_t *bis) -{ - uint32_t base = IMX_FEC_BASE; - struct mii_dev *bus = NULL; - struct phy_device *phydev = NULL; - - gpio_request(IMX_GPIO_NR(5, 0), "PHY-reset"); - gpio_request(IMX_GPIO_NR(1, 7), "VIO"); - - setup_fec_clock(); - - eth_phy_reset(); - - bus = fec_get_miibus(base, -1); - if (!bus) - return -EINVAL; - - /* Scan PHY 0 */ - phydev = phy_find_by_mask(bus, 0xf, PHY_INTERFACE_MODE_RGMII); - if (!phydev) { - printf("Ethernet PHY not found!\n"); - return -EINVAL; - } - - return fec_probe(bis, -1, base, bus, phydev); -} -#endif - #ifdef CONFIG_USB_EHCI_MX6 static void setup_usb(void) { @@ -190,6 +141,8 @@ int board_init(void) setup_dhcom_mac_from_fuse(); + setup_fec_clock(); + return 0; } diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index cbfc3c394e7d..40de1d82031b 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -74,6 +74,8 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y -- 2.26.0

2 1

[PATCH] ARM: imx6: DHCOM i.MX6 PDK: Fix usb-otg VBUS regulator
by Harald Seiler 19 Apr '20

19 Apr '20

During the conversion of this board to DM_REGULATOR, usb-mass-storage was broken and started failing with the following error: => ums 0 mmc 2 UMS: LUN 0, dev 2, hwpart 0, sector 0x0, count 0xe90000 Error enabling VBUS supply g_dnl_register: failed!, error: -38 g_dnl_register failed Fix this by adding the relevant GPIO to the regulator node. Fixes: 4ca99fe81aea ("ARM: imx: dh-imx6: Enable DM regulator") Signed-off-by: Harald Seiler <hws(a)denx.de> --- Notes: This patch currently depends on "ARM: imx6: DHCOM i.MX6 PDK: Convert to DM_ETH" although this could be changed. This is a working fix but I am not 100% sure if it is the correct thing to do. The device-tree contains a second regulator which already defines this exact GPIO: reg_usb_h1_vbus: regulator-usb-h1-vbus { compatible = "regulator-fixed"; regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; enable-active-high; }; Maybe &reg_usb_otg_vbus is superfluous and the two should be merged into a single regulator used for both &usbh1 and &usbotg? arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi | 2 ++ arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi diff --git a/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi index a54e421de3e4..32128d4d2ab4 100644 --- a/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-pdk2-u-boot.dtsi @@ -3,6 +3,8 @@ * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> */ +#include "imx6qdl-dhcom-u-boot.dtsi" + / { fec_vio: regulator-fec { compatible = "regulator-fixed"; diff --git a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi new file mode 100644 index 000000000000..4c3b5e82d61b --- /dev/null +++ b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: (GPL-2.0+) +/* + * Copyright (C) 2020 Harald Seiler <hws(a)denx.de> + */ + +&reg_usb_otg_vbus { + gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; + enable-active-high; +}; -- 2.26.1

2 1

[PATCH 01/11] net: dc2114x: Clean up init code
by Marek Vasut 19 Apr '20

19 Apr '20

Clean up the driver init code to bring it up to standards with U-Boot coding style, no functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/dc2114x.c | 66 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 40bfc5281b..d302d0362a 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -167,33 +167,30 @@ static struct pci_device_id supported[] = { int dc21x4x_initialize(bd_t *bis) { - int idx=0; - int card_number = 0; - unsigned int cfrv; - unsigned char timer; - pci_dev_t devbusfn; - unsigned int iobase; - unsigned short status; - struct eth_device* dev; - - while(1) { - devbusfn = pci_find_devices(supported, idx++); - if (devbusfn == -1) { + struct eth_device *dev; + unsigned short status; + unsigned char timer; + unsigned int iobase; + int card_number = 0; + pci_dev_t devbusfn; + unsigned int cfrv; + int idx = 0; + + while (1) { + devbusfn = pci_find_devices(supported, idx++); + if (devbusfn == -1) break; - } /* Get the chip configuration revision register. */ pci_read_config_dword(devbusfn, PCI_REVISION_ID, &cfrv); - if ((cfrv & CFRV_RN) < DC2114x_BRK ) { + if ((cfrv & CFRV_RN) < DC2114x_BRK) { printf("Error: The chip is not DC21143.\n"); continue; } pci_read_config_word(devbusfn, PCI_COMMAND, &status); - status |= - PCI_COMMAND_MEMORY | - PCI_COMMAND_MASTER; + status |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER; pci_write_config_word(devbusfn, PCI_COMMAND, status); pci_read_config_word(devbusfn, PCI_COMMAND, &status); @@ -211,30 +208,31 @@ int dc21x4x_initialize(bd_t *bis) pci_read_config_byte(devbusfn, PCI_LATENCY_TIMER, &timer); if (timer < 0x60) { - pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x60); + pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, + 0x60); } /* read BAR for memory space access */ pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &iobase); iobase &= PCI_BASE_ADDRESS_MEM_MASK; - debug ("dc21x4x: DEC 21142 PCI Device @0x%x\n", iobase); - - dev = (struct eth_device*) malloc(sizeof *dev); + debug("dc21x4x: DEC 21142 PCI Device @0x%x\n", iobase); + dev = (struct eth_device *)malloc(sizeof(*dev)); if (!dev) { printf("Can not allocalte memory of dc21x4x\n"); break; } + memset(dev, 0, sizeof(*dev)); sprintf(dev->name, "dc21x4x#%d", card_number); dev->iobase = pci_mem_to_phys(devbusfn, iobase); - dev->priv = (void*) devbusfn; - dev->init = dc21x4x_init; - dev->halt = dc21x4x_halt; - dev->send = dc21x4x_send; - dev->recv = dc21x4x_recv; + dev->priv = (void *)devbusfn; + dev->init = dc21x4x_init; + dev->halt = dc21x4x_halt; + dev->send = dc21x4x_send; + dev->recv = dc21x4x_recv; /* Ensure we're not sleeping. */ pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP); @@ -251,10 +249,10 @@ int dc21x4x_initialize(bd_t *bis) return card_number; } -static int dc21x4x_init(struct eth_device* dev, bd_t* bis) +static int dc21x4x_init(struct eth_device *dev, bd_t *bis) { - int i; - int devbusfn = (int) dev->priv; + int i; + int devbusfn = (int)dev->priv; /* Ensure we're not sleeping. */ pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP); @@ -271,12 +269,12 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis) for (i = 0; i < NUM_RX_DESC; i++) { rx_ring[i].status = cpu_to_le32(R_OWN); rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ); - rx_ring[i].buf = cpu_to_le32( - phys_to_bus((u32)net_rx_packets[i])); + rx_ring[i].buf = + cpu_to_le32(phys_to_bus((u32)net_rx_packets[i])); rx_ring[i].next = 0; } - for (i=0; i < NUM_TX_DESC; i++) { + for (i = 0; i < NUM_TX_DESC; i++) { tx_ring[i].status = 0; tx_ring[i].des1 = 0; tx_ring[i].buf = 0; @@ -291,8 +289,8 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis) tx_ring[txRingSize - 1].des1 |= cpu_to_le32(TD_TER); /* Tell the adapter where the TX/RX rings are located. */ - OUTL(dev, phys_to_bus((u32) &rx_ring), DE4X5_RRBA); - OUTL(dev, phys_to_bus((u32) &tx_ring), DE4X5_TRBA); + OUTL(dev, phys_to_bus((u32)&rx_ring), DE4X5_RRBA); + OUTL(dev, phys_to_bus((u32)&tx_ring), DE4X5_TRBA); START_DE4X5(dev); -- 2.25.1

1 10

Re: [PATCH v1 1/2] arm: mvebu: correct SPL boot configs for SPI/MMC
by Dennis Gilmore 19 Apr '20

19 Apr '20

resending from a different email address as Gmail rejected my first attempt to send On Sat, Apr 18, 2020 at 9:18 AM Dennis Gilmore <dgilmore(a)fedoraproject.org> wrote: > > On Fri, Apr 17, 2020 at 2:19 AM Joel Johnson <mrjoel(a)lixil.net> wrote: > > > > Update mvebu SPL boot selection mechanism for the move to driver model > > usage by ensuring that the required driver support for SPI and MMC > > booting is available in SPL when the respective boot method is > > selected. > > > > Previously, all mvebu boards selected a boot method (implicitly > > MVEBU_SPL_BOOT_DEVICE_SPI for many) even if SPL booting wasn't used. > > This changes mvebu boot method selection to depend on SPL usage which > > resolves the issue with aarch64 boards which don't use SPL getting an > > implicit boot device selection resulting in unmet dependencies. The > > 32-bit arm boards do use SPL, but I'm led to conclude that most aren't > > intentionally using the MVEBU_SPL_BOOT_DEVICE selection since none have > > SPL_DM_SPI enabled in their defconfig even though they still implicitly > > select the SPI boot method. > > > > This also results in the new addition of SPL_GPIO_SUPPORT to helios4. > > The mainline dts for helios4 includes the cd-gpios entry for sdhci with > > identical addresses as the clearfog dts. I don't have a helios4 board > > to confirm, but based on the current source conclude that the board > > itself is either wired to pull the signal low for eMMC, or the default > > MMC boot isn't fully functional in mainline. In either case, as far as > > I can tell, including the GPIO support will at least cause no > > regression. > > Currently, SPL does not find u-boot.bin on the helios4, I am working > on syncing all of the changes done to clearfog to the helios4, > generally speaking, any change made to clearfog needs to also, be made > for the helios4 as they have the same SOM. the differences being in > changes for the carrier board. > > Dennis > > > Tested on SolidRun ClearFog devices. > > > > Signed-off-by: Joel Johnson <mrjoel(a)lixil.net> > > > > --- > > > > This patch unifies two patches from a prior ClearFog specific series > > which caused issues when building for most other mvebu boards. Now > > build and config diff tested for all arm and aarch64 mvebu boards! > > > > The only substantive changes end up being the SPL dependency for boot > > selection, along with defconfig cleanups with Kconfig consolidated > > boot dependent values. > > > > The superfluous addition of SPL_MTD_SUPPORT present in the prior patch > > for SPI booting was also removed. > > > > --- > > arch/arm/mach-mvebu/Kconfig | 12 ++++++++++++ > > configs/clearfog_defconfig | 3 --- > > configs/controlcenterdc_defconfig | 4 ---- > > configs/db-88f6720_defconfig | 4 ---- > > configs/db-88f6820-amc_defconfig | 4 ---- > > configs/db-88f6820-gp_defconfig | 4 ---- > > configs/db-mv784mp-gp_defconfig | 3 --- > > configs/ds414_defconfig | 3 --- > > configs/helios4_defconfig | 1 - > > configs/maxbcm_defconfig | 3 --- > > configs/theadorable_debug_defconfig | 3 --- > > configs/turris_omnia_defconfig | 4 ---- > > configs/x530_defconfig | 4 ---- > > include/configs/helios4.h | 5 ----- > > 14 files changed, 12 insertions(+), 45 deletions(-) > > > > diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig > > index 161dee937f..645990b3ef 100644 > > --- a/arch/arm/mach-mvebu/Kconfig > > +++ b/arch/arm/mach-mvebu/Kconfig > > @@ -232,13 +232,25 @@ config SYS_SOC > > > > choice > > prompt "Boot method" > > + depends on SPL > > > > config MVEBU_SPL_BOOT_DEVICE_SPI > > bool "SPI NOR flash" > > + imply ENV_IS_IN_SPI_FLASH > > + select SPL_DM_SPI > > + select SPL_SPI_FLASH_SUPPORT > > + select SPL_SPI_LOAD > > + select SPL_SPI_SUPPORT > > > > config MVEBU_SPL_BOOT_DEVICE_MMC > > bool "SDIO/MMC card" > > + imply ENV_IS_IN_MMC > > + # GPIO needed for eMMC/SD card presence detection > > + select SPL_DM_GPIO > > + select SPL_DM_MMC > > + select SPL_GPIO_SUPPORT > > select SPL_LIBDISK_SUPPORT > > + select SPL_MMC_SUPPORT > > > > config MVEBU_SPL_BOOT_DEVICE_SATA > > bool "SATA" > > diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig > > index 6db8b8acf6..ada35cb53b 100644 > > --- a/configs/clearfog_defconfig > > +++ b/configs/clearfog_defconfig > > @@ -3,14 +3,12 @@ CONFIG_ARCH_CPU_INIT=y > > CONFIG_SYS_THUMB_BUILD=y > > CONFIG_ARCH_MVEBU=y > > CONFIG_SYS_TEXT_BASE=0x00800000 > > -CONFIG_SPL_GPIO_SUPPORT=y > > CONFIG_SPL_LIBCOMMON_SUPPORT=y > > CONFIG_SPL_LIBGENERIC_SUPPORT=y > > CONFIG_SYS_MALLOC_F_LEN=0x2000 > > CONFIG_TARGET_CLEARFOG=y > > CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y > > CONFIG_DM_GPIO=y > > -CONFIG_SPL_MMC_SUPPORT=y > > CONFIG_SPL_SERIAL_SUPPORT=y > > CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > @@ -42,7 +40,6 @@ CONFIG_CMD_CACHE=y > > CONFIG_CMD_TIME=y > > # CONFIG_SPL_PARTITION_UUIDS is not set > > CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" > > -CONFIG_ENV_IS_IN_MMC=y > > CONFIG_NET_RANDOM_ETHADDR=y > > CONFIG_SPL_OF_TRANSLATE=y > > CONFIG_AHCI_MVEBU=y > > diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig > > index 51126cbdc3..524dbc2b39 100644 > > --- a/configs/controlcenterdc_defconfig > > +++ b/configs/controlcenterdc_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_AHCI=y > > CONFIG_SPL_TEXT_BASE=0x40000030 > > @@ -28,7 +26,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_LAST_STAGE_INIT=y > > CONFIG_SPL_BOARD_INIT=y > > CONFIG_SPL_SYS_MALLOC_SIMPLE=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x30000 > > CONFIG_HUSH_PARSER=y > > # CONFIG_CMD_ELF is not set > > @@ -50,7 +47,6 @@ CONFIG_CMD_EXT4=y > > CONFIG_EFI_PARTITION=y > > CONFIG_OF_BOARD_FIXUP=y > > CONFIG_DEFAULT_DEVICE_TREE="armada-38x-controlcenterdc" > > -CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_USE_ENV_SPI_MAX_HZ=y > > CONFIG_ENV_SPI_MAX_HZ=50000000 > > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > > diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig > > index 42c427b792..068f76bbe4 100644 > > --- a/configs/db-88f6720_defconfig > > +++ b/configs/db-88f6720_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xf1012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40004030 > > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > > @@ -25,7 +23,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 > > CONFIG_CMD_I2C=y > > CONFIG_CMD_SPI=y > > @@ -43,7 +40,6 @@ CONFIG_CMD_FAT=y > > CONFIG_CMD_FS_GENERIC=y > > # CONFIG_DOS_PARTITION is not set > > CONFIG_DEFAULT_DEVICE_TREE="armada-375-db" > > -CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_USE_ENV_SPI_MAX_HZ=y > > CONFIG_ENV_SPI_MAX_HZ=50000000 > > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > > diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig > > index 5bf9eb66ad..e231ca4673 100644 > > --- a/configs/db-88f6820-amc_defconfig > > +++ b/configs/db-88f6820-amc_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=200000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40000030 > > CONFIG_FIT=y > > @@ -26,7 +24,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x24000 > > # CONFIG_CMD_FLASH is not set > > CONFIG_CMD_I2C=y > > @@ -48,7 +45,6 @@ CONFIG_EFI_PARTITION=y > > # CONFIG_PARTITION_UUIDS is not set > > # CONFIG_SPL_PARTITION_UUIDS is not set > > CONFIG_DEFAULT_DEVICE_TREE="armada-385-db-88f6820-amc" > > -CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_USE_ENV_SPI_MAX_HZ=y > > CONFIG_ENV_SPI_MAX_HZ=50000000 > > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > > diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig > > index 7e3ee5ec1c..c866131025 100644 > > --- a/configs/db-88f6820-gp_defconfig > > +++ b/configs/db-88f6820-gp_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_AHCI=y > > CONFIG_SPL_TEXT_BASE=0x40000030 > > @@ -26,7 +24,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x24000 > > CONFIG_CMD_I2C=y > > CONFIG_CMD_MMC=y > > @@ -48,7 +45,6 @@ CONFIG_EFI_PARTITION=y > > # CONFIG_PARTITION_UUIDS is not set > > # CONFIG_SPL_PARTITION_UUIDS is not set > > CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp" > > -CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_USE_ENV_SPI_MAX_HZ=y > > CONFIG_ENV_SPI_MAX_HZ=50000000 > > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > > diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig > > index d3a0d0020a..012149a860 100644 > > --- a/configs/db-mv784mp-gp_defconfig > > +++ b/configs/db-mv784mp-gp_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40004030 > > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > > @@ -25,7 +23,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 > > # CONFIG_CMD_FLASH is not set > > CONFIG_CMD_I2C=y > > diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig > > index 435c896e41..01a3909c8c 100644 > > --- a/configs/ds414_defconfig > > +++ b/configs/ds414_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40004030 > > CONFIG_BOOTDELAY=3 > > @@ -26,7 +24,6 @@ CONFIG_PREBOOT="usb start; sf probe" > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x24000 > > # CONFIG_CMD_FLASH is not set > > CONFIG_CMD_I2C=y > > diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig > > index 1b8d130ebc..0fe8559507 100644 > > --- a/configs/helios4_defconfig > > +++ b/configs/helios4_defconfig > > @@ -38,7 +38,6 @@ CONFIG_CMD_CACHE=y > > CONFIG_CMD_TIME=y > > # CONFIG_SPL_PARTITION_UUIDS is not set > > CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4" > > -CONFIG_ENV_IS_IN_MMC=y > > CONFIG_NET_RANDOM_ETHADDR=y > > CONFIG_SPL_OF_TRANSLATE=y > > CONFIG_SCSI_AHCI=y > > diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig > > index 60a87edac0..9cc9d66393 100644 > > --- a/configs/maxbcm_defconfig > > +++ b/configs/maxbcm_defconfig > > @@ -14,8 +14,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40004030 > > CONFIG_BOOTDELAY=3 > > @@ -24,7 +22,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 > > CONFIG_CMD_I2C=y > > CONFIG_CMD_SPI=y > > diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig > > index fb12e841cb..616c07ab54 100644 > > --- a/configs/theadorable_debug_defconfig > > +++ b/configs/theadorable_debug_defconfig > > @@ -15,8 +15,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40004030 > > # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > > @@ -28,7 +26,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x1a000 > > CONFIG_HUSH_PARSER=y > > CONFIG_CMD_BOOTZ=y > > diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig > > index f3ed9917d5..29c49686e2 100644 > > --- a/configs/turris_omnia_defconfig > > +++ b/configs/turris_omnia_defconfig > > @@ -17,8 +17,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_AHCI=y > > CONFIG_SPL_TEXT_BASE=0x40000030 > > @@ -32,7 +30,6 @@ CONFIG_MISC_INIT_R=y > > # CONFIG_DISPLAY_BOARDINFO is not set > > CONFIG_DISPLAY_BOARDINFO_LATE=y > > CONFIG_SPL_I2C_SUPPORT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x24000 > > CONFIG_CMD_MEMTEST=y > > CONFIG_SYS_ALT_MEMTEST=y > > @@ -53,7 +50,6 @@ CONFIG_CMD_HASH=y > > CONFIG_CMD_BTRFS=y > > # CONFIG_SPL_PARTITION_UUIDS is not set > > CONFIG_DEFAULT_DEVICE_TREE="armada-385-turris-omnia" > > -CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_USE_ENV_SPI_MAX_HZ=y > > CONFIG_ENV_SPI_MAX_HZ=50000000 > > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > > diff --git a/configs/x530_defconfig b/configs/x530_defconfig > > index a15b0b46b4..c49211df95 100644 > > --- a/configs/x530_defconfig > > +++ b/configs/x530_defconfig > > @@ -15,8 +15,6 @@ CONFIG_NR_DRAM_BANKS=2 > > CONFIG_SPL=y > > CONFIG_DEBUG_UART_BASE=0xd0012000 > > CONFIG_DEBUG_UART_CLOCK=250000000 > > -CONFIG_SPL_SPI_FLASH_SUPPORT=y > > -CONFIG_SPL_SPI_SUPPORT=y > > CONFIG_DEBUG_UART=y > > CONFIG_SPL_TEXT_BASE=0x40000030 > > CONFIG_FIT=y > > @@ -26,7 +24,6 @@ CONFIG_SILENT_U_BOOT_ONLY=y > > CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC=y > > CONFIG_MISC_INIT_R=y > > CONFIG_SPL_BOARD_INIT=y > > -CONFIG_SPL_SPI_LOAD=y > > CONFIG_SYS_SPI_U_BOOT_OFFS=0x24000 > > CONFIG_SPL_WATCHDOG_SUPPORT=y > > CONFIG_CMD_MEMINFO=y > > @@ -47,7 +44,6 @@ CONFIG_CMD_EXT4=y > > CONFIG_CMD_FAT=y > > CONFIG_CMD_FS_GENERIC=y > > CONFIG_DEFAULT_DEVICE_TREE="armada-385-atl-x530" > > -CONFIG_ENV_IS_IN_SPI_FLASH=y > > CONFIG_ENV_ADDR=0x100000 > > CONFIG_SPL_OF_TRANSLATE=y > > CONFIG_BLK=y > > diff --git a/include/configs/helios4.h b/include/configs/helios4.h > > index 5a4c9ae066..af595bc7bc 100644 > > --- a/include/configs/helios4.h > > +++ b/include/configs/helios4.h > > @@ -93,16 +93,11 @@ > > #define CONFIG_SPL_BOOTROM_SAVE (CONFIG_SPL_STACK + 4) > > > > #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH > > -/* SPL related SPI defines */ > > -#define CONFIG_SPL_SPI_FLASH_SUPPORT > > -#define CONFIG_SPL_SPI_LOAD > > -#define CONFIG_SPL_SPI_SUPPORT > > #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS > > #endif > > > > #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SDIO_MMC_CARD > > /* SPL related MMC defines */ > > -#define CONFIG_SPL_MMC_SUPPORT > > #define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) > > #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS > > #ifdef CONFIG_SPL_BUILD > > -- > > 2.26.1 > >

2 1