| Message ID | 1485019919-1926-6-git-send-email-dwesterg@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
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. > > Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com> Please CC Stefan on this patch next time, I want his ACK on this patch too. > --- > include/configs/socfpga_sr1500.h | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h > index 0407f03..6f7baad 100644 > --- a/include/configs/socfpga_sr1500.h > +++ b/include/configs/socfpga_sr1500.h > @@ -42,13 +42,15 @@ > "fdtimage=socfpga.dtb\0" \ > "fsloadcmd=ext2load\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;"\ >
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 0407f03..6f7baad 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -42,13 +42,15 @@ "fdtimage=socfpga.dtb\0" \ "fsloadcmd=ext2load\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;"\