On 01/21/2017 10:55 PM, Westergreen, Dalon wrote: > > On Sat, 2017-01-21 at 20:28 +0100, Marek Vasut wrote: > > On 01/21/2017 06:31 PM, Dalon Westergreen wrote: > > > From: Dalon Westergreen > <dalon.westergr...@intel.com<mailto:dalon.westergr...@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.westergr...@intel.com<mailto:dalon.westergr...@intel.com>> > > > > While I'm fine with the patch, wouldn't it make more sense to move > toward distro bootcmd (git grep for DISTRO_BOOTCMD, ie RPi is using > it). Major distros agreed on how to handle the U-Boot env, so it'd > be nice to have Altera SoCs follow. > > What do you think ? > > > > I like the idea, I think moving in that direction makes sense. For now i > suggest just cleaning > up the current environment so it boots with the current default sdcard image. > Agreed?
That's fine. btw please fix your mailer and stop top-posting. > de0 fix spaces > > > > This is probably not supposed to be part of the description ? :) > > > > --- > include/configs/socfpga_de0_nano_soc.h | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/include/configs/socfpga_de0_nano_soc.h > b/include/configs/socfpga_de0_nano_soc.h > index 6b9546e..205b859 100644 > --- a/include/configs/socfpga_de0_nano_soc.h > +++ b/include/configs/socfpga_de0_nano_soc.h > @@ -39,15 +39,17 @@ > "bootm ${loadaddr} - ${fdt_addr}\0" \ > "bootimage=zImage\0" \ > "fdt_addr=100\0" \ > - "fdtimage=socfpga.dtb\0" \ > + "fdtimage=socfpga_cyclone5_de0_sockit.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" \ > > /* The rest of the configuration is shared */ > #include <configs/socfpga_common.h> > > > > > > -- Best regards, Marek Vasut _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot