[U-Boot] [PATCH 1/2] omap3_beagle: Update for DM SPL support

[Derald D. Woods <woods.technical@gmail.com>]

On Sat, Feb 16, 2019 at 04:36:29PM -0500, Tom Rini wrote:
> - Switch to using the omap3-u-boot.dtsi file for needed properties.
> - Remove a few SPL features to free up more SRAM space.
> - Switch CONFIG_SYS_TEXT_BASE to the normal default, we don't need to
>   worry about X-Loader at this point anymore.
> - A few related updates to SPL options as part of switching to DM SPL.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>


For BeagleBoard (Rev. C4) and BeagleBoard-xM (Rev. C):

Tested-by: Derald D. Woods <woods.technical@gmail.com>


> ---
>  arch/arm/dts/omap3-beagle-u-boot.dtsi       | 14 ++------------
>  arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi | 14 ++------------
>  arch/arm/dts/omap3-beagle-xm-u-boot.dtsi    | 14 ++------------
>  board/ti/beagle/beagle.c                    | 12 ------------
>  configs/omap3_beagle_defconfig              | 17 ++++++++++++++---
>  5 files changed, 20 insertions(+), 51 deletions(-)
> 
> diff --git a/arch/arm/dts/omap3-beagle-u-boot.dtsi b/arch/arm/dts/omap3-beagle-u-boot.dtsi
> index 41beaf0900c3..2c03701c896a 100644
> --- a/arch/arm/dts/omap3-beagle-u-boot.dtsi
> +++ b/arch/arm/dts/omap3-beagle-u-boot.dtsi
> @@ -5,20 +5,10 @@
>   * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com>
>   */
>  
> +#include "omap3-u-boot.dtsi"
> +
>  / {
>  	chosen {
>  		stdout-path = &uart3;
>  	};
>  };
> -
> -&uart1 {
> -	reg-shift = <2>;
> -};
> -
> -&uart2 {
> -	reg-shift = <2>;
> -};
> -
> -&uart3 {
> -	reg-shift = <2>;
> -};
> diff --git a/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi b/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi
> index 41beaf0900c3..2c03701c896a 100644
> --- a/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi
> +++ b/arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi
> @@ -5,20 +5,10 @@
>   * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com>
>   */
>  
> +#include "omap3-u-boot.dtsi"
> +
>  / {
>  	chosen {
>  		stdout-path = &uart3;
>  	};
>  };
> -
> -&uart1 {
> -	reg-shift = <2>;
> -};
> -
> -&uart2 {
> -	reg-shift = <2>;
> -};
> -
> -&uart3 {
> -	reg-shift = <2>;
> -};
> diff --git a/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi b/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi
> index 41beaf0900c3..2c03701c896a 100644
> --- a/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi
> +++ b/arch/arm/dts/omap3-beagle-xm-u-boot.dtsi
> @@ -5,20 +5,10 @@
>   * (C) Copyright 2017 Derald D. Woods <woods.technical@gmail.com>
>   */
>  
> +#include "omap3-u-boot.dtsi"
> +
>  / {
>  	chosen {
>  		stdout-path = &uart3;
>  	};
>  };
> -
> -&uart1 {
> -	reg-shift = <2>;
> -};
> -
> -&uart2 {
> -	reg-shift = <2>;
> -};
> -
> -&uart3 {
> -	reg-shift = <2>;
> -};
> diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
> index 826aace3fba2..91e0a4c026de 100644
> --- a/board/ti/beagle/beagle.c
> +++ b/board/ti/beagle/beagle.c
> @@ -71,18 +71,6 @@ static struct {
>  	char env_setting[64];
>  } expansion_config;
>  
> -static const struct ns16550_platdata beagle_serial = {
> -	.base = OMAP34XX_UART3,
> -	.reg_shift = 2,
> -	.clock = V_NS16550_CLK,
> -	.fcr = UART_FCR_DEFVAL,
> -};
> -
> -U_BOOT_DEVICE(beagle_uart) = {
> -	"ns16550_serial",
> -	&beagle_serial
> -};
> -
>  /*
>   * Routine: board_init
>   * Description: Early hardware init.
> diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
> index e199673207a3..f6d522a5f103 100644
> --- a/configs/omap3_beagle_defconfig
> +++ b/configs/omap3_beagle_defconfig
> @@ -1,17 +1,22 @@
>  CONFIG_ARM=y
> +# CONFIG_SPL_USE_ARCH_MEMCPY is not set
> +# CONFIG_SPL_USE_ARCH_MEMSET is not set
>  CONFIG_ARCH_OMAP2PLUS=y
> -CONFIG_SYS_TEXT_BASE=0x80100000
> +CONFIG_SYS_MALLOC_F_LEN=0x4000
>  CONFIG_TARGET_OMAP3_BEAGLE=y
> +CONFIG_SPL_SYS_MALLOC_F_LEN=0x400
>  CONFIG_SPL=y
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_NR_DRAM_BANKS=2
> +CONFIG_TPL_SYS_MALLOC_F_LEN=0x400
>  CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
>  CONFIG_SYS_CONSOLE_INFO_QUIET=y
>  CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb"
>  CONFIG_VERSION_VARIABLE=y
> +CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> +CONFIG_SPL_SEPARATE_BSS=y
>  # CONFIG_SPL_FS_EXT4 is not set
>  CONFIG_SPL_MTD_SUPPORT=y
> -CONFIG_SPL_OS_BOOT=y
>  CONFIG_SYS_PROMPT="BeagleBoard # "
>  CONFIG_CMD_SPL=y
>  CONFIG_CMD_SPL_NAND_OFS=0x280000
> @@ -33,10 +38,16 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
>  CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)"
>  CONFIG_CMD_UBI=y
>  # CONFIG_ISO_PARTITION is not set
> +# CONFIG_SPL_EFI_PARTITION is not set
> +CONFIG_SPL_PARTITION_UUIDS=y
>  CONFIG_OF_CONTROL=y
> +CONFIG_SPL_OF_CONTROL=y
>  CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle"
> +CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent"
>  CONFIG_ENV_IS_IN_NAND=y
>  CONFIG_SPL_DM=y
> +CONFIG_SPL_DM_SEQ_ALIAS=y
> +CONFIG_SPL_OF_TRANSLATE=y
>  CONFIG_USB_FUNCTION_FASTBOOT=y
>  CONFIG_FASTBOOT_BUF_ADDR=0x82000000
>  CONFIG_LED_STATUS=y
> @@ -52,6 +63,7 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y
>  CONFIG_LED_STATUS_GREEN=2
>  CONFIG_LED_STATUS_CMD=y
>  CONFIG_TWL4030_LED=y
> +CONFIG_DM_MMC=y
>  CONFIG_MMC_OMAP_HS=y
>  CONFIG_NAND=y
>  CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
> @@ -78,4 +90,3 @@ CONFIG_USB_ETHER_SMSC95XX=y
>  CONFIG_VIDEO_OMAP3=y
>  CONFIG_FAT_WRITE=y
>  CONFIG_BCH=y
> -CONFIG_SPL_OF_LIBFDT=y
> -- 
> 2.7.4
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot