[PATCH] board: stm32mp1: remove board.c

Remove the file board/st/stm32mp1/board.c which is not more compiled since commit 156732cc8939 ("board: stm32mp1: move the function board_debug_uart_init in spl.c")
Fixes: 156732cc8939 ("board: stm32mp1: move the function board_debug_uart_init in spl.c") Signed-off-by: Patrick Delaunay patrick.delaunay@st.com --- Issue when initial patch [1] was applied:
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c deleted file mode 100644
[1] http://patchwork.ozlabs.org/project/uboot/patch/20200525101949.15944-10-patr...
board/st/stm32mp1/board.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 board/st/stm32mp1/board.c
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c deleted file mode 100644 index 00c61c2886..0000000000 --- a/board/st/stm32mp1/board.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -/* - * Copyright (C) 2018, STMicroelectronics - All Rights Reserved - */ - -#include <common.h> -#include <asm/io.h> -#include <linux/bitops.h> -#include <linux/delay.h> - -#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 EVAL board - * => Uart4 TX = G11 - */ - writel(0xffbfffff, GPIOG_BASE + 0x00); - writel(0x00006000, GPIOG_BASE + 0x24); -#else - -#error("CONFIG_DEBUG_UART_BASE: not supported value") - -#endif -} -#endif

Hi Patrick
On 7/30/20 1:57 PM, Patrick Delaunay wrote:
Remove the file board/st/stm32mp1/board.c which is not more compiled since commit 156732cc8939 ("board: stm32mp1: move the function board_debug_uart_init in spl.c")
Fixes: 156732cc8939 ("board: stm32mp1: move the function board_debug_uart_init in spl.c") Signed-off-by: Patrick Delaunay patrick.delaunay@st.com
Issue when initial patch [1] was applied:
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c deleted file mode 100644
[1] http://patchwork.ozlabs.org/project/uboot/patch/20200525101949.15944-10-patr...
board/st/stm32mp1/board.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 board/st/stm32mp1/board.c
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c deleted file mode 100644 index 00c61c2886..0000000000 --- a/board/st/stm32mp1/board.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -/*
- Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- */
-#include <common.h> -#include <asm/io.h> -#include <linux/bitops.h> -#include <linux/delay.h>
-#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 EVAL board
* => Uart4 TX = G11
*/
- writel(0xffbfffff, GPIOG_BASE + 0x00);
- writel(0x00006000, GPIOG_BASE + 0x24);
-#else
-#error("CONFIG_DEBUG_UART_BASE: not supported value")
-#endif -} -#endif
Reviewed-by: Patrice Chotard patrice.chotard@st.com
Thanks
Patrice

This patch doesn't apply correctly and the sha1 was not the correct one. Nevertheless i update it and applied it on u-boot-stm/master
Thanks
patrice
On 8/13/20 9:45 AM, Patrice CHOTARD wrote:
Hi Patrick
On 7/30/20 1:57 PM, Patrick Delaunay wrote:
Remove the file board/st/stm32mp1/board.c which is not more compiled since commit 156732cc8939 ("board: stm32mp1: move the function board_debug_uart_init in spl.c")
Fixes: 156732cc8939 ("board: stm32mp1: move the function board_debug_uart_init in spl.c") Signed-off-by: Patrick Delaunay patrick.delaunay@st.com
Issue when initial patch [1] was applied:
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c deleted file mode 100644
[1] http://patchwork.ozlabs.org/project/uboot/patch/20200525101949.15944-10-patr...
board/st/stm32mp1/board.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 board/st/stm32mp1/board.c
diff --git a/board/st/stm32mp1/board.c b/board/st/stm32mp1/board.c deleted file mode 100644 index 00c61c2886..0000000000 --- a/board/st/stm32mp1/board.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -/*
- Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- */
-#include <common.h> -#include <asm/io.h> -#include <linux/bitops.h> -#include <linux/delay.h>
-#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 EVAL board
* => Uart4 TX = G11
*/
- writel(0xffbfffff, GPIOG_BASE + 0x00);
- writel(0x00006000, GPIOG_BASE + 0x24);
-#else
-#error("CONFIG_DEBUG_UART_BASE: not supported value")
-#endif -} -#endif
Reviewed-by: Patrice Chotard patrice.chotard@st.com
Thanks
Patrice _______________________________________________ Uboot-stm32 mailing list Uboot-stm32@st-md-mailman.stormreply.com https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
participants (2)
-
Patrice CHOTARD
-
Patrick Delaunay