Skip to contentSkip to conversation

ARM: s32v234evb: Set CONFIG_DM & CONFIG_DM_SERIAL in Kconfig

PATCH New Tuomas Tynkkynen 2 participants 4 messages Apr 9, 2018 – Apr 28, 2018

lore
Share & tools
lore

Tuomas Tynkkynen

author
#0 lore raw

PATCH 1/2 ARM: s32v234evb: Set CONFIG_DM & CONFIG_DM_SERIAL in Kconfig

These symbols are declared in Kconfig, so it's wrong to set them in header files.

Note that this is not size-neutral - some 'default y' options will now get turned on by Kconfig, such as CONFIG_CMD_DM=y and CONFIG_DM_STDIO=y.

Signed-off-by Tuomas Tynkkynen <[email protected]>
---
 configs/s32v234evb_defconfig | 3 ++-
 include/configs/s32v234evb.h | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)
configs/s32v234evb_defconfig +2 -1
index a28d24ce0b..5d98d15324 100644
@@ -2,11 +2,12 @@ CONFIG_ARM=y
 CONFIG_TARGET_S32V234EVB=y
 CONFIG_SYS_TEXT_BASE=0x3E800000
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_MALLOC_F=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/s32v234evb/s32v234evb.cfg"
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyLF0 root=/dev/ram rw"
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_DM=y
+CONFIG_DM_SERIAL=y
 CONFIG_OF_LIBFDT=y
include/configs/s32v234evb.h +0 -2
index 4dc098b828..e5265a7362 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/imx-regs.h>
 
 #define CONFIG_S32V234
-#define CONFIG_DM
 
 /* Config GIC */
 #define CONFIG_GICV2

@@ -58,7 +57,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 #endif
 
-#define CONFIG_DM_SERIAL
 #define CONFIG_FSL_LINFLEXUART
 #define LINFLEXUART_BASE		LINFLEXD0_BASE_ADDR
Signature · 1 line
2.16.3
author
#1 lore raw

PATCH 2/2 serial: Migrate CONFIG_FSL_LINFLEXUART to Kconfig

Signed-off-by Tuomas Tynkkynen <[email protected]>
---
 configs/s32v234evb_defconfig        | 1 +
 drivers/serial/Kconfig              | 7 +++++++
 drivers/serial/serial_linflexuart.c | 4 ----
 include/configs/s32v234evb.h        | 1 -
 scripts/config_whitelist.txt        | 1 -
 5 files changed, 8 insertions(+), 6 deletions(-)
configs/s32v234evb_defconfig +1 -0
index 5d98d15324..77e6faf146 100644
@@ -10,4 +10,5 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
+CONFIG_FSL_LINFLEXUART=y
 CONFIG_OF_LIBFDT=y
drivers/serial/Kconfig +7 -0
index 975e6d3d58..c32e46a0f8 100644
@@ -466,6 +466,13 @@ config BCM6345_SERIAL
 	help
 	  Select this to enable UART on BCM6345 SoCs.
 
+config FSL_LINFLEXUART
+	bool "Freescale Linflex UART support"
+	depends on DM_SERIAL
+	help
+	  Select this to enable the Linflex serial module found on some
+	  NXP SoCs like S32V234.
+
 config FSL_LPUART
 	bool "Freescale LPUART support"
 	help
drivers/serial/serial_linflexuart.c +0 -4
index fbb39592d6..b706fdb398 100644
@@ -35,10 +35,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_DM_SERIAL
-#error "The linflex serial driver does not have non-DM support."
-#endif
-
 static void _linflex_serial_setbrg(struct linflex_fsl *base, int baudrate)
 {
 	u32 clk = mxc_get_clock(MXC_UART_CLK);
include/configs/s32v234evb.h +0 -1
index e5265a7362..7aa1e88a27 100644
@@ -57,7 +57,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 #endif
 
-#define CONFIG_FSL_LINFLEXUART
 #define LINFLEXUART_BASE		LINFLEXD0_BASE_ADDR
 
 #define CONFIG_DEBUG_UART_LINFLEXUART
scripts/config_whitelist.txt +0 -1
index 843e98124f..a281c12e17 100644
@@ -680,7 +680,6 @@ CONFIG_FSL_IIM
 CONFIG_FSL_ISBC_KEY_EXT
 CONFIG_FSL_LAYERSCAPE
 CONFIG_FSL_LBC
-CONFIG_FSL_LINFLEXUART
 CONFIG_FSL_MC9SDZ60
 CONFIG_FSL_MEMAC
 CONFIG_FSL_NGPIXIS
Signature · 1 line
2.16.3
#2 lore raw

PATCH 2/2 serial: Migrate CONFIG_FSL_LINFLEXUART to Kconfig

Quoted 1 line · Tuomas Tynkkynen
Signed-off-by Tuomas Tynkkynen <[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/20180428/528c3061/attachment.sig>
#3 lore raw

PATCH 1/2 ARM: s32v234evb: Set CONFIG_DM & CONFIG_DM_SERIAL in Kconfig

In reply to Tuomas Tynkkynen
Quoted 7 lines · Tuomas Tynkkynen

These symbols are declared in Kconfig, so it's wrong to set them in header files.

Note that this is not size-neutral - some 'default y' options will now get turned on by Kconfig, such as CONFIG_CMD_DM=y and CONFIG_DM_STDIO=y.

Signed-off-by Tuomas Tynkkynen <[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/20180428/dcaab51d/attachment.sig>