>-----Original Message----- >From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] >On Behalf Of Otavio Salvador >Sent: Wednesday, January 09, 2013 7:58 PM >To: U-Boot Mailing List >Cc: Estevam Fabio-R49496; Otavio Salvador >Subject: [U-Boot] [PATCH v5 5/6] mx6qsabrelite: Add support to dynamically >choose between fdt use or not > >Signed-off-by: Otavio Salvador <ota...@ossystems.com.br> >--- >Changes in v5: >- Change subject >- Reword the warning > >Changes in v4: >- Use a warning, instead of error when failing to fetch fdt >- Drop exit use >- Fix netboot >- Use fdt instead of ftd > >Changes in v3: >- Add loadfdt >- Use loadfdt >- Call exit to abort script > >Changes in v2: >- Allow use of dynamic/static ip >- Allow force use, or not, of fdt >- Change 'auto' to 'try' > > include/configs/mx6qsabrelite.h | 39 >+++++++++++++++++++++++++++++++++++++-- > 1 file changed, 37 insertions(+), 2 deletions(-)
Acked-by: Jason Liu <r64...@freescale.com> > >diff --git a/include/configs/mx6qsabrelite.h >b/include/configs/mx6qsabrelite.h index ee86f9b..fbcab2f 100644 >--- a/include/configs/mx6qsabrelite.h >+++ b/include/configs/mx6qsabrelite.h >@@ -157,6 +157,10 @@ > "console=ttymxc1\0" \ > "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ >+ "fdt_file=imx6q-sabrelite.dtb\0" \ >+ "fdt_addr=0x11000000\0" \ >+ "boot_fdt=try\0" \ >+ "ip_dyn=yes\0" \ > "mmcdev=0\0" \ > "mmcpart=2\0" \ > "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ @@ -167,15 +171,46 >@@ > "bootscript=echo Running bootscript from mmc ...; " \ > "source\0" \ > "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} >${uimage}\0" \ >+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} >${fdt_file}\0" \ > "mmcboot=echo Booting from mmc ...; " \ > "run mmcargs; " \ >- "bootm\0" \ >+ "if test ${boot_fdt} = yes; then " \ >+ "if run loadfdt; then " \ >+ "bootm ${loadaddr} - ${fdt_addr}; " \ >+ "else " \ >+ "if test ${boot_fdt} = try; then " \ >+ "bootm; " \ >+ "else " \ >+ "echo WARN: Cannot load the DT; " \ >+ "fi; " \ >+ "fi; " \ >+ "else " \ >+ "bootm; " \ >+ "fi;\0" \ > "netargs=setenv bootargs console=${console},${baudrate} " \ > "root=/dev/nfs " \ > "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ > "netboot=echo Booting from net ...; " \ > "run netargs; " \ >- "dhcp ${uimage}; bootm\0" >+ "if test ${ip_dyn} = yes; then " \ >+ "setenv get_cmd dhcp; " \ >+ "else " \ >+ "setenv get_cmd tftp; " \ >+ "fi; " \ >+ "${get_cmd} ${uimage}; " \ >+ "if test ${boot_fdt} = yes; then " \ >+ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ >+ "bootm ${loadaddr} - ${fdt_addr}; " \ >+ "else " \ >+ "if test ${boot_fdt} = try; then " \ >+ "bootm; " \ >+ "else " \ >+ "echo WARN: Cannot load the DT; " \ >+ "fi; " \ >+ "fi; " \ >+ "else " \ >+ "bootm; " \ >+ "fi;\0" > > #define CONFIG_BOOTCOMMAND \ > "mmc dev ${mmcdev};" \ >-- >1.7.10.4 > >_______________________________________________ >U-Boot mailing list >U-Boot@lists.denx.de >http://lists.denx.de/mailman/listinfo/u-boot _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot