stm32m1 patches for v2017.10
Subsystems (7)
cover stm32m1 patches for v2017.10
Some remaining patches for stm32mp1
- some cleanup in files
- add 2 specific commands for stm32mp1 board
- use OF_SYSTEM_SETUP to update kernel device tree
- synchronization with latest device tree
Patrick Delaunay (16):
stm32mp1: deactivate WATCHDOG in defconfig
stm32mp1: call regulators_enable_boot_on in board_init
stm32mp1: syscon: remove etzpc support
stm32mp1: syscon: remove stgen
dt-bindings: pinctrl: stm32: add new entry for package information
stm32mp1: export get_cpu_package function
stm32mp1: update package information in device tree
stm32mp1: update device tree with ETZPC status
stm32mp1: add stboard command
stm32mp1: key: add stm32key command
stm32mp1: udpate README
stm32mp1: cosmetic: remove unnecessary include
stm32mp1: configs: Add CONFIG_OF_SPL_REMOVE_PROPS
stm32mp1: add check for presence of environment in boot device
stm32mp1: force boot_net_usb_start
ARM: dts: stm32mp1: sync device tree with v5.2-rc4
arch/arm/Kconfig | 1 + arch/arm/dts/stm32mp15-ddr.dtsi | 2 +- arch/arm/dts/stm32mp157-pinctrl.dtsi | 270 ++++++++++++++++++++- arch/arm/dts/stm32mp157-u-boot.dtsi | 67 ++--- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157a-dk1.dts | 30 ++- arch/arm/dts/stm32mp157c-dk2.dts | 1 + arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 15 +- arch/arm/dts/stm32mp157c-ed1.dts | 205 ++++------------ arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157c-ev1.dts | 12 +- arch/arm/dts/stm32mp157c.dtsi | 199 +++++++++++---- arch/arm/mach-stm32mp/Kconfig | 15 ++ arch/arm/mach-stm32mp/Makefile | 2 + arch/arm/mach-stm32mp/cmd_stm32key.c | 101 ++++++++ arch/arm/mach-stm32mp/cpu.c | 7 +- arch/arm/mach-stm32mp/fdt.c | 223 +++++++++++++++++ arch/arm/mach-stm32mp/include/mach/stm32.h | 3 +- arch/arm/mach-stm32mp/include/mach/sys_proto.h | 9 + arch/arm/mach-stm32mp/syscon.c | 2 - board/st/stm32mp1/Kconfig | 7 + board/st/stm32mp1/Makefile | 1 + board/st/stm32mp1/README | 15 +- board/st/stm32mp1/cmd_stboard.c | 145 +++++++++++ board/st/stm32mp1/spl.c | 1 - board/st/stm32mp1/stm32mp1.c | 4 + configs/stm32mp15_basic_defconfig | 3 +- configs/stm32mp15_trusted_defconfig | 2 - .../pinctrl/st,stm32-pinctrl.txt | 101 +++++++- drivers/clk/clk_stm32mp1.c | 3 +- include/configs/stm32mp1.h | 7 +- include/dt-bindings/pinctrl/stm32-pinfunc.h | 6 + 32 files changed, 1158 insertions(+), 309 deletions(-) create mode 100644 arch/arm/mach-stm32mp/cmd_stm32key.c create mode 100644 arch/arm/mach-stm32mp/fdt.c create mode 100644 board/st/stm32mp1/cmd_stboard.c
Signature · 1 line
2.7.4
PATCH 1/16 stm32mp1: deactivate WATCHDOG in defconfig
Deactivate WATCHDOG by default in u-boot to avoid issue to boot kernel and rootfs without the needed daemon to reload it.
---
configs/stm32mp15_basic_defconfig | 2 -- configs/stm32mp15_trusted_defconfig | 2 -- 2 files changed, 4 deletions(-)
configs/stm32mp15_basic_defconfig +0 -2
@@ -110,5 +110,3 @@ CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics" CONFIG_USB_GADGET_VENDOR_NUM=0x0483 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720 CONFIG_USB_GADGET_DWC2_OTG=y -CONFIG_WDT=y -CONFIG_WDT_STM32MP=y
configs/stm32mp15_trusted_defconfig +0 -2
@@ -100,5 +100,3 @@ CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics" CONFIG_USB_GADGET_VENDOR_NUM=0x0483 CONFIG_USB_GADGET_PRODUCT_NUM=0x5720 CONFIG_USB_GADGET_DWC2_OTG=y -CONFIG_WDT=y -CONFIG_WDT_STM32MP=y
Signature · 1 line
2.7.4
PATCH 2/16 stm32mp1: call regulators_enable_boot_on in board_init
In reply to Patrick DelaunayU-Boot activates regulators by reading the "regulator-boot-on" property in DT; it is requested by M4 early Boot feature.
---
board/st/stm32mp1/stm32mp1.c | 4 ++++ 1 file changed, 4 insertions(+)
board/st/stm32mp1/stm32mp1.c +4 -0
@@ -515,6 +515,10 @@ int board_init(void)board_key_check (); +#ifdef CONFIG_DM_REGULATOR +regulators_enable_boot_on (_DEBUG); +#endif +sysconf_init ();if (IS_ENABLED (CONFIG_LED ))
Signature · 1 line
2.7.4
PATCH 3/16 stm32mp1: syscon: remove etzpc support
In reply to Patrick DelaunaySupport for ETZPC is removed as this device is not present in Linux kernel device tree.
---
arch/arm/mach-stm32mp/include/mach/stm32.h | 1 - arch/arm/mach-stm32mp/syscon.c | 1 - 2 files changed, 2 deletions(-)
arch/arm/mach-stm32mp/include/mach/stm32.h +0 -1
@@ -36,7 +36,6 @@/* enumerated used to identify the SYSCON driver instance */ enum {STM32MP_SYSCON_UNKNOWN , -STM32MP_SYSCON_ETZPC ,STM32MP_SYSCON_PWR ,STM32MP_SYSCON_STGEN ,STM32MP_SYSCON_SYSCFG ,
arch/arm/mach-stm32mp/syscon.c +0 -1
@@ -9,7 +9,6 @@#include <asm/arch/stm32.h> static const struct udevice_id stm32mp_syscon_ids[] = { - { .compatible ="st,stm32mp1-etzpc" , .data =STM32MP_SYSCON_ETZPC }, { .compatible ="st,stm32mp1-pwr" , .data =STM32MP_SYSCON_PWR }, { .compatible ="st,stm32-stgen" , .data =STM32MP_SYSCON_STGEN }, { .compatible ="st,stm32mp157-syscfg" ,
Signature · 1 line
2.7.4
PATCH 4/16 stm32mp1: syscon: remove stgen
In reply to Patrick DelaunayReduce difference with kernel Linux device tree.
---
arch/arm/dts/stm32mp157-u-boot.dtsi | 7 ------- arch/arm/mach-stm32mp/include/mach/stm32.h | 2 +- arch/arm/mach-stm32mp/syscon.c | 1 - drivers/clk/clk_stm32mp1.c | 3 +-- 4 files changed, 2 insertions(+), 11 deletions(-)
arch/arm/dts/stm32mp157-u-boot.dtsi +0 -7
@@ -31,13 +31,6 @@ soc { u-boot,dm-pre-reloc; - - stgen: stgen at 5C008000 { - compatible = "st,stm32-stgen"; - reg = <0x5C008000 0x1000>; - status = "okay"; - u-boot,dm-pre-reloc; - }; }; };
arch/arm/mach-stm32mp/include/mach/stm32.h +1 -1
@@ -15,6 +15,7 @@#define STM32_DBGMCU_BASE 0x50081000#define STM32_TZC_BASE 0x5C006000#define STM32_ETZPC_BASE 0x5C007000 +#define STM32_STGEN_BASE 0x5C008000#define STM32_TAMP_BASE 0x5C00A000#define STM32_USART1_BASE 0x5C000000
@@ -37,7 +38,6 @@enum {STM32MP_SYSCON_UNKNOWN ,STM32MP_SYSCON_PWR , -STM32MP_SYSCON_STGEN ,STM32MP_SYSCON_SYSCFG , };
arch/arm/mach-stm32mp/syscon.c +0 -1
@@ -10,7 +10,6 @@static const struct udevice_id stm32mp_syscon_ids[] = { { .compatible ="st,stm32mp1-pwr" , .data =STM32MP_SYSCON_PWR }, - { .compatible ="st,stm32-stgen" , .data =STM32MP_SYSCON_STGEN }, { .compatible ="st,stm32mp157-syscfg" , .data =STM32MP_SYSCON_SYSCFG }, { }
drivers/clk/clk_stm32mp1.c +1 -2
@@ -1542,8 +1542,7 @@ static void stgen_config(struct stm32mp1_clk_priv *priv)u32 stgenc, cntfid0;ulong rate; - stgenc = (u32 )syscon_get_first_range (STM32MP_SYSCON_STGEN ); - + stgenc =STM32_STGEN_BASE ; cntfid0 =readl (stgenc +STGENC_CNTFID0 ); p =stm32mp1_clk_get_parent (priv,STGEN_K ); rate =stm32mp1_clk_get (priv, p);
Signature · 1 line
2.7.4
PATCH 5/16 dt-bindings: pinctrl: stm32: add new entry for package information
In reply to Patrick DelaunayAdd "st,package" entry. Possibles values are:
-STM32MP_PKG_AA for LFBGA448 (18*18) package
-STM32MP_PKG_AB for LFBGA354 (16*16) package
-STM32MP_PKG_AC for TFBGA361 (12*12) package
-STM32MP_PKG_AD for TFBGA257 (10*10) package
see Linux commit 966d9b928f626a54a0c27c0fdae1e3dfe9bab416 for v5.2-rc1
---
.../pinctrl/st,stm32-pinctrl.txt | 101 ++++++++++++++++++--- include/dt-bindings/pinctrl/stm32-pinfunc.h | 6 ++ 2 files changed, 94 insertions(+), 13 deletions(-)
doc/device-tree-bindings/pinctrl/st,stm32-pinctrl.txt +88 -13
@@ -8,8 +8,13 @@ controllers onto these pads. Pin controller node: Required properies: - compatible: value should be one of the following: - (a) "st,stm32f429-pinctrl" - (b) "st,stm32f746-pinctrl" + "st,stm32f429-pinctrl" + "st,stm32f469-pinctrl" + "st,stm32f746-pinctrl" + "st,stm32f769-pinctrl" + "st,stm32h743-pinctrl" + "st,stm32mp157-pinctrl" + "st,stm32mp157-z-pinctrl" - #address-cells: The value of this property must be 1 - #size-cells : The value of this property must be 1 - ranges : defines mapping between pin controller node (parent) to
@@ -32,13 +37,30 @@ Required properties: Optional properties: - reset: : Reference to the reset controller - - interrupt-parent: phandle of the interrupt parent to which the external - GPIO interrupts are forwarded to. - - st,syscfg: Should be phandle/offset pair. The phandle to the syscon node - which includes IRQ mux selection register, and the offset of the IRQ mux - selection register. + - st,syscfg: Should be phandle/offset/mask. + -The phandle to the syscon node which includes IRQ mux selection register. + -The offset of the IRQ mux selection register + -The field mask of IRQ mux, needed if different of 0xf. + - gpio-ranges: Define a dedicated mapping between a pin-controller and + a gpio controller. Format is <&phandle a b c> with: + -(phandle): phandle of pin-controller. + -(a): gpio base offset in range. + -(b): pin base offset in range. + -(c): gpio count in range + This entry has to be used either if there are holes inside a bank: + GPIOB0/B1/B2/B14/B15 (see example 2) + or if banks are not contiguous: + GPIOA/B/C/E... + NOTE: If "gpio-ranges" is used for a gpio controller, all gpio-controller + have to use a "gpio-ranges" entry. + More details in Documentation/devicetree/bindings/gpio/gpio.txt. + - st,bank-ioport: should correspond to the EXTI IOport selection (EXTI line + used to select GPIOs as interrupts). + - hwlocks: reference to a phandle of a hardware spinlock provider node. + - st,package: Indicates the SOC package used. + More details in include/dt-bindings/pinctrl/stm32-pinfunc.h -Example: +Example 1: #include <dt-bindings/pinctrl/stm32f429-pinfunc.h> ...
@@ -60,6 +82,43 @@ Example: pin-functions nodes follow... }; +Example 2: +#include <dt-bindings/pinctrl/stm32f429-pinfunc.h> +... + + pinctrl: pin-controller { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,stm32f429-pinctrl"; + ranges = <0 0x40020000 0x3000>; + pins-are-numbered; + + gpioa: gpio at 40020000 { + gpio-controller; + #gpio-cells = <2>; + reg = <0x0 0x400>; + resets = <&reset_ahb1 0>; + st,bank-name = "GPIOA"; + gpio-ranges = <&pinctrl 0 0 16>; + }; + + gpiob: gpio at 40020400 { + gpio-controller; + #gpio-cells = <2>; + reg = <0x0 0x400>; + resets = <&reset_ahb1 0>; + st,bank-name = "GPIOB"; + ngpios = 4; + gpio-ranges = <&pinctrl 0 16 3>, + <&pinctrl 14 30 2>; + }; + + + ... + pin-functions nodes follow... + }; + + Contents of function subnode node: ---------------------------------- Subnode format
@@ -83,14 +142,31 @@ Required properties: - port: The gpio port index (PA = 0, PB = 1, ..., PK = 11) - line: The line offset within the port (PA0 = 0, PA1 = 1, ..., PA15 = 15) - function: The function number, can be: - * 0 : GPIO IN + * 0 : GPIO * 1 : Alternate Function 0 * 2 : Alternate Function 1 * 3 : Alternate Function 2 * ... * 16 : Alternate Function 15 * 17 : Analog - * 18 : GPIO OUT + + To simplify the usage, macro is available to generate "pinmux" field. + This macro is available here: + - include/dt-bindings/pinctrl/stm32-pinfunc.h + + Some examples of using macro: + /* GPIO A9 set as alernate function 2 */ + ... { + pinmux = <STM32_PINMUX('A', 9, AF2)>; + }; + /* GPIO A9 set as GPIO */ + ... { + pinmux = <STM32_PINMUX('A', 9, GPIO)>; + }; + /* GPIO A9 set as analog */ + ... { + pinmux = <STM32_PINMUX('A', 9, ANALOG)>; + }; Optional properties: - GENERIC_PINCONFIG: is the generic pinconfig options to use.
@@ -114,13 +190,13 @@ pin-controller { ... usart1_pins_a: usart1 at 0 { pins1 { - pinmux = <STM32F429_PA9_FUNC_USART1_TX>; + pinmux = <STM32_PINMUX('A', 9, AF7)>; bias-disable; drive-push-pull; slew-rate = <0>; }; pins2 { - pinmux = <STM32F429_PA10_FUNC_USART1_RX>; + pinmux = <STM32_PINMUX('A', 10, AF7)>; bias-disable; }; };
@@ -129,5 +205,4 @@ pin-controller { &usart1 { pinctrl-0 = <&usart1_pins_a>; pinctrl-names = "default"; - status = "okay"; };
include/dt-bindings/pinctrl/stm32-pinfunc.h +6 -0
@@ -32,5 +32,11 @@#define STM32_PINMUX (port, line, mode) (((PIN_NO(port, line)) << 8) | (mode)) +/* package information */ +#define STM32MP_PKG_AA 0x1 +#define STM32MP_PKG_AB 0x2 +#define STM32MP_PKG_AC 0x4 +#define STM32MP_PKG_AD 0x8 +#endif /* _DT_BINDINGS_STM32_PINFUNC_H */
Signature · 1 line
2.7.4
PATCH 6/16 stm32mp1: export get_cpu_package function
In reply to Patrick DelaunayPrepare update of package information update
in Linux device tree.
---
arch/arm/mach-stm32mp/cpu.c | 7 +------ arch/arm/mach-stm32mp/include/mach/sys_proto.h | 9 +++++++++ 2 files changed, 10 insertions(+), 6 deletions(-)
arch/arm/mach-stm32mp/cpu.c +1 -6
@@ -78,11 +78,6 @@#define PKG_SHIFT 27#define PKG_MASK GENMASK(2, 0) -#define PKG_AA_LBGA448 4 -#define PKG_AB_LBGA354 3 -#define PKG_AC_TFBGA361 2 -#define PKG_AD_TFBGA257 1 -#if !defined(CONFIG_SPL ) || defined(CONFIG_SPL_BUILD )#ifndef CONFIG_STM32MP1_TRUSTED static void security_init (void )
@@ -277,7 +272,7 @@ u32 get_cpu_type(void) }/* Get Package options from OTP */ -static u32 get_cpu_package (void ) +u32 get_cpu_package (void ) {return get_otp (BSEC_OTP_PKG ,PKG_SHIFT ,PKG_MASK ); }
arch/arm/mach-stm32mp/include/mach/sys_proto.h +9 -0
@@ -19,5 +19,14 @@ u32 get_cpu_type(void);/* return CPU_REV constants */ u32 get_cpu_rev (void ); + +/* Get Package options from OTP */ +u32 get_cpu_package (void ); + +#define PKG_AA_LBGA448 4 +#define PKG_AB_LBGA354 3 +#define PKG_AC_TFBGA361 2 +#define PKG_AD_TFBGA257 1 +/* return boot mode */ u32 get_bootmode (void );
Signature · 1 line
2.7.4
PATCH 7/16 stm32mp1: update package information in device tree
In reply to Patrick Delaunay---
arch/arm/Kconfig | 1 + arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/fdt.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 arch/arm/mach-stm32mp/fdt.c
arch/arm/Kconfig +1 -0
@@ -1478,6 +1478,7 @@ config ARCH_STM32MP select MISC select OF_CONTROL select OF_LIBFDT + select OF_SYSTEM_SETUP select PINCTRL select REGMAP select SUPPORT_SPL
arch/arm/mach-stm32mp/Makefile +1 -0
@@ -17,3 +17,4 @@ endif endif obj-$(CONFIG_ARMV7_PSCI) += psci.o obj-$(CONFIG_$(SPL_)DM_REGULATOR) += pwr_regulator.o +obj-$(CONFIG_OF_SYSTEM_SETUP) += fdt.o
arch/arm/mach-stm32mp/fdt.c new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 8/16 stm32mp1: update device tree with ETZPC status
In reply to Patrick DelaunayU-Boot should disable nodes in device tree if needed according ETZPC status in ft_system_setup().
ETZPC itself use an array on addresses to do the match between the status bits and the node.
---
arch/arm/mach-stm32mp/Kconfig | 7 ++ arch/arm/mach-stm32mp/fdt.c | 178 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+)
arch/arm/mach-stm32mp/Kconfig +7 -0
@@ -83,6 +83,13 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_MMC2 Partition on the second MMC to load U-Boot from when the MMC is being used in raw mode +config STM32_ETZPC + bool "STM32 Extended TrustZone Protection" + depends on TARGET_STM32MP1 + default y + help + Say y to enable STM32 Extended TrustZone Protection + config BOOTSTAGE_STASH_ADDR default 0xC3000000
arch/arm/mach-stm32mp/fdt.c +178 -0
190 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 9/16 stm32mp1: add stboard command
In reply to Patrick DelaunayAllow to update board identification in OTP 59.
---
board/st/stm32mp1/Kconfig | 7 ++ board/st/stm32mp1/Makefile | 1 + board/st/stm32mp1/cmd_stboard.c | 145 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+) create mode 100644 board/st/stm32mp1/cmd_stboard.c
board/st/stm32mp1/Kconfig +7 -0
@@ -9,4 +9,11 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stm32mp1" +config CMD_STBOARD + bool "stboard - command for OTP board information" + default y + help + This compile the stboard command to + read and write the board in the OTP. + endif
board/st/stm32mp1/Makefile +1 -0
@@ -7,6 +7,7 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += stm32mp1.o +obj-$(CONFIG_CMD_STBOARD) += cmd_stboard.o endif obj-y += board.o
board/st/stm32mp1/cmd_stboard.c new file +145 -0
145 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 10/16 stm32mp1: key: add stm32key command
In reply to Patrick DelaunayAdd dedicated command to register in fuse a public hash key provided by keygen tool.
---
arch/arm/mach-stm32mp/Kconfig | 8 +++ arch/arm/mach-stm32mp/Makefile | 1 + arch/arm/mach-stm32mp/cmd_stm32key.c | 101 +++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+) create mode 100644 arch/arm/mach-stm32mp/cmd_stm32key.c
arch/arm/mach-stm32mp/Kconfig +8 -0
@@ -90,6 +90,14 @@ config STM32_ETZPC help Say y to enable STM32 Extended TrustZone Protection +config CMD_STM32KEY + bool "command stm32key to fuse public key hash" + default y + depends on CMD_FUSE + help + fuse public key hash in corresponding fuse used to authenticate + binary. + config BOOTSTAGE_STASH_ADDR default 0xC3000000
arch/arm/mach-stm32mp/Makefile +1 -0
@@ -11,6 +11,7 @@ ifdef CONFIG_SPL_BUILD obj-y += spl.o else obj-y += bsec.o +obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o ifndef CONFIG_STM32MP1_TRUSTED obj-$(CONFIG_SYSRESET) += cmd_poweroff.o endif
arch/arm/mach-stm32mp/cmd_stm32key.c new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 11/16 stm32mp1: udpate README
In reply to Patrick DelaunayAdd latest information and correct some information.
---
board/st/stm32mp1/README | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
board/st/stm32mp1/README +12 -3
@@ -25,6 +25,10 @@ It features: Everything is supported in Linux but U-Boot is limited to: 1. UART 2. SDCard/MMC controller (SDMMC) +3. NAND controller (FMC) +4. NOR controller (QSPI) +5. USB controller (OTG DWC2) +6. Ethernet controller And the necessary drivers 1. I2C
@@ -54,13 +58,13 @@ with FSBL = First Stage Bootloader TF-A performs a full initialization of Secure peripherals and installs a secure monitor. U-Boot is running in normal world and uses TF-A monitor - to access to secure resources + to access to secure resources. 2) The "Basic" boot chain (defconfig_file : stm32mp15_basic_defconfig) BootRom => FSBL = U-Boot SPL => SSBL = U-Boot SPL has limited security initialisation U-Boot is running in secure mode and provide a secure monitor to the kernel - with only PSCI support (Power State Coordination Interface defined by ARM) + with only PSCI support (Power State Coordination Interface defined by ARM). All the STM32MP1 boards supported by U-Boot use the same generic board stm32mp1 which support all the bootable devices.
@@ -111,6 +115,9 @@ the supported device trees for stm32mp157 are: # export KBUILD_OUTPUT=stm32mp15_trusted # export KBUILD_OUTPUT=stm32mp15_basic + you can build outside of code directory: + # export KBUILD_OUTPUT=../build/stm32mp15_trusted + 4. Configure U-Boot: # make <defconfig_file>
@@ -170,6 +177,8 @@ the supported device trees for stm32mp157 are: You can select the boot mode, on the board ed1 with the switch SW1 +- on the daugther board ed1 with the switch SW1 : BOOT0, BOOT1, BOOT2 + ----------------------------------- Boot Mode BOOT2 BOOT1 BOOT0 -----------------------------------
@@ -267,7 +276,7 @@ for example: with gpt table with 128 entries # dd if=tf-a.stm32 of=/dev/mmcblk0p2 # dd if=u-boot.stm32 of=/dev/mmcblk0p3 -To boot from SDCard, select BootPinMode = 1 1 1 and reset. +To boot from SDCard, select BootPinMode = 1 0 1 and reset. 8. Prepare eMMC ===============
Signature · 1 line
2.7.4
PATCH 12/16 stm32mp1: cosmetic: remove unnecessary include
In reply to Patrick DelaunayRemove post.h include as it is used in spl.c
---
board/st/stm32mp1/spl.c | 1 - 1 file changed, 1 deletion(-)
board/st/stm32mp1/spl.c +0 -1
@@ -9,7 +9,6 @@#include <dm.h> #include <ram.h> #include <asm/io.h> -#include <post.h> #include <power/pmic.h> #include <power/stpmic1.h> #include <asm/arch/ddr.h>
Signature · 1 line
2.7.4
PATCH 13/16 stm32mp1: configs: Add CONFIG_OF_SPL_REMOVE_PROPS
In reply to Patrick DelaunayRemoves unused device tree property in SPL
to reduce the SPL size by 1kB
---
configs/stm32mp15_basic_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/stm32mp15_basic_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y # CONFIG_SPL_DOS_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1" +CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-names interrupts-extended interrupt-controller \\\#interrupt-cells interrupt-parent dmas dma-names assigned-clocks assigned-clock-rates assigned-clock-parents hwlocks" CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_EXT4=y CONFIG_ENV_IS_IN_SPI_FLASH=y
Signature · 1 line
2.7.4
PATCH 14/16 stm32mp1: add check for presence of environment in boot device
In reply to Patrick DelaunayFor boot from flash, check presence of default environment to force save env.
---
include/configs/stm32mp1.h | 4 ++++ 1 file changed, 4 insertions(+)
include/configs/stm32mp1.h +4 -0
@@ -112,6 +112,7 @@"if test ${boot_device} = serial || test ${boot_device} = usb;" \"then stm32prog ${boot_device} ${boot_instance}; " \"else " \ +"run env_check;" \"if test ${boot_device} = mmc;" \"then env set boot_targets \"mmc${boot_instance}\"; fi;" \"if test ${boot_device} = nand;" \
@@ -143,6 +144,9 @@"ramdisk_addr_r=0xc4400000\0" \"fdt_high=0xffffffff\0" \"initrd_high=0xffffffff\0" \ +"env_default=1\0" \ +"env_check=if test $env_default -eq 1;" \ +" then env set env_default 0;env save;fi\0" \STM32MP_BOOTCMD \STM32MP_MTDPARTS \BOOTENV
Signature · 1 line
2.7.4
PATCH 15/16 stm32mp1: force boot_net_usb_start
In reply to Patrick DelaunayPrevent USB enumeration and avoid unnecessary delay in bootcmd_pxe as Ethernet device is not attached to USB.
---
include/configs/stm32mp1.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/configs/stm32mp1.h +2 -1
@@ -149,7 +149,8 @@" then env set env_default 0;env save;fi\0" \STM32MP_BOOTCMD \STM32MP_MTDPARTS \ - BOOTENV +BOOTENV \ + "boot_net_usb_start=true\0"#endif /* ifndef CONFIG_SPL_BUILD */ #endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
Signature · 1 line
2.7.4
PATCH 16/16 ARM: dts: stm32mp1: sync device tree with v5.2-rc4
In reply to Patrick DelaunaySynchronize device tree with v5.2-rc4 label and
update the associated u-boot dtsi.
---
arch/arm/dts/stm32mp15-ddr.dtsi | 2 +- arch/arm/dts/stm32mp157-pinctrl.dtsi | 270 ++++++++++++++++++++++++++++++- arch/arm/dts/stm32mp157-u-boot.dtsi | 60 ++++--- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157a-dk1.dts | 30 ++-- arch/arm/dts/stm32mp157c-dk2.dts | 1 + arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 15 +- arch/arm/dts/stm32mp157c-ed1.dts | 205 +++++------------------ arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157c-ev1.dts | 12 +- arch/arm/dts/stm32mp157c.dtsi | 199 +++++++++++++++++------ 11 files changed, 534 insertions(+), 268 deletions(-)
arch/arm/dts/stm32mp15-ddr.dtsi +1 -1
@@ -5,7 +5,7 @@ / { soc { - ddr: ddr at 0x5A003000{ + ddr: ddr at 5A003000{ u-boot,dm-pre-reloc; compatible = "st,stm32mp1-ddr";
arch/arm/dts/stm32mp157-pinctrl.dtsi +262 -8
350 lines not on this page · raw message
arch/arm/dts/stm32mp157-u-boot.dtsi +36 -24
95 lines not on this page · raw message
arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +0 -4
@@ -194,7 +194,3 @@ u-boot,force-b-session-valid; hnp-srp-disable; }; - -&v3v3 { - regulator-always-on; -};
arch/arm/dts/stm32mp157a-dk1.dts +20 -10
@@ -39,6 +39,13 @@ }; }; +&cec { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cec_pins_b>; + pinctrl-1 = <&cec_pins_sleep_b>; + status = "okay"; +}; + ðernet0 { status = "okay"; pinctrl-0 = <ðernet0_rgmii_pins_a>;
@@ -58,12 +65,14 @@ }; }; + &i2c4 { pinctrl-names = "default"; pinctrl-0 = <&i2c4_pins_a>; i2c-scl-rising-time-ns = <185>; i2c-scl-falling-time-ns = <20>; status = "okay"; + /* spare dmas for other usage */ /delete-property/dmas; /delete-property/dma-names;
@@ -88,17 +97,13 @@ pmic: stpmic at 33 { compatible = "st,stpmic1"; reg = <0x33>; + interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>; interrupt-controller; #interrupt-cells = <2>; status = "okay"; - st,main-control-register = <0x04>; - st,vin-control-register = <0xc0>; - st,usb-control-register = <0x20>; - regulators { compatible = "st,stpmic1-regulators"; - ldo1-supply = <&v3v3>; ldo3-supply = <&vdd_ddr>; ldo6-supply = <&v3v3>;
@@ -107,7 +112,7 @@ vddcore: buck1 { regulator-name = "vddcore"; - regulator-min-microvolt = <1200000>; + regulator-min-microvolt = <800000>; regulator-max-microvolt = <1350000>; regulator-always-on; regulator-initial-mode = <0>;
@@ -187,7 +192,6 @@ regulator-max-microvolt = <1200000>; regulator-always-on; interrupts = <IT_CURLIM_LDO6 0>; - }; vref_ddr: vref_ddr {
@@ -204,7 +208,6 @@ vbus_otg: pwr_sw1 { regulator-name = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; - regulator-active-discharge; }; vbus_sw: pwr_sw2 {
@@ -216,8 +219,9 @@ onkey { compatible = "st,stpmic1-onkey"; - interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 1>; + interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 0>; interrupt-names = "onkey-falling", "onkey-rising"; + power-off-time-sec = <10>; status = "okay"; };
@@ -228,6 +232,10 @@ }; }; +&ipcc { + status = "okay"; +}; + &iwdg2 { timeout-sec = <32>; status = "okay";
@@ -246,8 +254,10 @@ }; &sdmmc1 { - pinctrl-names = "default"; + pinctrl-names = "default", "opendrain", "sleep"; pinctrl-0 = <&sdmmc1_b4_pins_a>; + pinctrl-1 = <&sdmmc1_b4_od_pins_a>; + pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>; broken-cd; st,neg-edge; bus-width = <4>;
arch/arm/dts/stm32mp157c-dk2.dts +1 -0
@@ -42,6 +42,7 @@ compatible = "orisetech,otm8009a"; reg = <0>; reset-gpios = <&gpioe 4 GPIO_ACTIVE_LOW>; + power-supply = <&v3v3>; status = "okay"; port {
arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi +9 -6
@@ -156,6 +156,10 @@ }; }; +&sdmmc1 { + u-boot,dm-spl; +}; + &sdmmc1_b4_pins_a { u-boot,dm-spl; pins {
@@ -165,12 +169,15 @@ &sdmmc1_dir_pins_a { u-boot,dm-spl; - pins { + pins1 { + u-boot,dm-spl; + }; + pins2 { u-boot,dm-spl; }; }; -&sdmmc1 { +&sdmmc2 { u-boot,dm-spl; };
@@ -188,10 +195,6 @@ }; }; -&sdmmc2 { - u-boot,dm-spl; -}; - &uart4 { u-boot,dm-pre-reloc; };
arch/arm/dts/stm32mp157c-ed1.dts +42 -163
352 lines not on this page · raw message
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi +0 -4
@@ -59,7 +59,3 @@ &usbotg_hs { g-tx-fifo-size = <576>; }; - -&v3v3 { - regulator-always-on; -};
arch/arm/dts/stm32mp157c-ev1.dts +10 -2
@@ -6,6 +6,7 @@ /dts-v1/; #include "stm32mp157c-ed1.dts" +#include <dt-bindings/gpio/gpio.h> / { model = "STMicroelectronics STM32MP157C eval daughter on eval mother";
@@ -157,8 +158,9 @@ }; &m_can1 { - pinctrl-names = "default"; + pinctrl-names = "default", "sleep"; pinctrl-0 = <&m_can1_pins_a>; + pinctrl-1 = <&m_can1_sleep_pins_a>; status = "okay"; };
@@ -194,6 +196,9 @@ }; &timers2 { + /* spare dmas for other usage (un-delete to enable pwm capture) */ + /delete-property/dmas; + /delete-property/dma-names; status = "disabled"; pwm { pinctrl-0 = <&pwm2_pins_a>;
@@ -206,6 +211,8 @@ }; &timers8 { + /delete-property/dmas; + /delete-property/dma-names; status = "disabled"; pwm { pinctrl-0 = <&pwm8_pins_a>;
@@ -218,6 +225,8 @@ }; &timers12 { + /delete-property/dmas; + /delete-property/dma-names; status = "disabled"; pwm { pinctrl-0 = <&pwm12_pins_a>;
@@ -232,7 +241,6 @@ &usbh_ehci { phys = <&usbphyc_port0>; phy-names = "usb"; - vbus-supply = <&vbus_sw>; status = "okay"; };
arch/arm/dts/stm32mp157c.dtsi +153 -46
363 lines not on this page · raw message
Signature · 1 line
2.7.4
cover stm32m1 patches for v2017.10
In reply to Patrick Delaunayfor v2019.10 ;-)
Quoted 63 lines · Patrick Delaunay
Some remaining patches for stm32mp1
- some cleanup in files
- add 2 specific commands for stm32mp1 board
- useOF_SYSTEM_SETUPto update kernel device tree
- synchronization with latest device treePatrick Delaunay (16):
stm32mp1: deactivate WATCHDOG in defconfig
stm32mp1: callregulators_enable_boot_oninboard_init
stm32mp1: syscon: remove etzpc support
stm32mp1: syscon: remove stgen
dt-bindings: pinctrl: stm32: add new entry for package information
stm32mp1: exportget_cpu_packagefunction
stm32mp1: update package information in device tree
stm32mp1: update device tree with ETZPC status
stm32mp1: add stboard command
stm32mp1: key: add stm32key command
stm32mp1: udpate README
stm32mp1: cosmetic: remove unnecessary include
stm32mp1: configs: AddCONFIG_OF_SPL_REMOVE_PROPS
stm32mp1: add check for presence of environment in boot device
stm32mp1: forceboot_net_usb_start
ARM: dts: stm32mp1: sync device tree with v5.2-rc4arch/arm/Kconfig | 1 + arch/arm/dts/stm32mp15-ddr.dtsi | 2 +- arch/arm/dts/stm32mp157-pinctrl.dtsi | 270 ++++++++++++++++++++- arch/arm/dts/stm32mp157-u-boot.dtsi | 67 ++--- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157a-dk1.dts | 30 ++- arch/arm/dts/stm32mp157c-dk2.dts | 1 + arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 15 +- arch/arm/dts/stm32mp157c-ed1.dts | 205 ++++------------ arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157c-ev1.dts | 12 +- arch/arm/dts/stm32mp157c.dtsi | 199 +++++++++++---- arch/arm/mach-stm32mp/Kconfig | 15 ++ arch/arm/mach-stm32mp/Makefile | 2 + arch/arm/mach-stm32mp/cmd_stm32key.c | 101 ++++++++ arch/arm/mach-stm32mp/cpu.c | 7 +- arch/arm/mach-stm32mp/fdt.c | 223 +++++++++++++++++ arch/arm/mach-stm32mp/include/mach/stm32.h | 3 +- arch/arm/mach-stm32mp/include/mach/sys_proto.h | 9 + arch/arm/mach-stm32mp/syscon.c | 2 - board/st/stm32mp1/Kconfig | 7 + board/st/stm32mp1/Makefile | 1 + board/st/stm32mp1/README | 15 +- board/st/stm32mp1/cmd_stboard.c | 145 +++++++++++ board/st/stm32mp1/spl.c | 1 - board/st/stm32mp1/stm32mp1.c | 4 + configs/stm32mp15_basic_defconfig | 3 +- configs/stm32mp15_trusted_defconfig | 2 - .../pinctrl/st,stm32-pinctrl.txt | 101 +++++++- drivers/clk/clk_stm32mp1.c | 3 +- include/configs/stm32mp1.h | 7 +- include/dt-bindings/pinctrl/stm32-pinfunc.h | 6 + 32 files changed, 1158 insertions(+), 309 deletions(-) create mode 100644 arch/arm/mach-stm32mp/cmd_stm32key.c create mode 100644 arch/arm/mach-stm32mp/fdt.c create mode 100644 board/st/stm32mp1/cmd_stboard.c
cover stm32m1 patches for v2017.10
Hi Patrice,
Quoted 4 lines
From: Patrice CHOTARD <[email protected]>
Sent: vendredi 21 juin 2019 15:55for v2019.10 ;-)
Yes Sorry :-)
I mixed the first name (target as v2019.07) the new target v2019.10. I will update the serie title if I sent a v2.
Quoted 28 lines · Patrick Delaunay
Quoted 26 lines
Some remaining patches for stm32mp1
- some cleanup in files
- add 2 specific commands for stm32mp1 board
- useOF_SYSTEM_SETUPto update kernel device tree
- synchronization with latest device treePatrick Delaunay (16):
stm32mp1: deactivate WATCHDOG in defconfig
stm32mp1: callregulators_enable_boot_oninboard_init
stm32mp1: syscon: remove etzpc support
stm32mp1: syscon: remove stgen
dt-bindings: pinctrl: stm32: add new entry for package information
stm32mp1: exportget_cpu_packagefunction
stm32mp1: update package information in device tree
stm32mp1: update device tree with ETZPC status
stm32mp1: add stboard command
stm32mp1: key: add stm32key command
stm32mp1: udpate README
stm32mp1: cosmetic: remove unnecessary include
stm32mp1: configs: AddCONFIG_OF_SPL_REMOVE_PROPS
stm32mp1: add check for presence of environment in boot device
stm32mp1: forceboot_net_usb_start
ARM: dts: stm32mp1: sync device tree with v5.2-rc4
Quoted 38 lines
Quoted 3 lines
arch/arm/Kconfig | 1 + arch/arm/dts/stm32mp15-ddr.dtsi | 2 +- arch/arm/dts/stm32mp157-pinctrl.dtsi | 270++++++++++++++++++++-
Quoted 34 lines
arch/arm/dts/stm32mp157-u-boot.dtsi | 67 ++--- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157a-dk1.dts | 30 ++- arch/arm/dts/stm32mp157c-dk2.dts | 1 + arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 15 +- arch/arm/dts/stm32mp157c-ed1.dts | 205 ++++------------ arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 4 - arch/arm/dts/stm32mp157c-ev1.dts | 12 +- arch/arm/dts/stm32mp157c.dtsi | 199 +++++++++++---- arch/arm/mach-stm32mp/Kconfig | 15 ++ arch/arm/mach-stm32mp/Makefile | 2 + arch/arm/mach-stm32mp/cmd_stm32key.c | 101 ++++++++ arch/arm/mach-stm32mp/cpu.c | 7 +- arch/arm/mach-stm32mp/fdt.c | 223 +++++++++++++++++ arch/arm/mach-stm32mp/include/mach/stm32.h | 3 +- arch/arm/mach-stm32mp/include/mach/sys_proto.h | 9 + arch/arm/mach-stm32mp/syscon.c | 2 - board/st/stm32mp1/Kconfig | 7 + board/st/stm32mp1/Makefile | 1 + board/st/stm32mp1/README | 15 +- board/st/stm32mp1/cmd_stboard.c | 145 +++++++++++ board/st/stm32mp1/spl.c | 1 - board/st/stm32mp1/stm32mp1.c | 4 + configs/stm32mp15_basic_defconfig | 3 +- configs/stm32mp15_trusted_defconfig | 2 - .../pinctrl/st,stm32-pinctrl.txt | 101 +++++++- drivers/clk/clk_stm32mp1.c | 3 +- include/configs/stm32mp1.h | 7 +- include/dt-bindings/pinctrl/stm32-pinfunc.h | 6 + 32 files changed, 1158 insertions(+), 309 deletions(-) create mode 100644 arch/arm/mach-stm32mp/cmd_stm32key.c create mode 100644 arch/arm/mach-stm32mp/fdt.c create mode 100644
board/st/stm32mp1/cmd_stboard.c
Regards
Patrick