From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Roese <sr@denx.de>
Date: Mon, 23 Jan 2017 10:51:40 +0100
Subject: [U-Boot] [PATCH v3 7/7] arm: socfpga: Update sr1500 environment
In-Reply-To: <1485143514-27229-8-git-send-email-dwesterg@gmail.com>
References: <1485143514-27229-1-git-send-email-dwesterg@gmail.com>
 <1485143514-27229-8-git-send-email-dwesterg@gmail.com>
Message-ID: <589ffaeb-faec-b20a-1328-93faae4ef5e7@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 23.01.2017 04:51, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
>
> Remove the default environment as it is now in a common
> header.
>
> Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig
> to set the linux devicetree name.
>
> Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> ---
>  configs/socfpga_sr1500_defconfig |  1 +
>  include/configs/socfpga_sr1500.h | 25 -------------------------
>  2 files changed, 1 insertion(+), 25 deletions(-)
>
> diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig
> index 6fd7bc0..b0b08da 100644
> --- a/configs/socfpga_sr1500_defconfig
> +++ b/configs/socfpga_sr1500_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_TARGET_SOCFPGA_SR1500=y
>  CONFIG_SPL_STACK_R_ADDR=0x00800000
>  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
> +CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
>  CONFIG_FIT=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
> index 0407f03..3c63e80 100644
> --- a/include/configs/socfpga_sr1500.h
> +++ b/include/configs/socfpga_sr1500.h
> @@ -32,31 +32,6 @@
>  #define CONFIG_PHY_MARVELL
>  #define PHY_ANEG_TIMEOUT	8000
>
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> -	"verify=n\0" \
> -	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> -	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
> -		"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"bootimage=zImage\0" \
> -	"fdt_addr=100\0" \
> -	"fdtimage=socfpga.dtb\0" \
> -		"fsloadcmd=ext2load\0" \
> -	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> -	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
> -		" root=${mmcroot} rw rootwait;" \
> -		"bootz ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> -	"qspiload=sf probe && mtdparts default && run ubiload\0" \
> -	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> -		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
> -		"bootz ${loadaddr} - ${fdt_addr}\0" \
> -	"ubiload=ubi part UBI && ubifsmount ubi0 && " \
> -		"ubifsload ${loadaddr} /boot/${bootimage} && " \
> -		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
> -
>  /* Environment */
>  #define CONFIG_ENV_IS_IN_SPI_FLASH

Moving to a common environment or even distro config / environment
is okay for the SR1500 board. So:

Acked-by: Stefan Roese

Thanks,
Stefan