| Message ID | 1498641898-9134-1-git-send-email-hs@denx.de |
|---|---|
| State | Accepted |
| Commit | be2787bf29a066e603235a694325ce74426043b4 |
| Delegated to: | Tom Rini |
| Headers | show |
On 2017/6/28 17:24, Heiko Schocher wrote: > since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support" > > taurus board comes not up anymore. Fix it. > > Signed-off-by: Heiko Schocher <hs@denx.de> Thank you. Acked-by: Wenyou Yang <wenyou.yang@microchip.com> > --- > > arch/arm/dts/at91sam9g20-taurus.dts | 2 ++ > board/siemens/taurus/taurus.c | 9 --------- > configs/taurus_defconfig | 3 +++ > 3 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts > index f27d772..7931c0a 100644 > --- a/arch/arm/dts/at91sam9g20-taurus.dts > +++ b/arch/arm/dts/at91sam9g20-taurus.dts > @@ -18,6 +18,7 @@ > compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9"; > > chosen { > + u-boot,dm-pre-reloc; > stdout-path = &dbgu; > }; > > @@ -48,6 +49,7 @@ > }; > > dbgu: serial@fffff200 { > + u-boot,dm-pre-reloc; > status = "okay"; > }; > > diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c > index 8da24be..4aa8d64 100644 > --- a/board/siemens/taurus/taurus.c > +++ b/board/siemens/taurus/taurus.c > @@ -448,12 +448,3 @@ U_BOOT_CMD( > ); > #endif > #endif > - > -static struct atmel_serial_platdata at91sam9260_serial_plat = { > - .base_addr = ATMEL_BASE_DBGU, > -}; > - > -U_BOOT_DEVICE(at91sam9260_serial) = { > - .name = "serial_atmel", > - .platdata = &at91sam9260_serial_plat, > -}; > diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig > index 2de9cad..70d44a7 100644 > --- a/configs/taurus_defconfig > +++ b/configs/taurus_defconfig > @@ -7,6 +7,7 @@ CONFIG_TARGET_TAURUS=y > CONFIG_SPL_GPIO_SUPPORT=y > CONFIG_SPL_LIBCOMMON_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > +CONFIG_SYS_MALLOC_F_LEN=0x1000 > CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_SPL_NAND_SUPPORT=y > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -36,6 +37,8 @@ CONFIG_CMD_PING=y > # CONFIG_DOS_PARTITION is not set > CONFIG_OF_CONTROL=y > CONFIG_OF_EMBED=y > +CONFIG_CLK=y > +CONFIG_CLK_AT91=y > CONFIG_DFU_NAND=y > # CONFIG_MMC is not set > CONFIG_SPI_FLASH=y Best Regards, Wenyou Yang
On Wed, Jun 28, 2017 at 11:24:58AM +0200, Heiko Schocher wrote: > since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support" > > taurus board comes not up anymore. Fix it. > > Signed-off-by: Heiko Schocher <hs@denx.de> > Acked-by: Wenyou Yang <wenyou.yang@microchip.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts index f27d772..7931c0a 100644 --- a/arch/arm/dts/at91sam9g20-taurus.dts +++ b/arch/arm/dts/at91sam9g20-taurus.dts @@ -18,6 +18,7 @@ compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9"; chosen { + u-boot,dm-pre-reloc; stdout-path = &dbgu; }; @@ -48,6 +49,7 @@ }; dbgu: serial@fffff200 { + u-boot,dm-pre-reloc; status = "okay"; }; diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c index 8da24be..4aa8d64 100644 --- a/board/siemens/taurus/taurus.c +++ b/board/siemens/taurus/taurus.c @@ -448,12 +448,3 @@ U_BOOT_CMD( ); #endif #endif - -static struct atmel_serial_platdata at91sam9260_serial_plat = { - .base_addr = ATMEL_BASE_DBGU, -}; - -U_BOOT_DEVICE(at91sam9260_serial) = { - .name = "serial_atmel", - .platdata = &at91sam9260_serial_plat, -}; diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 2de9cad..70d44a7 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_TAURUS=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y @@ -36,6 +37,8 @@ CONFIG_CMD_PING=y # CONFIG_DOS_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_CLK=y +CONFIG_CLK_AT91=y CONFIG_DFU_NAND=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y
since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support" taurus board comes not up anymore. Fix it. Signed-off-by: Heiko Schocher <hs@denx.de> --- arch/arm/dts/at91sam9g20-taurus.dts | 2 ++ board/siemens/taurus/taurus.c | 9 --------- configs/taurus_defconfig | 3 +++ 3 files changed, 5 insertions(+), 9 deletions(-)