From mboxrd@z Thu Jan  1 00:00:00 1970
From: Westergreen, Dalon <dalon.westergreen@intel.com>
Date: Sat, 21 Jan 2017 23:04:58 +0000
Subject: [U-Boot] [PATCH 3/7] arm: socfpga: update arria5 socdk default
 environment
In-Reply-To: <3d717678-1f1e-ced2-6a67-2375176d5cf0@denx.de>
References: <1485019919-1926-1-git-send-email-dwesterg@gmail.com>
 <1485019919-1926-3-git-send-email-dwesterg@gmail.com>
 <3d717678-1f1e-ced2-6a67-2375176d5cf0@denx.de>
Message-ID: <1485039897.20684.25.camel@intel.com>
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 Sat, 2017-01-21 at 20:29 +0100, Marek Vasut wrote:
> On 01/21/2017 06:31 PM, Dalon Westergreen wrote:
> > 
> > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > 
> > The default values for CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
> > and CONFIG_SYS_MMCSD_FS_OS_PARTITION have changed and as
> > as result the default uboot environment for this board
> > needs updating.??This sets the default envirnment to
> > use the CONFIG_SYS_MMCSD_FS_BOOT_PARTITION and
> > CONFIG_SYS_MMCSD_FS_OS_PARTITION configs for the boot
> > and os partitions.
> > 
> > Also set the default fdtimage value to match the
> > devicetree name in the linux kernel for this board.
> > 
> > Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> 
> Acked-by: Marek Vasut <marex@denx.de>
> 
> but please see my comment on 1/7
> 
> btw I think this is repeating too much, why don't we pull the env into
> socfpga_common.h first ?

I'd prefer to keep the boards separate and look at
moving to disto boot.
> 
> > 
> > ---
> > ?include/configs/socfpga_arria5_socdk.h | 10 ++++++----
> > ?1 file changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/include/configs/socfpga_arria5_socdk.h
> > b/include/configs/socfpga_arria5_socdk.h
> > index 3b0b416..0a7fcd2 100644
> > --- a/include/configs/socfpga_arria5_socdk.h
> > +++ b/include/configs/socfpga_arria5_socdk.h
> > @@ -44,15 +44,17 @@
> > ?		"bootm ${loadaddr} - ${fdt_addr}\0" \
> > ?	"bootimage=zImage\0" \
> > ?	"fdt_addr=100\0" \
> > -	"fdtimage=socfpga.dtb\0" \
> > +	"fdtimage=socfpga_arria5_socdk.dtb\0" \
> > ?	"bootm ${loadaddr} - ${fdt_addr}\0" \
> > -	"mmcroot=/dev/mmcblk0p2\0" \
> > +	"mmc_boot=" __stringify(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) "\0" \
> > +	"mmc_os=" __stringify(CONFIG_SYS_MMCSD_FS_OS_PARTITION) "\0" \
> > +	"mmcroot=/dev/mmcblk0p${mmc_os}\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" \
> > +		"load mmc 0:${mmc_boot} ${loadaddr} ${bootimage};" \
> > +		"load mmc 0:${mmc_boot} ${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;"\
> > 
> 
>