| Message ID | 1501076919-28328-1-git-send-email-patrice.chotard@st.com |
|---|---|
| State | Accepted |
| Commit | 84e9dcc120c59942cc35a1e229e856ce556d7ca2 |
| Delegated to: | Tom Rini |
| Headers | show |
LGTM, On 07/26/2017 06:48 AM, patrice.chotard@st.com wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > Add CONFIG_STM32X7_SERIAL as a Kconfig option. > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> Reviewed-by: Vikas Manocha <vikas.manocha@st.com> Cheers, Vikas > --- > configs/stm32f746-disco_defconfig | 1 + > drivers/serial/Kconfig | 7 +++++++ > include/configs/stm32f746-disco.h | 1 - > scripts/config_whitelist.txt | 1 - > 4 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig > index f76d3c5..08c4a06 100644 > --- a/configs/stm32f746-disco_defconfig > +++ b/configs/stm32f746-disco_defconfig > @@ -42,6 +42,7 @@ CONFIG_PINCTRL=y > CONFIG_PINCTRL_STM32=y > CONFIG_RAM=y > CONFIG_STM32_SDRAM=y > +CONFIG_STM32X7_SERIAL=y > CONFIG_DM_SPI=y > CONFIG_STM32_QSPI=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig > index b7dd2ac..2a767f9 100644 > --- a/drivers/serial/Kconfig > +++ b/drivers/serial/Kconfig > @@ -491,6 +491,13 @@ config STI_ASC_SERIAL > on STiH410 SoC. This is a basic implementation, it supports > following baudrate 9600, 19200, 38400, 57600 and 115200. > > +config STM32X7_SERIAL > + bool "STMicroelectronics STM32 SoCs on-chip UART" > + depends on DM_SERIAL && STM32F7 > + help > + If you have a machine based on a STM32 F7 you can enable its > + onboard serial ports, say Y to this option. If unsure, say N. > + > config MPC8XX_CONS > bool "Console driver for MPC8XX" > depends on 8xx > diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h > index 4e0edcb..daf3235 100644 > --- a/include/configs/stm32f746-disco.h > +++ b/include/configs/stm32f746-disco.h > @@ -32,7 +32,6 @@ > #define CONFIG_ENV_SIZE (8 << 10) > > #define CONFIG_STM32_FLASH > -#define CONFIG_STM32X7_SERIAL > > #define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8) > #define CONFIG_DW_ALTDESCRIPTOR > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 54eee53..c92ac7b 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -2352,7 +2352,6 @@ CONFIG_STATIC_BOARD_REV > CONFIG_STATIC_RELA > CONFIG_STD_DEVICES_SETTINGS > CONFIG_STM32F4DISCOVERY > -CONFIG_STM32X7_SERIAL > CONFIG_STM32_FLASH > CONFIG_STM32_GPIO > CONFIG_STM32_HSE_HZ >
On Wed, Jul 26, 2017 at 03:48:39PM +0200, Patrice Chotard wrote: > From: Patrice Chotard <patrice.chotard@st.com> > > Add CONFIG_STM32X7_SERIAL as a Kconfig option. > > Signed-off-by: Patrice Chotard <patrice.chotard@st.com> > Reviewed-by: Vikas Manocha <vikas.manocha@st.com> Applied to u-boot/master, thanks!
diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index f76d3c5..08c4a06 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -42,6 +42,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_STM32=y CONFIG_RAM=y CONFIG_STM32_SDRAM=y +CONFIG_STM32X7_SERIAL=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index b7dd2ac..2a767f9 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -491,6 +491,13 @@ config STI_ASC_SERIAL on STiH410 SoC. This is a basic implementation, it supports following baudrate 9600, 19200, 38400, 57600 and 115200. +config STM32X7_SERIAL + bool "STMicroelectronics STM32 SoCs on-chip UART" + depends on DM_SERIAL && STM32F7 + help + If you have a machine based on a STM32 F7 you can enable its + onboard serial ports, say Y to this option. If unsure, say N. + config MPC8XX_CONS bool "Console driver for MPC8XX" depends on 8xx diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 4e0edcb..daf3235 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -32,7 +32,6 @@ #define CONFIG_ENV_SIZE (8 << 10) #define CONFIG_STM32_FLASH -#define CONFIG_STM32X7_SERIAL #define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8) #define CONFIG_DW_ALTDESCRIPTOR diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 54eee53..c92ac7b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2352,7 +2352,6 @@ CONFIG_STATIC_BOARD_REV CONFIG_STATIC_RELA CONFIG_STD_DEVICES_SETTINGS CONFIG_STM32F4DISCOVERY -CONFIG_STM32X7_SERIAL CONFIG_STM32_FLASH CONFIG_STM32_GPIO CONFIG_STM32_HSE_HZ