Rename serial_stm32x7.c to serial_stm32.c
Subsystems (3)
cover Rename serial_stm32x7.c to serial_stm32.c
From: Patrice Chotard <[email protected]>
As driver serial_stm32x7.c is used by all STM32 SoCs family (F4/F7 and H7) rename it with the generic name serial_stm32.c
Move also some flags from defconfig to stm32 machine Kconfig
Patrice Chotard (2):
serial: stm32: Rename serial_stm32x7.c to serial_stm32.c
configs: stm32: move config flag from defconfig to Kconfig
arch/arm/mach-stm32/Kconfig | 24 +++++++++++++++++++++-
configs/stm32f429-discovery_defconfig | 11 ----------
configs/stm32f469-discovery_defconfig | 11 ----------
configs/stm32f746-disco_defconfig | 11 ----------
drivers/serial/Kconfig | 2 +-
drivers/serial/Makefile | 2 +-
.../serial/{serial_stm32x7.c => serial_stm32.c} | 4 ++--
.../serial/{serial_stm32x7.h => serial_stm32.h} | 4 ++--
8 files changed, 29 insertions(+), 40 deletions(-)
rename drivers/serial/{serial_stm32x7.c => serial_stm32.c} (98%)
rename drivers/serial/{serial_stm32x7.h => serial_stm32.h} (97%)Signature · 1 line
1.9.1
PATCH 1/2 serial: stm32: Rename serial_stm32x7.c to serial_stm32.c
From: Patrice Chotard <[email protected]>
Now this driver is used across stm32f4, stm32f7 and stm32h7 SoCs family, give it a generic name.
---
arch/arm/mach-stm32/Kconfig | 2 +-
configs/stm32f429-discovery_defconfig | 2 +-
configs/stm32f469-discovery_defconfig | 2 +-
configs/stm32f746-disco_defconfig | 2 +-
drivers/serial/Kconfig | 2 +-
drivers/serial/Makefile | 2 +-
drivers/serial/{serial_stm32x7.c => serial_stm32.c} | 4 ++--
drivers/serial/{serial_stm32x7.h => serial_stm32.h} | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
rename drivers/serial/{serial_stm32x7.c => serial_stm32.c} (98%)
rename drivers/serial/{serial_stm32x7.h => serial_stm32.h} (97%)arch/arm/mach-stm32/Kconfig +1 -1
@@ -38,7 +38,7 @@ config STM32H7 select STM32_SDRAM select STM32_RCC select STM32_RESET - select STM32X7_SERIAL + select STM32_SERIAL select SYSCON source "arch/arm/mach-stm32/stm32f4/Kconfig"
configs/stm32f429-discovery_defconfig +1 -1
@@ -31,4 +31,4 @@ CONFIG_RAM=y CONFIG_STM32_SDRAM=y CONFIG_DM_RESET=y CONFIG_STM32_RESET=y -CONFIG_STM32X7_SERIAL=y +CONFIG_STM32_SERIAL=y
configs/stm32f469-discovery_defconfig +1 -1
@@ -39,4 +39,4 @@ CONFIG_RAM=y CONFIG_STM32_SDRAM=y CONFIG_DM_RESET=y CONFIG_STM32_RESET=y -CONFIG_STM32X7_SERIAL=y +CONFIG_STM32_SERIAL=y
configs/stm32f746-disco_defconfig +1 -1
@@ -60,7 +60,7 @@ CONFIG_RAM=y CONFIG_STM32_SDRAM=y CONFIG_DM_RESET=y CONFIG_STM32_RESET=y -CONFIG_STM32X7_SERIAL=y +CONFIG_STM32_SERIAL=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=y
drivers/serial/Kconfig +1 -1
@@ -529,7 +529,7 @@ 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 +config STM32_SERIAL bool "STMicroelectronics STM32 SoCs on-chip UART" depends on DM_SERIAL && (STM32F4 || STM32F7 || STM32H7) help
drivers/serial/Makefile +1 -1
@@ -44,7 +44,7 @@ obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o -obj-$(CONFIG_STM32X7_SERIAL) += serial_stm32x7.o +obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o
drivers/serial/serial_stm32.c renamed from drivers/serial/serial_stm32x7.c +2 -2
@@ -11,7 +11,7 @@#include <asm/io.h> #include <serial.h> #include <asm/arch/stm32.h> -#include "serial_stm32x7.h" +#include "serial_stm32.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -148,7 +148,7 @@ static const struct dm_serial_ops stm32_serial_ops = { };U_BOOT_DRIVER (serial_stm32) = { - .name ="serial_stm32x7" , + .name ="serial_stm32" , .id =UCLASS_SERIAL , .of_match =of_match_ptr (stm32_serial_id), .ofdata_to_platdata =of_match_ptr (stm32_serial_ofdata_to_platdata),
drivers/serial/serial_stm32.h renamed from drivers/serial/serial_stm32x7.h +2 -2
@@ -5,8 +5,8 @@* SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _SERIAL_STM32_X7_ -#define _SERIAL_STM32_X7_ +#ifndef _SERIAL_STM32_ +#define _SERIAL_STM32_#define CR1_OFFSET (x) (x ? 0x0c : 0x00)#define CR3_OFFSET (x) (x ? 0x14 : 0x08)
Signature · 1 line
1.9.1
PATCH 1/2 serial: stm32: Rename serial_stm32x7.c to serial_stm32.c
Hi,
Quoted 6 lines · patrice.chotard at st.com
From: Patrice Chotard <[email protected]>
Now this driver is used across stm32f4, stm32f7 and stm32h7 SoCs family, give it a generic name.
Signed-off-by Patrice Chotard <[email protected]>
Cheers,
Vikas
Quoted 129 lines
--- arch/arm/mach-stm32/Kconfig | 2 +- configs/stm32f429-discovery_defconfig | 2 +- configs/stm32f469-discovery_defconfig | 2 +- configs/stm32f746-disco_defconfig | 2 +- drivers/serial/Kconfig | 2 +- drivers/serial/Makefile | 2 +- drivers/serial/{serial_stm32x7.c => serial_stm32.c} | 4 ++-- drivers/serial/{serial_stm32x7.h => serial_stm32.h} | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) rename drivers/serial/{serial_stm32x7.c => serial_stm32.c} (98%) rename drivers/serial/{serial_stm32x7.h => serial_stm32.h} (97%)arch/arm/mach-stm32/Kconfig +1
-1@@ -38,7 +38,7 @@ config STM32H7 select STM32_SDRAM select STM32_RCC select STM32_RESET - select STM32X7_SERIAL + select STM32_SERIAL select SYSCON source "arch/arm/mach-stm32/stm32f4/Kconfig"configs/stm32f429-discovery_defconfig +1
-1@@ -31,4 +31,4 @@ CONFIG_RAM=y CONFIG_STM32_SDRAM=y CONFIG_DM_RESET=y CONFIG_STM32_RESET=y -CONFIG_STM32X7_SERIAL=y +CONFIG_STM32_SERIAL=yconfigs/stm32f469-discovery_defconfig +1
-1@@ -39,4 +39,4 @@ CONFIG_RAM=y CONFIG_STM32_SDRAM=y CONFIG_DM_RESET=y CONFIG_STM32_RESET=y -CONFIG_STM32X7_SERIAL=y +CONFIG_STM32_SERIAL=yconfigs/stm32f746-disco_defconfig +1
-1@@ -60,7 +60,7 @@ CONFIG_RAM=y CONFIG_STM32_SDRAM=y CONFIG_DM_RESET=y CONFIG_STM32_RESET=y -CONFIG_STM32X7_SERIAL=y +CONFIG_STM32_SERIAL=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=ydrivers/serial/Kconfig +1
-1@@ -529,7 +529,7 @@ 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 +config STM32_SERIAL bool "STMicroelectronics STM32 SoCs on-chip UART" depends on DM_SERIAL && (STM32F4 || STM32F7 || STM32H7) helpdrivers/serial/Makefile +1
-1@@ -44,7 +44,7 @@ obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_STI_ASC_SERIAL) += serial_sti_asc.o obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o -obj-$(CONFIG_STM32X7_SERIAL) += serial_stm32x7.o +obj-$(CONFIG_STM32_SERIAL) += serial_stm32.o obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.odrivers/serial/serial_stm32.c renamed from drivers/serial/serial_stm32x7.c +2
-2@@ -11,7 +11,7 @@#include <asm/io.h> #include <serial.h> #include <asm/arch/stm32.h> -#include "serial_stm32x7.h" +#include "serial_stm32.h" DECLARE_GLOBAL_DATA_PTR ;@@ -148,7 +148,7 @@ static const struct dm_serial_ops stm32_serial_ops = { };U_BOOT_DRIVER (serial_stm32) = { - .name ="serial_stm32x7" , + .name ="serial_stm32" , .id =UCLASS_SERIAL , .of_match =of_match_ptr (stm32_serial_id), .ofdata_to_platdata =of_match_ptr (stm32_serial_ofdata_to_platdata),drivers/serial/serial_stm32.h renamed from drivers/serial/serial_stm32x7.h +2
-2@@ -5,8 +5,8 @@* SPDX-License-Identifier: GPL-2.0+ */ -#ifndef _SERIAL_STM32_X7_ -#define _SERIAL_STM32_X7_ +#ifndef _SERIAL_STM32_ +#define _SERIAL_STM32_#define CR1_OFFSET (x) (x ? 0x0c : 0x00)#define CR3_OFFSET (x) (x ? 0x14 : 0x08)
PATCH 1/2 serial: stm32: Rename serial_stm32x7.c to serial_stm32.c
In reply to patrice.chotard at st.comQuoted 7 lines · patrice.chotard at st.com
From: Patrice Chotard <[email protected]>
Now this driver is used across stm32f4, stm32f7 and stm32h7 SoCs family, give it a generic name.
Signed-off-by Patrice Chotard <[email protected]>Reviewed-by Vikas Manocha <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180119/233f9b97/attachment.sig>
PATCH 2/2 configs: stm32: move config flag from defconfig to Kconfig
In reply to patrice.chotard at st.comFrom: Patrice Chotard <[email protected]>
Move system flags from defconfig to mach-stm32/Kconfig
--- arch/arm/mach-stm32/Kconfig | 22 ++++++++++++++++++++++ configs/stm32f429-discovery_defconfig | 11 ----------- configs/stm32f469-discovery_defconfig | 11 ----------- configs/stm32f746-disco_defconfig | 11 ----------- 4 files changed, 22 insertions(+), 33 deletions(-)
arch/arm/mach-stm32/Kconfig +22 -0
@@ -2,9 +2,31 @@ if STM32 config STM32F4 bool "stm32f4 family" + select CLK + select DM_GPIO + select DM_RESET + select MISC + select PINCTRL + select PINCTRL_STM32 + select RAM + select STM32_SDRAM + select STM32_RCC + select STM32_RESET + select STM32_SERIAL config STM32F7 bool "stm32f7 family" + select CLK + select DM_GPIO + select DM_RESET + select MISC + select PINCTRL + select PINCTRL_STM32 + select RAM + select STM32_SDRAM + select STM32_RCC + select STM32_RESET + select STM32_SERIAL select SUPPORT_SPL select SPL select SPL_CLK
configs/stm32f429-discovery_defconfig +0 -11
@@ -19,16 +19,5 @@ CONFIG_CMD_TIMER=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_FLASH=y -CONFIG_CLK=y -CONFIG_DM_GPIO=y -CONFIG_MISC=y -CONFIG_STM32_RCC=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_RESET=y -CONFIG_STM32_RESET=y -CONFIG_STM32_SERIAL=y
configs/stm32f469-discovery_defconfig +0 -11
@@ -26,17 +26,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y # CONFIG_BLK is not set -CONFIG_CLK=y -CONFIG_DM_GPIO=y -CONFIG_MISC=y -CONFIG_STM32_RCC=y CONFIG_DM_MMC=y CONFIG_ARM_PL180_MMCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_RESET=y -CONFIG_STM32_RESET=y -CONFIG_STM32_SERIAL=y
configs/stm32f746-disco_defconfig +0 -11
@@ -39,10 +39,6 @@ CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y # CONFIG_BLK is not set -CONFIG_CLK=y -CONFIG_DM_GPIO=y -CONFIG_MISC=y -CONFIG_STM32_RCC=y CONFIG_DM_MMC=y # CONFIG_SPL_DM_MMC is not set CONFIG_ARM_PL180_MMCI=y
@@ -53,14 +49,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y -CONFIG_PINCTRL=y # CONFIG_PINCTRL_FULL is not set -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_RESET=y -CONFIG_STM32_RESET=y -CONFIG_STM32_SERIAL=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
1.9.1
PATCH 2/2 configs: stm32: move config flag from defconfig to Kconfig
Hi,
Quoted 5 lines · patrice.chotard at st.com
From: Patrice Chotard <[email protected]>
Move system flags from defconfig to mach-stm32/Kconfig
Signed-off-by Patrice Chotard <[email protected]>
One comment below
Quoted 30 lines
--- arch/arm/mach-stm32/Kconfig | 22 ++++++++++++++++++++++ configs/stm32f429-discovery_defconfig | 11 ----------- configs/stm32f469-discovery_defconfig | 11 ----------- configs/stm32f746-disco_defconfig | 11 ----------- 4 files changed, 22 insertions(+), 33 deletions(-)arch/arm/mach-stm32/Kconfig +12
-0@@ -2,9 +2,31 @@ if STM32 config STM32F4 bool "stm32f4 family" + select CLK + select DM_GPIO + select DM_RESET + select MISC + select PINCTRL + select PINCTRL_STM32 + select RAM + select STM32_SDRAM + select STM32_RCC + select STM32_RESET + select STM32_SERIAL config STM32F7 bool "stm32f7 family" + select CLK
arch/arm/mach-stm32/Kconfig if STM32 · line 29
Quoted 10 lines
arch/arm/mach-stm32/Kconfig +10
-0+ select DM_GPIO + select DM_RESET + select MISC + select PINCTRL + select PINCTRL_STM32 + select RAM + select STM32_SDRAM + select STM32_RCC + select STM32_RESET + select STM32_SERIAL
Can you have one common selection(like STM32_SERIAL) like under 'if STM32'.
Cheers,
Vikas
Quoted 77 lines
arch/arm/mach-stm32/Kconfig +0
-0select SUPPORT_SPL select SPL select SPL_CLKconfigs/stm32f429-discovery_defconfig +0
-11@@ -19,16 +19,5 @@ CONFIG_CMD_TIMER=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_ENV_IS_IN_FLASH=y -CONFIG_CLK=y -CONFIG_DM_GPIO=y -CONFIG_MISC=y -CONFIG_STM32_RCC=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_RESET=y -CONFIG_STM32_RESET=y -CONFIG_STM32_SERIAL=yconfigs/stm32f469-discovery_defconfig +0
-11@@ -26,17 +26,6 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y # CONFIG_BLK is not set -CONFIG_CLK=y -CONFIG_DM_GPIO=y -CONFIG_MISC=y -CONFIG_STM32_RCC=y CONFIG_DM_MMC=y CONFIG_ARM_PL180_MMCI=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_RESET=y -CONFIG_STM32_RESET=y -CONFIG_STM32_SERIAL=yconfigs/stm32f746-disco_defconfig +0
-11@@ -39,10 +39,6 @@ CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y # CONFIG_BLK is not set -CONFIG_CLK=y -CONFIG_DM_GPIO=y -CONFIG_MISC=y -CONFIG_STM32_RCC=y CONFIG_DM_MMC=y # CONFIG_SPL_DM_MMC is not set CONFIG_ARM_PL180_MMCI=y@@ -53,14 +49,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y -CONFIG_PINCTRL=y # CONFIG_PINCTRL_FULL is not set -CONFIG_PINCTRL_STM32=y -CONFIG_RAM=y -CONFIG_STM32_SDRAM=y -CONFIG_DM_RESET=y -CONFIG_STM32_RESET=y -CONFIG_STM32_SERIAL=y CONFIG_DM_SPI=y CONFIG_STM32_QSPI=y CONFIG_OF_LIBFDT_OVERLAY=y
PATCH 2/2 configs: stm32: move config flag from defconfig to Kconfig
In reply to patrice.chotard at st.comQuoted 6 lines · patrice.chotard at st.com
From: Patrice Chotard <[email protected]>
Move system flags from defconfig to mach-stm32/Kconfig
Signed-off-by Patrice Chotard <[email protected]>Reviewed-by Vikas Manocha <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180119/2889b730/attachment.sig>