February 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: error message if BootOrder not defined
by Heinrich Schuchardt 24 Feb '19

24 Feb '19

For booting via `bootefi bootmgr` it is necessary that the EFI variable BootOrder is defined. Provide a diagnostic message if the variable is missing. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_bootmgr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 8bb84f888c1..15a06085364 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -180,8 +180,10 @@ void *efi_bootmgr_load(struct efi_device_path **device_path, rs = systab.runtime; bootorder = get_var(L"BootOrder", &efi_global_variable_guid, &size); - if (!bootorder) + if (!bootorder) { + printf("BootOrder not defined\n"); goto error; + } num = size / sizeof(uint16_t); for (i = 0; i < num; i++) { -- 2.20.1

1 0

[U-Boot] [PATCH] preboot: Introduce CONFIG_USE_PREBOOT and migrate CONFIG_PREBOOT
by Masahiro Yamada 23 Feb '19

23 Feb '19

This is the same migration path as commit b6251db8c3f0 ("Kconfig: Introduce USE_BOOTCOMMAND and migrate BOOTCOMMAND"). I also moved the description in README to the Kconfig help. I ripped off the sentence about 'LWMON' since it is gone already. I only let my boards migrate, leaving the rest to platform maintainers. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- README | 16 ---------------- common/Kconfig | 18 ++++++++++++++++++ configs/uniphier_ld4_sld8_defconfig | 2 ++ configs/uniphier_v7_defconfig | 2 ++ configs/uniphier_v8_defconfig | 2 ++ include/configs/uniphier.h | 2 -- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/README b/README index b81500f..1d9b485 100644 --- a/README +++ b/README @@ -687,22 +687,6 @@ The following options need to be configured: as a convenience, when switching between booting from RAM and NFS. -- Pre-Boot Commands: - CONFIG_PREBOOT - - When this option is #defined, the existence of the - environment variable "preboot" will be checked - immediately before starting the CONFIG_BOOTDELAY - countdown and/or running the auto-boot command resp. - entering interactive mode. - - This feature is especially useful when "preboot" is - automatically generated or modified. For an example - see the LWMON board specific code: here "preboot" is - modified when the user holds down a certain - combination of keys on the (special) keyboard when - booting the systems - - Serial Download Echo Mode: CONFIG_LOADS_ECHO If defined to 1, all characters received during a diff --git a/common/Kconfig b/common/Kconfig index 0a14bde..70b8091 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -232,6 +232,24 @@ config BOOTCOMMAND This is the string of commands that will be used as bootcmd and if AUTOBOOT is set, automatically run. +config USE_PREBOOT + bool "Enable preboot" + help + When this option is enabled, the existence of the environment + variable "preboot" will be checked immediately before starting the + CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp. + entering interactive mode. + + This feature is especially useful when "preboot" is automatically + generated or modified. For example, the boot code can modify the + "preboot" when a user holds down a certain combination of keys. + +config PREBOOT + string "preboot default value" + depends on USE_PREBOOT + help + This is the default of "preboot" environment variable. + menu "Console" config MENU diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 48f7ac4..de9182e 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -10,6 +10,8 @@ CONFIG_MICRO_SUPPORT_CARD=y CONFIG_NR_DRAM_BANKS=3 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot" CONFIG_LOGLEVEL=6 CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig index f7abf05..bb9ce1a 100644 --- a/configs/uniphier_v7_defconfig +++ b/configs/uniphier_v7_defconfig @@ -9,6 +9,8 @@ CONFIG_MICRO_SUPPORT_CARD=y CONFIG_NR_DRAM_BANKS=3 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot" CONFIG_LOGLEVEL=6 CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig index 1ba1c7d..08dfa24 100644 --- a/configs/uniphier_v8_defconfig +++ b/configs/uniphier_v8_defconfig @@ -8,6 +8,8 @@ CONFIG_MICRO_SUPPORT_CARD=y CONFIG_NR_DRAM_BANKS=3 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_BOOTCOMMAND="run ${bootdev}script; run ${bootdev}boot" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot" CONFIG_LOGLEVEL=6 CONFIG_CMD_CONFIG=y CONFIG_CMD_IMLS=y diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 95d6452..1e509ce 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -124,8 +124,6 @@ "third_image=u-boot.bin\0" #endif -#define CONFIG_PREBOOT "env exist ${bootdev}preboot && run ${bootdev}preboot" - #define CONFIG_ROOTPATH "/nfs/root/path" #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs $bootargs root=/dev/nfs rw " \ -- 2.7.4

2 1

[U-Boot] [PATCH] cmd: Kconfig: LED command depends on LED subsystems
by Jan Kiszka 23 Feb '19

23 Feb '19

From: Jan Kiszka <jan.kiszka(a)siemens.com> Without CONFIG_LED, we get cmd/built-in.o: In function `show_led_state': cmd/led.c:40: undefined reference to `led_get_state' cmd/built-in.o: In function `do_led': cmd/led.c:99: undefined reference to `led_get_by_label' cmd/led.c:108: undefined reference to `led_set_state' Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- cmd/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index ea1a325eb3..e1c0719165 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1399,6 +1399,7 @@ config CMD_DISPLAY config CMD_LED bool "led" + depends on LED default y if LED help Enable the 'led' command which allows for control of LEDs supported -- 2.16.4

2 1

[U-Boot] [PATCH] imx: mx6qsabrelite: Update the SabreLite README
by Martyn Welch 22 Feb '19

22 Feb '19

The information in the SabreLite README is inaccurate and sparse. The upstream U-Boot can boot the SabreLite from SPI-NOR. Additionally, the freely available imx_loader tool can be easily used to boot a board with a corrupted SPI, the official Freescale/NXP manufacturing tools are not required. Reformat the document, adding a description of how to boot from SPI-NOR and adding a brief description of how to recover the board should the SPI-NOR be corrupted using imx_loader. Signed-off-by: Martyn Welch <martyn.welch(a)collabora.com> --- .../boundary/nitrogen6x/README.mx6qsabrelite | 119 ++++++++++++------ 1 file changed, 83 insertions(+), 36 deletions(-) diff --git a/board/boundary/nitrogen6x/README.mx6qsabrelite b/board/boundary/nitrogen6x/README.mx6qsabrelite index 12a9c856cf..6283c9575e 100644 --- a/board/boundary/nitrogen6x/README.mx6qsabrelite +++ b/board/boundary/nitrogen6x/README.mx6qsabrelite @@ -1,72 +1,119 @@ U-Boot for the Freescale i.MX6q SabreLite board +=============================================== This file contains information for the port of U-Boot to the Freescale i.MX6q SabreLite board. -1. Boot source, boot from SD card ---------------------------------- -The recent mainline U-Boot for the Freescale i.MX6q SabreLite board supports -boot from SD card only. However, by default, the SabreLite -boards boot from the SPI NOR flash. These boards need to be reflashed with -a small SD card loader to support boot from SD card. This small SD card loader -will be flashed into the SPI NOR. The board will still boot from SPI NOR, but -the loader will in turn request the BootROM to load the U-Boot from SD card. +1. Build +-------- + +To build U-Boot for the SabreLite board: + + make mx6qsabrelite_config + make + + +2. Boot from SD card +-------------------- + +The SabreLite boards boot from the SPI NOR flash. These boards need their SPI +to be reflashed with a small SD card loader to support boot from SD card. The +board will still boot from SPI NOR, but the loader will in turn request the +BootROM to load the U-Boot from SD card. The SD card loader is available from https://wiki.linaro.org/Boards/MX6QSabreLite -under a open-source 3-clause BSD license. +This is provided under a open-source 3-clause BSD license. -To update the SPI-NOR on the SabreLite board without the Freescale -manufacturing tool use the following procedure: +To following procedure can be used to update the SPI-NOR on the SabreLite +board: 1. Write this SD card loader onto a large SD card using: - sudo dd if=iMX6DQ_SPI_to_uSDHC3.bin of=/dev/sXx + sudo dd if=iMX6DQ_SPI_to_uSDHC3.bin of=/dev/sXx -Note: Replace sXx with the device representing the SD card in your system. + Note: Replace sXx with the device representing the SD card in your system. -Note: This writes SD card loader at address 0 + Note: This writes SD card loader at address 0 2. Put this SD card into the slot for the large SD card (SD3 on the bottom of -the board). Make sure SW1 switch is at position "00", so that it can boot -from the fuses. + the board). Make sure SW1 switch is at position "00", so that it can boot + from the fuses. 3. Power-up the SabreLite, press 'space' to enter command mode in the U-Boot -(the default one the board is shipped with, starting from the SPI NOR) and -enter the following commands: + (the default one the board is shipped with, starting from the SPI NOR) and + enter the following commands: + + MX6Q SABRELITE U-Boot > mmc dev 0 + MX6Q SABRELITE U-Boot > mmc read 0x10800000 0 200 + MX6Q SABRELITE U-Boot > sf probe + MX6Q SABRELITE U-Boot > sf erase 0 0x40000 + MX6Q SABRELITE U-Boot > sf write 0x10800000 0 0x40000 - MX6Q SABRELITE U-Boot > mmc dev 0 - MX6Q SABRELITE U-Boot > mmc read 0x10800000 0 200 - MX6Q SABRELITE U-Boot > sf probe - MX6Q SABRELITE U-Boot > sf erase 0 0x40000 - MX6Q SABRELITE U-Boot > sf write 0x10800000 0 0x40000 +4. Write the u-boot.imx produced during the U-Boot build to the SD card: -4. done. + sudo dd if=u-boot.imx of=/dev/sXx bs=512 seek=2 && sudo sync -In case you somehow do not succeed with this procedure you will have to use -the Freescale manufacturing tool in order to reflash the SPI-NOR. + Note: Replace sXx with the device representing the SD card in your system. + +5. Re-insert the SD card back in the slot for the large SD card and power-cycle + the board. Note: The board now boots from full size SD3 on the bottom of the board. NOT the micro SD4/BOOT slot on the top of the board. I.e. you have to use full size SD cards. -This information is taken from +This information originally taken from: -https://wiki.linaro.org/Boards/MX6QSabreLite + https://wiki.linaro.org/Boards/MX6QSabreLite -2. Build --------- -To build U-Boot for the SabreLite board: +3. Boot from SPI NOR +-------------------- - make mx6qsabrelite_config - make +The SabreLite board can also boot U-Boot directly from the SPI NOR flash: + +1. Power-up the SabreLite, press 'space' to enter command mode in the U-Boot + and enter the following commands: + + => mmc dev 0 + => mmc read 0x10800000 0x400 0x80000 + => sf probe 0 + => sf erase 0 0xc0000 + => sf write 0x10800000 0x400 0x80000 + +Note: This procedure assumes you have booted using the desired U-Boot from an + SD card as prepared in the previous section. Alternative mechanisms, such + as using tftpboot to copy an alternative U-Boot image into memory can + also be used. + + +4. Recovering SPI-NOR +--------------------- + +In case you somehow do not succeed with this procedure you can upload U-Boot +via USB: + +1. Download and install the imx_loader following the instructions provided: + + https://github.com/boundarydevices/imx_usb_loader + +2. Connect the board to USB via the USB OTG port. + +3. Make sure SW1 switch is at position "01", so that it can boot from USB OTG. + +4. Power-up the SabreLite and run the imx_loader to upload the U-Boot image: + + sudo imx_usb u-boot.imx + +Note: This will upload and run the U-Boot image in memory, the SPI will not be + reprogrammed and this procedure will need to be repeated if the board is + reset. -To copy the resulting u-boot.imx to the SD card: +5. Use one of previous descriptions to re-flash the SPI-NOR as required. - sudo dd if=u-boot.imx of=/dev/sXx bs=512 seek=2&&sudo sync +6. Ensure SW1 is returned to "00" to boot from the fuses once done. -Note: Replace sXx with the device representing the SD card in your system. -- 2.20.1

2 1

[U-Boot] [RFC PATCH 0/1] SPI flash dependency rework
by Oskari Lemmela 22 Feb '19

22 Feb '19

Currently TARGET_* and ARCH_* selects multiple spi related CONFIG options. If dependency order of spi related CONFIG options is reverse, they are selected as dependencies when needed. Oskari Lemmela (1): spi: Kconfig: change dependency order drivers/mtd/spi/Kconfig | 28 ++++++++++++------ drivers/spi/Kconfig | 63 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 16 deletions(-) -- 2.17.1

2 2

[U-Boot] [PATCH 1/3] Add support for the MT41K128M16JT125K memory modules
by Martyn Welch 22 Feb '19

22 Feb '19

From: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> Add configuration for the MT41K128M16JT125K memory modules as used on the Bosch Guardian device. Based on a patch by: Govindaraji Sivanantham <Govindaraji.Sivanantham(a)in.bosch.com> Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> [checkpatch.pl cleanup by Martyn Welch] Signed-off-by: Martyn Welch <martyn.welch(a)collabora.com> --- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h index d8ddecc0bd..15a5b641ff 100644 --- a/arch/arm/include/asm/arch-am33xx/ddr_defs.h +++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h @@ -84,6 +84,22 @@ #define MT41K128MJT187E_PHY_FIFO_WE 0x100 #define MT41K128MJT187E_IOCTRL_VALUE 0x18B +/* Micron MT41K128M16JT-125 IT:K (256 MB) at 400MHz */ +#define MT41K128M16JT125K_EMIF_READ_LATENCY 0x07 +#define MT41K128M16JT125K_EMIF_TIM1 0x0AAAD4DB +#define MT41K128M16JT125K_EMIF_TIM2 0x2A437FDA +#define MT41K128M16JT125K_EMIF_TIM3 0x501F83FF +#define MT41K128M16JT125K_EMIF_SDCFG 0x61A052B2 +#define MT41K128M16JT125K_EMIF_SDREF 0x00000C30 +#define MT41K128M16JT125K_ZQ_CFG 0x50074BE4 +#define MT41K128M16JT125K_RATIO 0x80 +#define MT41K128M16JT125K_INVERT_CLKOUT 0x0 +#define MT41K128M16JT125K_RD_DQS 0x38 +#define MT41K128M16JT125K_WR_DQS 0x46 +#define MT41K128M16JT125K_PHY_WR_DATA 0x7D +#define MT41K128M16JT125K_PHY_FIFO_WE 0x9B +#define MT41K128M16JT125K_IOCTRL_VALUE 0x18B + /* Micron MT41J64M16JT-125 */ #define MT41J64MJT125_EMIF_SDCFG 0x61C04A32 -- 2.20.1

4 11

[U-Boot] [PATCH v2 0/4] ARM: atmel: boards: enable SPL support
by Bo Shen 22 Feb '19

22 Feb '19

This patch series enable SPL support for following boards: - at91sam9m10g45ek - NAND flash boot support - SD card boot support - at91sam9n12ek - NAND flash boot support - SPI flash boot support - at91sam9x5ek - NAND flash boot support - SPI flash boot support Changes in v2: - Remove the meaningless prefix "+S:" in configuration file. Bo Shen (4): ARM: atmel: arm926ejs: fix clock configuration ARM: atmel: at91sam9m10g45ek: enable spl support ARM: atmel: at91sam9x5ek: enable spl support ARM: atmel: at91sam9n12ek: enable spl support arch/arm/mach-at91/Kconfig | 3 + arch/arm/mach-at91/Makefile | 2 + arch/arm/mach-at91/arm926ejs/clock.c | 54 +++++++++-------- arch/arm/mach-at91/arm926ejs/u-boot-spl.lds | 48 +++++++++++++++ arch/arm/mach-at91/include/mach/at91_pmc.h | 6 +- arch/arm/mach-at91/include/mach/at91sam9x5.h | 10 ++++ arch/arm/mach-at91/mpddrc.c | 3 +- arch/arm/mach-at91/spl.c | 2 +- arch/arm/mach-at91/spl_at91.c | 11 +++- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 80 +++++++++++++++++++++++++ board/atmel/at91sam9n12ek/at91sam9n12ek.c | 73 ++++++++++++++++++++++ board/atmel/at91sam9x5ek/at91sam9x5ek.c | 74 +++++++++++++++++++++++ configs/at91sam9m10g45ek_mmc_defconfig | 1 + configs/at91sam9m10g45ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_nandflash_defconfig | 1 + configs/at91sam9n12ek_spiflash_defconfig | 1 + configs/at91sam9x5ek_nandflash_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 1 + include/configs/at91sam9m10g45ek.h | 58 ++++++++++++++++++ include/configs/at91sam9n12ek.h | 58 +++++++++++++++++- include/configs/at91sam9x5ek.h | 57 ++++++++++++++++++ 21 files changed, 513 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-at91/arm926ejs/u-boot-spl.lds -- 2.3.3.220.g9ab698f

4 14

[U-Boot] [PATCH v2] cmd: clk: Handle ENODEV from clk_get_rate
by Ismael Luceno Cortes 22 Feb '19

22 Feb '19

clk_get_rate may return -ENODEV if the clock isn't valid. Also, make all the error cases go through a single path. Signed-off-by: Ismael Luceno <ismael.luceno(a)silicon-gears.com> --- CC: Matthias Brugger <mbrugger(a)suse.com> Notes: Changes since v1: - Added further explanation to the commit message. cmd/clk.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cmd/clk.c b/cmd/clk.c index fd4231589c..41f2ae0a50 100644 --- a/cmd/clk.c +++ b/cmd/clk.c @@ -26,20 +26,23 @@ int __weak soc_clk_dump(void) uclass_foreach_dev(dev, uc) { memset(&clk, 0, sizeof(clk)); ret = device_probe(dev); - if (ret) { - printf("%-30.30s : ? Hz\n", dev->name); - continue; - } + if (ret) + goto noclk; ret = clk_request(dev, &clk); - if (ret) { - printf("%-30.30s : ? Hz\n", dev->name); - continue; - } - - printf("%-30.30s : %lu Hz\n", dev->name, clk_get_rate(&clk)); + if (ret) + goto noclk; + ulong rate = clk_get_rate(&clk); clk_free(&clk); + + if (rate == -ENODEV) + goto noclk; + + printf("%-30.30s : %lu Hz\n", dev->name, rate); + continue; + noclk: + printf("%-30.30s : ? Hz\n", dev->name); } return 0; -- 2.19.1

2 1

[U-Boot] [PATCH v1 0/9] Synchronize DT with v4.20 kernel for STM32F4/F7 and H7 boards
by Patrice Chotard 22 Feb '19

22 Feb '19

Due to this DT synchronization, some driver must be updated. This series : - Migrates all nodes/properties/addons specific to U-Boot in -u-boot DT files. - Synchronizes DT with v4.20 kernel for STM32F4/F7and H7 - Adds stm32f769-disco pinctrl compatible string - Updates arm_pl180_mmci driver with new compatible string Patrice Chotard (9): ARM:dts: stm32: sort nodes by alphabetical order in f4 u-boot files ARM: dts: stm32: Sync DT files with v4.20 kernel for stm32f4 ARM: dts: stm32: Migrate U-boot nodes to U-boot DT files for stm32f7 ARM: dts: stm32: Sync DT with v4.20 kernel for stm32f7 ARM: dts: Migrate U-boot nodes to U-boot DT files for stm32h7 ARM: dts: stm32: Sync DT with v4.20 kernel for stm32h7 ARM: dts: stm32: Restore old usart1 clock bindings for stm32f7 pinctrl: stm32: Add st,stm32f769-pinctrl compatible string mmc: arm_pl180_mmci: Sync compatible with kernel arch/arm/dts/stm32746g-eval-u-boot.dtsi | 188 +++ arch/arm/dts/stm32746g-eval.dts | 222 +--- arch/arm/dts/stm32f4-pinctrl.dtsi | 27 +- arch/arm/dts/stm32f429-disco-u-boot.dtsi | 18 +- arch/arm/dts/stm32f429-disco.dts | 4 +- arch/arm/dts/stm32f429-pinctrl.dtsi | 3 +- arch/arm/dts/stm32f429.dtsi | 33 +- arch/arm/dts/stm32f469-disco-u-boot.dtsi | 46 +- arch/arm/dts/stm32f469-disco.dts | 86 +- arch/arm/dts/stm32f469-pinctrl.dtsi | 3 +- arch/arm/dts/stm32f469.dtsi | 19 + arch/arm/dts/stm32f7-pinctrl.dtsi | 289 ++++ arch/arm/dts/stm32f7-u-boot.dtsi | 139 +- arch/arm/dts/stm32f746-disco-u-boot.dtsi | 251 ++++ arch/arm/dts/stm32f746-disco.dts | 279 +--- arch/arm/dts/stm32f746-pinctrl.dtsi | 11 + arch/arm/dts/stm32f746.dtsi | 747 +++++++---- arch/arm/dts/stm32f769-disco-u-boot.dtsi | 165 +++ arch/arm/dts/stm32f769-disco.dts | 236 +--- arch/arm/dts/stm32f769-pinctrl.dtsi | 11 + arch/arm/dts/stm32h7-u-boot.dtsi | 197 ++- arch/arm/dts/stm32h743-pinctrl.dtsi | 160 +-- arch/arm/dts/stm32h743.dtsi | 462 ++++++- arch/arm/dts/stm32h743i-disco-u-boot.dtsi | 11 + arch/arm/dts/stm32h743i-disco.dts | 44 +- arch/arm/dts/stm32h743i-eval-u-boot.dtsi | 12 + arch/arm/dts/stm32h743i-eval.dts | 79 +- drivers/mmc/arm_pl180_mmci.c | 14 +- drivers/mmc/arm_pl180_mmci.h | 3 +- drivers/pinctrl/pinctrl_stm32.c | 1 + include/dt-bindings/clock/stm32fx-clock.h | 7 +- include/dt-bindings/pinctrl/stm32f746-pinfunc.h | 1341 ------------------- include/dt-bindings/pinctrl/stm32h7-pinfunc.h | 1612 ----------------------- 33 files changed, 2638 insertions(+), 4082 deletions(-) create mode 100644 arch/arm/dts/stm32746g-eval-u-boot.dtsi create mode 100644 arch/arm/dts/stm32f469.dtsi create mode 100644 arch/arm/dts/stm32f7-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32f746-disco-u-boot.dtsi create mode 100644 arch/arm/dts/stm32f746-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32f769-disco-u-boot.dtsi create mode 100644 arch/arm/dts/stm32f769-pinctrl.dtsi create mode 100644 arch/arm/dts/stm32h743i-disco-u-boot.dtsi create mode 100644 arch/arm/dts/stm32h743i-eval-u-boot.dtsi delete mode 100644 include/dt-bindings/pinctrl/stm32f746-pinfunc.h delete mode 100644 include/dt-bindings/pinctrl/stm32h7-pinfunc.h -- 1.9.1

1 9

[U-Boot] [PATCH 1/2] configs: stm32f746-disco: update EXTRA_ENV_SETTINGS
by Patrice Chotard 22 Feb '19

22 Feb '19

Allows to boot linux distribution. As stm32f746-disco and stm32f769-disco are sharing the same defconfig file, in case of stm32f769-disco build, "fdtfile=..." must be updated with the correct stm32f769 DTB file name. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- include/configs/stm32f746-disco.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index dae402f91b8c..84bbc76ef55c 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -43,14 +43,20 @@ #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) -#define CONFIG_BOOTCOMMAND \ - "run bootcmd_romfs" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "bootargs_romfs=uclinux.physaddr=0x08180000 root=/dev/mtdblock0\0" \ - "bootcmd_romfs=setenv bootargs ${bootargs} ${bootargs_romfs};" \ - "bootm 0x08044000 - 0x08042000\0" - +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) + +#include <config_distro_bootcmd.h> +#define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_addr_r=0xC0008000\0" \ + "fdtfile=stm32f746-disco.dtb\0" \ + "fdt_addr_r=0xC0500000\0" \ + "scriptaddr=0xC0008000\0" \ + "pxefile_addr_r=0xC0008000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + "ramdisk_addr_r=0xD0900000\0" \ + BOOTENV /* * Command line configuration. -- 1.9.1

1 1