leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'u-boot-stm32-20190628' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm

Browse Source 
STM32 MCU fixes/cleanup:
- Fix SPL console for STM32F769 Discovery
- Fix Memory Protection Unit size for STM32F4 series
- Cleanup DT for STM32F746 Discovery
This commit is contained in:
Tom Rini
2019-06-28 07:59:38 -04:00
parent 33ca409684 36cb793b35
commit cb8cc1d8fb
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/dts/stm32f746-disco-u-boot.dtsi
View File

@@ -78,10 +78,6 @@
}; };
}; };
&clk_hse {
u-boot,dm-pre-reloc;
};
&fmc { &fmc {
/* Memory configuration from sdram datasheet MT48LC_4M32_B2B5-6A */ /* Memory configuration from sdram datasheet MT48LC_4M32_B2B5-6A */
bank1: bank@0 { bank1: bank@0 {
@@ -123,9 +119,7 @@
}; };
fmc_pins: fmc@0 { fmc_pins: fmc@0 {
u-boot,dm-pre-reloc;
pins { pins {
u-boot,dm-pre-reloc;
pinmux = <STM32_PINMUX('D',10, AF12)>, /* D15 */ pinmux = <STM32_PINMUX('D',10, AF12)>, /* D15 */
<STM32_PINMUX('D', 9, AF12)>, /* D14 */ <STM32_PINMUX('D', 9, AF12)>, /* D14 */
<STM32_PINMUX('D', 8, AF12)>, /* D13 */ <STM32_PINMUX('D', 8, AF12)>, /* D13 */

10
arch/arm/dts/stm32f769-disco-u-boot.dtsi
View File

@@ -152,6 +152,16 @@
slew-rate = <2>; slew-rate = <2>;
}; };
}; };
usart1_pins_a: usart1@0 {
u-boot,dm-pre-reloc;
pins1 {
u-boot,dm-pre-reloc;
};
pins2 {
u-boot,dm-pre-reloc;
};
};
}; };
&qspi { &qspi {

2
arch/arm/mach-stm32/soc.c
View File

@@ -18,7 +18,7 @@ int arch_cpu_init(void)
*/ */
#if defined(CONFIG_STM32F4) #if defined(CONFIG_STM32F4)
{ 0x00000000, REGION_0, XN_DIS, PRIV_RW_USR_RW, { 0x00000000, REGION_0, XN_DIS, PRIV_RW_USR_RW,
O_I_WB_RD_WR_ALLOC, REGION_16MB }, O_I_WB_RD_WR_ALLOC, REGION_512MB },
#endif #endif
{ 0x90000000, REGION_1, XN_DIS, PRIV_RW_USR_RW, { 0x90000000, REGION_1, XN_DIS, PRIV_RW_USR_RW,