| Message ID | 20170418073102.29990-4-wenyou.yang@atmel.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, The patches has been rebased on the master branch of u-boot-dm git tree Could you help take them? Best Regards, Wenyou Yang On 2017/4/18 15:31, Wenyou Yang wrote: > Enable the early debug UART to debug problems when an ICE or other > debug mechanism is not available. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v4: > - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree. > - Update the cover-letter. > - Add Reviewed-by tag. > > Changes in v3: > - Rebase on the master branch (22e10be45) of u-boot-dm git tree. > - Update the cover-letter > > Changes in v2: > - Add [PATCH]: board: at91sam9263ek: Enable early debug UART. > - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek. > > board/atmel/at91sam9263ek/at91sam9263ek.c | 13 +++++++++++++ > configs/at91sam9263ek_dataflash_cs0_defconfig | 6 ++++++ > configs/at91sam9263ek_dataflash_defconfig | 6 ++++++ > configs/at91sam9263ek_nandflash_defconfig | 6 ++++++ > configs/at91sam9263ek_norflash_boot_defconfig | 6 ++++++ > configs/at91sam9263ek_norflash_defconfig | 6 ++++++ > 6 files changed, 43 insertions(+) > > diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c > index 2aafafe35e..3de978311d 100644 > --- a/board/atmel/at91sam9263ek/at91sam9263ek.c > +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c > @@ -7,6 +7,7 @@ > */ > > #include <common.h> > +#include <debug_uart.h> > #include <linux/sizes.h> > #include <asm/arch/at91sam9263.h> > #include <asm/arch/at91sam9_smc.h> > @@ -176,10 +177,22 @@ void lcd_show_board_info(void) > #endif /* CONFIG_LCD_INFO */ > #endif > > +#ifdef CONFIG_DEBUG_UART_BOARD_INIT > +void board_debug_uart_init(void) > +{ > + at91_seriald_hw_init(); > +} > +#endif > + > +#ifdef CONFIG_BOARD_EARLY_INIT_F > int board_early_init_f(void) > { > +#ifdef CONFIG_DEBUG_UART > + debug_uart_init(); > +#endif > return 0; > } > +#endif > > int board_init(void) > { > diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig > index 701a49b115..02e91148ce 100644 > --- a/configs/at91sam9263ek_dataflash_cs0_defconfig > +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig > @@ -36,6 +36,12 @@ CONFIG_MACB=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_AT91=y > CONFIG_DM_SERIAL=y > +CONFIG_DEBUG_UART=y > +CONFIG_DEBUG_UART_ATMEL=y > +CONFIG_DEBUG_UART_BASE=0xffffee00 > +CONFIG_DEBUG_UART_CLOCK=100000000 > +CONFIG_DEBUG_UART_BOARD_INIT=y > +CONFIG_DEBUG_UART_ANNOUNCE=y > CONFIG_ATMEL_USART=y > CONFIG_USB=y > CONFIG_DM_USB=y > diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig > index 701a49b115..02e91148ce 100644 > --- a/configs/at91sam9263ek_dataflash_defconfig > +++ b/configs/at91sam9263ek_dataflash_defconfig > @@ -36,6 +36,12 @@ CONFIG_MACB=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_AT91=y > CONFIG_DM_SERIAL=y > +CONFIG_DEBUG_UART=y > +CONFIG_DEBUG_UART_ATMEL=y > +CONFIG_DEBUG_UART_BASE=0xffffee00 > +CONFIG_DEBUG_UART_CLOCK=100000000 > +CONFIG_DEBUG_UART_BOARD_INIT=y > +CONFIG_DEBUG_UART_ANNOUNCE=y > CONFIG_ATMEL_USART=y > CONFIG_USB=y > CONFIG_DM_USB=y > diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig > index 951f08d662..2ddcf2b714 100644 > --- a/configs/at91sam9263ek_nandflash_defconfig > +++ b/configs/at91sam9263ek_nandflash_defconfig > @@ -36,6 +36,12 @@ CONFIG_MACB=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_AT91=y > CONFIG_DM_SERIAL=y > +CONFIG_DEBUG_UART=y > +CONFIG_DEBUG_UART_ATMEL=y > +CONFIG_DEBUG_UART_BASE=0xffffee00 > +CONFIG_DEBUG_UART_CLOCK=100000000 > +CONFIG_DEBUG_UART_BOARD_INIT=y > +CONFIG_DEBUG_UART_ANNOUNCE=y > CONFIG_ATMEL_USART=y > CONFIG_USB=y > CONFIG_DM_USB=y > diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig > index 4f8d19b9b1..21480c5d07 100644 > --- a/configs/at91sam9263ek_norflash_boot_defconfig > +++ b/configs/at91sam9263ek_norflash_boot_defconfig > @@ -36,6 +36,12 @@ CONFIG_MACB=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_AT91=y > CONFIG_DM_SERIAL=y > +CONFIG_DEBUG_UART=y > +CONFIG_DEBUG_UART_ATMEL=y > +CONFIG_DEBUG_UART_BASE=0xffffee00 > +CONFIG_DEBUG_UART_CLOCK=100000000 > +CONFIG_DEBUG_UART_BOARD_INIT=y > +CONFIG_DEBUG_UART_ANNOUNCE=y > CONFIG_ATMEL_USART=y > CONFIG_MTD_NOR_FLASH=y > CONFIG_USB=y > diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig > index a39d096187..824c366c44 100644 > --- a/configs/at91sam9263ek_norflash_defconfig > +++ b/configs/at91sam9263ek_norflash_defconfig > @@ -36,6 +36,12 @@ CONFIG_MACB=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_AT91=y > CONFIG_DM_SERIAL=y > +CONFIG_DEBUG_UART=y > +CONFIG_DEBUG_UART_ATMEL=y > +CONFIG_DEBUG_UART_BASE=0xffffee00 > +CONFIG_DEBUG_UART_CLOCK=100000000 > +CONFIG_DEBUG_UART_BOARD_INIT=y > +CONFIG_DEBUG_UART_ANNOUNCE=y > CONFIG_ATMEL_USART=y > CONFIG_MTD_NOR_FLASH=y > CONFIG_USB=y
Hi Simon, The patches has been rebased on the master branch of u-boot-dm git tree Could you help take them? Best Regards, Wenyou Yang On 2017/4/18 15:31, Wenyou Yang wrote: > Enable the early debug UART to debug problems when an ICE or other > debug mechanism is not available. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v4: > - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree. > - Update the cover-letter. > - Add Reviewed-by tag. > > Changes in v3: > - Rebase on the master branch (22e10be45) of u-boot-dm git tree. > - Update the cover-letter > > Changes in v2: > - Add [PATCH]: board: at91sam9263ek: Enable early debug UART. > - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek. > > board/atmel/at91sam9263ek/at91sam9263ek.c | 13 +++++++++++++ > configs/at91sam9263ek_dataflash_cs0_defconfig | 6 ++++++ > configs/at91sam9263ek_dataflash_defconfig | 6 ++++++ > configs/at91sam9263ek_nandflash_defconfig | 6 ++++++ > configs/at91sam9263ek_norflash_boot_defconfig | 6 ++++++ > configs/at91sam9263ek_norflash_defconfig | 6 ++++++ > 6 files changed, 43 insertions(+) > Applied to u-boot-dm/next, thanks!
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 2aafafe35e..3de978311d 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <debug_uart.h> #include <linux/sizes.h> #include <asm/arch/at91sam9263.h> #include <asm/arch/at91sam9_smc.h> @@ -176,10 +177,22 @@ void lcd_show_board_info(void) #endif /* CONFIG_LCD_INFO */ #endif +#ifdef CONFIG_DEBUG_UART_BOARD_INIT +void board_debug_uart_init(void) +{ + at91_seriald_hw_init(); +} +#endif + +#ifdef CONFIG_BOARD_EARLY_INIT_F int board_early_init_f(void) { +#ifdef CONFIG_DEBUG_UART + debug_uart_init(); +#endif return 0; } +#endif int board_init(void) { diff --git a/configs/at91sam9263ek_dataflash_cs0_defconfig b/configs/at91sam9263ek_dataflash_cs0_defconfig index 701a49b115..02e91148ce 100644 --- a/configs/at91sam9263ek_dataflash_cs0_defconfig +++ b/configs/at91sam9263ek_dataflash_cs0_defconfig @@ -36,6 +36,12 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/at91sam9263ek_dataflash_defconfig b/configs/at91sam9263ek_dataflash_defconfig index 701a49b115..02e91148ce 100644 --- a/configs/at91sam9263ek_dataflash_defconfig +++ b/configs/at91sam9263ek_dataflash_defconfig @@ -36,6 +36,12 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/at91sam9263ek_nandflash_defconfig b/configs/at91sam9263ek_nandflash_defconfig index 951f08d662..2ddcf2b714 100644 --- a/configs/at91sam9263ek_nandflash_defconfig +++ b/configs/at91sam9263ek_nandflash_defconfig @@ -36,6 +36,12 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/at91sam9263ek_norflash_boot_defconfig b/configs/at91sam9263ek_norflash_boot_defconfig index 4f8d19b9b1..21480c5d07 100644 --- a/configs/at91sam9263ek_norflash_boot_defconfig +++ b/configs/at91sam9263ek_norflash_boot_defconfig @@ -36,6 +36,12 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y diff --git a/configs/at91sam9263ek_norflash_defconfig b/configs/at91sam9263ek_norflash_defconfig index a39d096187..824c366c44 100644 --- a/configs/at91sam9263ek_norflash_defconfig +++ b/configs/at91sam9263ek_norflash_defconfig @@ -36,6 +36,12 @@ CONFIG_MACB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_DM_SERIAL=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_ATMEL=y +CONFIG_DEBUG_UART_BASE=0xffffee00 +CONFIG_DEBUG_UART_CLOCK=100000000 +CONFIG_DEBUG_UART_BOARD_INIT=y +CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_MTD_NOR_FLASH=y CONFIG_USB=y