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

stm32mp: fix compilation issue with DEBUG_UART 

Fix the compilation issue when CONFIG_DEBUG_UART is activated

 drivers/serial/serial_stm32.o: in function `debug_uart_init':
 drivers/serial/serial_stm32.c:291: undefined reference to \
    `board_debug_uart_init'

The board_debug_uart_init is needed for SPL boot, called in
cpu.c::mach_cpu_init(); it is defined in board/st/stm32mp1/spl.c.

But with the removal #ifdefs patch, the function debug_uart_init() is
always compiled even if not present in the final U-Boot image.

This patch adds a file to provided this function when DEBUG_UART and SPL
are activated.

Fixes: c8b2eef52b ("stm32mp15: tidy up #ifdefs in cpu.c")
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
This commit is contained in:
Patrick Delaunay 2022-10-11 16:44:26 +02:00 committed by Patrice Chotard
parent 637a370251
commit c37a668481
6 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-stm32mp/Kconfig.15x
View File

@ -117,7 +117,7 @@ endif
if DEBUG_UART if DEBUG_UART
config DEBUG_UART_BOARD_INIT config DEBUG_UART_BOARD_INIT
default y default y if SPL
# debug on UART4 by default # debug on UART4 by default
config DEBUG_UART_BASE config DEBUG_UART_BASE

2
board/engicam/stm32mp1/Makefile
View File

@ -8,3 +8,5 @@ obj-y += spl.o
else else
obj-y += stm32mp1.o obj-y += stm32mp1.o
endif endif
obj-$(CONFIG_DEBUG_UART_BOARD_INIT) += ../../st/stm32mp1/debug_uart.o

25
board/engicam/stm32mp1/spl.c
View File

@ -6,7 +6,6 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/io.h>
/* board early initialisation in board_f: need to use global variable */ /* board early initialisation in board_f: need to use global variable */
static u32 opp_voltage_mv __section(".data"); static u32 opp_voltage_mv __section(".data");
@ -22,27 +21,3 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_DEBUG_UART_BOARD_INIT
void board_debug_uart_init(void)
{
#if (CONFIG_DEBUG_UART_BASE == STM32_UART4_BASE)
#define RCC_MP_APB1ENSETR (STM32_RCC_BASE + 0x0A00)
#define RCC_MP_AHB4ENSETR (STM32_RCC_BASE + 0x0A28)
/* UART4 clock enable */
setbits_le32(RCC_MP_APB1ENSETR, BIT(16));
#define GPIOG_BASE 0x50008000
/* GPIOG clock enable */
writel(BIT(6), RCC_MP_AHB4ENSETR);
/* GPIO configuration for ST boards: Uart4 TX = G11 */
writel(0xffbfffff, GPIOG_BASE + 0x00);
writel(0x00006000, GPIOG_BASE + 0x24);
#else
#error("CONFIG_DEBUG_UART_BASE: not supported value")
#endif
}
#endif

2
board/st/stm32mp1/Makefile
View File

@ -8,3 +8,5 @@ obj-y += spl.o
else else
obj-y += stm32mp1.o obj-y += stm32mp1.o
endif endif
obj-$(CONFIG_DEBUG_UART_BOARD_INIT) += debug_uart.o

29
board/st/stm32mp1/debug_uart.c Normal file
View File

@ -0,0 +1,29 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
/*
* Copyright (C) 2022, STMicroelectronics - All Rights Reserved
*/
#include <config.h>
#include <debug_uart.h>
#include <asm/io.h>
#include <asm/arch/stm32.h>
#include <linux/bitops.h>
#define RCC_MP_APB1ENSETR (STM32_RCC_BASE + 0x0A00)
#define RCC_MP_AHB4ENSETR (STM32_RCC_BASE + 0x0A28)
#define GPIOG_BASE 0x50008000
void board_debug_uart_init(void)
{
if (CONFIG_DEBUG_UART_BASE == STM32_UART4_BASE) {
/* UART4 clock enable */
setbits_le32(RCC_MP_APB1ENSETR, BIT(16));
/* GPIOG clock enable */
writel(BIT(6), RCC_MP_AHB4ENSETR);
/* GPIO configuration for ST boards: Uart4 TX = G11 */
writel(0xffbfffff, GPIOG_BASE + 0x00);
writel(0x00006000, GPIOG_BASE + 0x24);
}
}

28
board/st/stm32mp1/spl.c
View File

@ -5,11 +5,7 @@
#include <config.h> #include <config.h>
#include <common.h> #include <common.h>
#include <init.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include "../common/stpmic1.h" #include "../common/stpmic1.h"
/* board early initialisation in board_f: need to use global variable */ /* board early initialisation in board_f: need to use global variable */
@ -29,27 +25,3 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_DEBUG_UART_BOARD_INIT
void board_debug_uart_init(void)
{
#if (CONFIG_DEBUG_UART_BASE == STM32_UART4_BASE)
#define RCC_MP_APB1ENSETR (STM32_RCC_BASE + 0x0A00)
#define RCC_MP_AHB4ENSETR (STM32_RCC_BASE + 0x0A28)
/* UART4 clock enable */
setbits_le32(RCC_MP_APB1ENSETR, BIT(16));
#define GPIOG_BASE 0x50008000
/* GPIOG clock enable */
writel(BIT(6), RCC_MP_AHB4ENSETR);
/* GPIO configuration for ST boards: Uart4 TX = G11 */
writel(0xffbfffff, GPIOG_BASE + 0x00);
writel(0x00006000, GPIOG_BASE + 0x24);
#else
#error("CONFIG_DEBUG_UART_BASE: not supported value")
#endif
}
#endif