[U-Boot] [PATCH 8/8] arm: socfpga: sr1500 use environment in common header

[Dalon Westergreen]

On Sat, 2017-02-18 at 21:56 +0100, Marek Vasut wrote:
> On 02/18/2017 09:51 PM, Dalon Westergreen wrote:
> > 
> > This removes the default environment from the sr1500 header
> > and instead uses the common environment provided in
> > socfpga_common.h which now uses distro boot.
> > 
> > This board has no upstream devicetree in the kernel source,
> > so leave the default devicetree name socfpga.dtb.
> > 
> > Signed-off-by: Dalon Westergreen <dwesterg at gmail.com>
> > ---
> >  configs/socfpga_sr1500_defconfig |  1 +
> >  include/configs/socfpga_sr1500.h | 27 ---------------------------
> >  2 files changed, 1 insertion(+), 27 deletions(-)
> > 
> > diff --git a/configs/socfpga_sr1500_defconfig
> > b/configs/socfpga_sr1500_defconfig
> > index 981600b..b0925ab 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"
> 
> Shouldn't this be socfpga_cyclone5_sr1500.dtb too ?
We discussed this before, my thought was to leave the dtb name
as it was before where there was no mainlined device tree in
the linux kernel source.  CONFIG_DEFAULT_FDT_FILE is specifically
the kernel devicetree used for linux boot and is unrelated to the
dtb for uboot.

--dalon
> 
> > 
> >  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 f67fafd..d94771c 100644
> > --- a/include/configs/socfpga_sr1500.h
> > +++ b/include/configs/socfpga_sr1500.h
> > @@ -17,8 +17,6 @@
> >  
> >  /* Booting Linux */
> >  #define CONFIG_BOOTFILE		"uImage"
> > -#define CONFIG_BOOTARGS		"console=ttyS0,"
> > __stringify(CONFIG_BAUDRATE)
> > -#define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
> >  #define CONFIG_LOADADDR		0x01000000
> >  #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
> >  
> > @@ -28,31 +26,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
> >  
> > 
> 
>