[U-Boot] [PATCH v2 2/2] atmel, at91: fix smartweb board

[Yang, Wenyou]

On 2017/6/24 2:13, Heiko Schocher wrote:
> since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support"
>
> smartweb board comes not up anymore. Fix it.
>
> Signed-off-by: Heiko Schocher <hs at denx.de>

Acked-by: Wenyou Yang <wenyou.yang at microchip.com>
> ---
>
> Changes in v2: None
>
>   arch/arm/dts/at91sam9260-smartweb.dts | 2 ++
>   board/siemens/smartweb/smartweb.c     | 9 ---------
>   configs/smartweb_defconfig            | 3 +++
>   include/configs/smartweb.h            | 3 +++
>   4 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/dts/at91sam9260-smartweb.dts b/arch/arm/dts/at91sam9260-smartweb.dts
> index faed763..e59781b 100644
> --- a/arch/arm/dts/at91sam9260-smartweb.dts
> +++ b/arch/arm/dts/at91sam9260-smartweb.dts
> @@ -18,6 +18,7 @@
>   	compatible = "atmel,at91sam9260", "atmel,at91sam9";
>   
>   	chosen {
> +		u-boot,dm-pre-reloc;
>   		stdout-path = &dbgu;
>   	};
>   
> @@ -48,6 +49,7 @@
>   			};
>   
>   			dbgu: serial at fffff200 {
> +				u-boot,dm-pre-reloc;
>   				status = "okay";
>   			};
>   
> diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
> index 78a7946..718ccc7 100644
> --- a/board/siemens/smartweb/smartweb.c
> +++ b/board/siemens/smartweb/smartweb.c
> @@ -256,12 +256,3 @@ void mem_init(void)
>   	sdramc_initialize(ATMEL_BASE_CS1, &setting);
>   }
>   #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/smartweb_defconfig b/configs/smartweb_defconfig
> index 48c8781..a769fc5 100644
> --- a/configs/smartweb_defconfig
> +++ b/configs/smartweb_defconfig
> @@ -7,6 +7,7 @@ CONFIG_TARGET_SMARTWEB=y
>   CONFIG_SPL_GPIO_SUPPORT=y
>   CONFIG_SPL_LIBCOMMON_SUPPORT=y
>   CONFIG_SPL_LIBGENERIC_SUPPORT=y
> +CONFIG_SYS_MALLOC_F_LEN=0x2000
>   CONFIG_SPL_NAND_SUPPORT=y
>   CONFIG_DEFAULT_DEVICE_TREE="at91sam9260-smartweb"
>   CONFIG_FIT=y
> @@ -33,6 +34,8 @@ CONFIG_CMD_FAT=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_USB=y
> diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
> index 1236da7..8400278 100644
> --- a/include/configs/smartweb.h
> +++ b/include/configs/smartweb.h
> @@ -211,6 +211,9 @@
>   #define CONFIG_SYS_INIT_SP_ADDR		0x301000
>   #define CONFIG_SPL_STACK_R
>   #define CONFIG_SPL_STACK_R_ADDR		CONFIG_SYS_TEXT_BASE
> +/* we have only 4k sram in SPL, so cut SYS_MALLOC_F_LEN */
> +#undef CONFIG_SYS_MALLOC_F_LEN
> +#define CONFIG_SYS_MALLOC_F_LEN 0x400
>   #else
>   /*
>    * Initial stack pointer: 4k - GENERATED_GBL_DATA_SIZE in internal SRAM,

Best Regards,
Wenyou Yang