Message ID | 1357732680-30245-2-git-send-email-otavio@ossystems.com.br |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
>-----Original Message----- >From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@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 1/6] mx6qsabrelite: Use tabs to environment >setting > >This rework the environment to use tabs for environment setting as done in >other boards. > >Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> >--- >Changes in v5: None >Changes in v4: None >Changes in v3: None >Changes in v2: >- New patch > > include/configs/mx6qsabrelite.h | 66 +++++++++++++++++++-------------------- > 1 file changed, 33 insertions(+), 33 deletions(-) Acked-by: Jason Liu <r64343@freescale.com> > >diff --git a/include/configs/mx6qsabrelite.h >b/include/configs/mx6qsabrelite.h index 0f6bbb4..ee86f9b 100644 >--- a/include/configs/mx6qsabrelite.h >+++ b/include/configs/mx6qsabrelite.h >@@ -152,43 +152,43 @@ > #define CONFIG_SYS_TEXT_BASE 0x17800000 > > #define CONFIG_EXTRA_ENV_SETTINGS \ >- "script=boot.scr\0" \ >- "uimage=uImage\0" \ >+ "script=boot.scr\0" \ >+ "uimage=uImage\0" \ > "console=ttymxc1\0" \ >- "fdt_high=0xffffffff\0" \ >+ "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ >- "mmcdev=0\0" \ >- "mmcpart=2\0" \ >- "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ >- "mmcargs=setenv bootargs console=${console},${baudrate} " \ >- "root=${mmcroot}\0" \ >- "loadbootscript=" \ >- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ >- "bootscript=echo Running bootscript from mmc ...; " \ >- "source\0" \ >- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} >${uimage}\0" \ >- "mmcboot=echo Booting from mmc ...; " \ >- "run mmcargs; " \ >- "bootm\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" \ >+ "mmcdev=0\0" \ >+ "mmcpart=2\0" \ >+ "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ >+ "mmcargs=setenv bootargs console=${console},${baudrate} " \ >+ "root=${mmcroot}\0" \ >+ "loadbootscript=" \ >+ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" >\ >+ "bootscript=echo Running bootscript from mmc ...; " \ >+ "source\0" \ >+ "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} >${uimage}\0" \ >+ "mmcboot=echo Booting from mmc ...; " \ >+ "run mmcargs; " \ >+ "bootm\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" > > #define CONFIG_BOOTCOMMAND \ >- "mmc dev ${mmcdev};" \ >- "mmc dev ${mmcdev}; if mmc rescan; then " \ >- "if run loadbootscript; then " \ >- "run bootscript; " \ >- "else " \ >- "if run loaduimage; then " \ >- "run mmcboot; " \ >- "else run netboot; " \ >- "fi; " \ >- "fi; " \ >- "else run netboot; fi" >+ "mmc dev ${mmcdev};" \ >+ "mmc dev ${mmcdev}; if mmc rescan; then " \ >+ "if run loadbootscript; then " \ >+ "run bootscript; " \ >+ "else " \ >+ "if run loaduimage; then " \ >+ "run mmcboot; " \ >+ "else run netboot; " \ >+ "fi; " \ >+ "fi; " \ >+ "else run netboot; fi" > > #define CONFIG_ARP_TIMEOUT 200UL > >-- >1.7.10.4 > >_______________________________________________ >U-Boot mailing list >U-Boot@lists.denx.de >http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index 0f6bbb4..ee86f9b 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -152,43 +152,43 @@ #define CONFIG_SYS_TEXT_BASE 0x17800000 #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "uimage=uImage\0" \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ "console=ttymxc1\0" \ - "fdt_high=0xffffffff\0" \ + "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "mmcdev=0\0" \ - "mmcpart=2\0" \ - "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=${mmcroot}\0" \ - "loadbootscript=" \ - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "bootm\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" \ + "mmcdev=0\0" \ + "mmcpart=2\0" \ + "mmcroot=/dev/mmcblk0p3 rootwait rw\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ + "loadbootscript=" \ + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "bootm\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" #define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev};" \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "fi; " \ - "else run netboot; fi" + "mmc dev ${mmcdev};" \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run netboot; " \ + "fi; " \ + "fi; " \ + "else run netboot; fi" #define CONFIG_ARP_TIMEOUT 200UL
This rework the environment to use tabs for environment setting as done in other boards. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: - New patch include/configs/mx6qsabrelite.h | 66 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 33 deletions(-)