| Message ID | 1485143514-27229-2-git-send-email-dwesterg@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Marek Vasut |
| Headers | show |
On 01/23/2017 04:51 AM, Dalon Westergreen wrote: > From: Dalon Westergreen <dalon.westergreen@intel.com> > > Move repeated environment settings for socfpga boards > to a common header. > > The default values for the boot partition and the > OS filesystem partition have changed and as > as result the default uboot environment for socfpga > boards needs updating. > > Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the > default linux devicetree used during linux boot. > --- > include/configs/socfpga_common.h | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h > index 6285266..3b998de 100644 > --- a/include/configs/socfpga_common.h > +++ b/include/configs/socfpga_common.h > @@ -336,5 +336,33 @@ unsigned int cm_get_qspi_controller_clk_hz(void); > * Stack setup > */ > #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR > + > +/* Extra Environment */ Nit, add the ifndef around this section and avoid introducing custom CONFIG_COMMON_ENV_SETTINGS macro . Just set the EXTRA_ENV_SETTINGS directly. > +#define CONFIG_COMMON_ENV_SETTINGS \ > + "verify=n\0" \ > + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ > + "bootimage=" CONFIG_BOOTFILE "\0" \ > + "fdt_addr=100\0" \ > + "fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \ > + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ > + "bootm ${loadaddr} - ${fdt_addr}\0" \ > + "mmcroot=/dev/mmcblk0p3\0" \ > + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ > + " root=${mmcroot} rw rootwait;" \ > + "bootz ${loadaddr} - ${fdt_addr}\0" \ > + "mmcload=mmc rescan;" \ > + "load mmc 0:2 ${loadaddr} ${bootimage};" \ > + "load mmc 0:2 ${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" > + > +#ifndef CONFIG_EXTRA_ENV_SETTINGS > +#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_COMMON_ENV_SETTINGS > +#endif > > #endif /* __CONFIG_SOCFPGA_COMMON_H__ */ >
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 6285266..3b998de 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -336,5 +336,33 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * Stack setup */ #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR + +/* Extra Environment */ +#define CONFIG_COMMON_ENV_SETTINGS \ + "verify=n\0" \ + "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ + "bootimage=" CONFIG_BOOTFILE "\0" \ + "fdt_addr=100\0" \ + "fdtimage=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "mmcroot=/dev/mmcblk0p3\0" \ + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ + " root=${mmcroot} rw rootwait;" \ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "mmcload=mmc rescan;" \ + "load mmc 0:2 ${loadaddr} ${bootimage};" \ + "load mmc 0:2 ${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" + +#ifndef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_COMMON_ENV_SETTINGS +#endif #endif /* __CONFIG_SOCFPGA_COMMON_H__ */
From: Dalon Westergreen <dalon.westergreen@intel.com> Move repeated environment settings for socfpga boards to a common header. The default values for the boot partition and the OS filesystem partition have changed and as as result the default uboot environment for socfpga boards needs updating. Move to using CONFIG_DEFAULT_DEVICE_TREE for setting the default linux devicetree used during linux boot. --- include/configs/socfpga_common.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)