* [U-Boot] [PATCH v6 0/6] Improve default environment for easy use
@ 2013-01-10 19:45 Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
This patchset improves the default environment of machines currently
supported in OpenEmbedded and Yocto to make it compatible with
mainline and Freescale BSP Linux kernel.
A new patch has been add to change the format in mx6qsabrelite in
environment setting and already merged patches removed from this new
pull request.
Changes in v6:
- Fix reformat
- Fix mmcargs set
- Fix netboot fdt
- Raise SYS_CBSIZE to 512 to fix a runtime error
Changes in v5:
- Change subject
- Reword the warning
- Change subject
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:
- New patch
- Reformat environment change to fit in 80 cols
- Allow use of dynamic/static ip
- Allow force use, or not, of fdt
- Change 'auto' to 'try'
Otavio Salvador (6):
mx6qsabrelite: Use tabs to environment setting
mx28evk: We shouldn't hardcode a rootfs filesystem type
mx28evk: Add support to dynamically choose between fdt use or not
mx53loco: Add support to dynamically choose between fdt use or not
mx6qsabrelite: Add support to dynamically choose between fdt use or
not
mx6qsabre{auto,sd}: Add support to dynamically choose between fdt use
or not
include/configs/mx28evk.h | 47 ++++++++++++++---
include/configs/mx53loco.h | 44 ++++++++++++++--
include/configs/mx6qsabre_common.h | 41 +++++++++++++--
include/configs/mx6qsabreauto.h | 1 +
include/configs/mx6qsabrelite.h | 101 ++++++++++++++++++++++++------------
include/configs/mx6qsabresd.h | 1 +
6 files changed, 188 insertions(+), 47 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
@ 2013-01-10 19:45 ` Otavio Salvador
2013-01-13 11:28 ` Stefano Babic
2013-01-10 19:45 ` [U-Boot] [PATCH v6 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type Otavio Salvador
` (4 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
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 v6: None
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(-)
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
@ 2013-01-10 19:45 ` Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 3/6] mx28evk: Add support to dynamically choose between fdt use or not Otavio Salvador
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
For a generic environment, we shouldn't have a fixed rootfs filesystem
so we drop it from env.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v6:
- Fix reformat
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Reformat environment change to fit in 80 cols
include/configs/mx28evk.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index cdf3e15..a13478d 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -292,11 +292,9 @@
"console_mainline=ttyAMA0\0" \
"mmcdev=0\0" \
"mmcpart=2\0" \
- "mmcroot=/dev/mmcblk0p3 rw\0" \
- "mmcrootfstype=ext3 rootwait\0" \
+ "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
"mmcargs=setenv bootargs console=${console_mainline},${baudrate} " \
- "root=${mmcroot} " \
- "rootfstype=${mmcrootfstype}\0" \
+ "root=${mmcroot}\0" \
"loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 3/6] mx28evk: Add support to dynamically choose between fdt use or not
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type Otavio Salvador
@ 2013-01-10 19:45 ` Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 4/6] mx53loco: " Otavio Salvador
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v6: None
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/mx28evk.h | 41 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 38 insertions(+), 3 deletions(-)
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index a13478d..dd0ef21 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -290,6 +290,10 @@
"uimage=uImage\0" \
"console_fsl=ttyAM0\0" \
"console_mainline=ttyAMA0\0" \
+ "fdt_file=imx28-evk.dtb\0" \
+ "fdt_addr=0x41000000\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=2\0" \
"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
@@ -300,15 +304,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" \
+ "run mmcargs; " \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; 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_mainline},${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}; if mmc rescan; then " \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 4/6] mx53loco: Add support to dynamically choose between fdt use or not
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
` (2 preceding siblings ...)
2013-01-10 19:45 ` [U-Boot] [PATCH v6 3/6] mx28evk: Add support to dynamically choose between fdt use or not Otavio Salvador
@ 2013-01-10 19:45 ` Otavio Salvador
2013-01-13 11:00 ` Stefano Babic
2013-01-10 19:45 ` [U-Boot] [PATCH v6 5/6] mx6qsabrelite: " Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
5 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
The CONFIG_SYS_CBSIZE has been change to 512 to avoid runtime errors as:
,---[ Runtime error ]
| Hit any key to stop autoboot: 0
| MX53LOCO U-Boot > pri netboot
| netboot=echo Booting from net ...; run netargs; if test ...
| prefetch abort
| pc : [<20747368>] lr : [<20747365>]
| sp : af566e20 ip : 00000000 fp : 00000000
| r10: 00000002 r9 : af6dfc28 r8 : af566f58
| r7 : af6dfc10 r6 : 00000001 r5 : 00000002 r4 : 74206669
| r3 : 00000000 r2 : 00000060 r1 : 00000020 r0 : 0000018e
| Flags: nZCv IRQs off FIQs off Mode SVC_32
| Resetting CPU ...
|
| resetting ...
`---
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v6:
- Fix mmcargs set
- Fix netboot fdt
- Raise SYS_CBSIZE to 512 to fix a runtime error
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/mx53loco.h | 44 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 4 deletions(-)
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 996396b..a4b610f 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -119,24 +119,60 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"uimage=uImage\0" \
+ "fdt_file=imx53-qsb.dtb\0" \
+ "fdt_addr=0x71000000\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=2\0" \
"mmcroot=/dev/mmcblk0p3 rw rootwait\0" \
- "mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot} " \
+ "mmcargs=setenv bootargs console=ttymxc0,${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" \
+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
- "bootm\0" \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; 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=ttymxc0,${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 || test ${boot_fdt} = try; then " \
+ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+ "bootm ${loadaddr} - ${fdt_addr}; " \
+ "else " \
+ "if test ${boot_fdt} = try; then " \
+ "bootm; " \
+ "else " \
+ "echo ERROR: Cannot load the DT; " \
+ "exit; " \
+ "fi; " \
+ "fi; " \
+ "else " \
+ "bootm; " \
+ "fi;\0"
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
@@ -157,7 +193,7 @@
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
#define CONFIG_SYS_PROMPT "MX53LOCO U-Boot > "
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
+#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
/* Print Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 5/6] mx6qsabrelite: Add support to dynamically choose between fdt use or not
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
` (3 preceding siblings ...)
2013-01-10 19:45 ` [U-Boot] [PATCH v6 4/6] mx53loco: " Otavio Salvador
@ 2013-01-10 19:45 ` Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
5 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v6:
- Fix netboot fdt
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(-)
diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h
index ee86f9b..752f098 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 || test ${boot_fdt} = try; 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 || test ${boot_fdt} = try; 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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 6/6] mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
` (4 preceding siblings ...)
2013-01-10 19:45 ` [U-Boot] [PATCH v6 5/6] mx6qsabrelite: " Otavio Salvador
@ 2013-01-10 19:45 ` Otavio Salvador
2013-01-10 20:14 ` Fabio Estevam
5 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2013-01-10 19:45 UTC (permalink / raw)
To: u-boot
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
Changes in v6:
- Fix netboot fdt
- Rebase on top of 'mx6qsabresd: Fix booting the kernel from SDHC3'
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/mx6qsabre_common.h | 41 +++++++++++++++++++++++++++++++++---
include/configs/mx6qsabreauto.h | 1 +
include/configs/mx6qsabresd.h | 1 +
3 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index 95ebd98..cda4512 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -83,6 +83,10 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"uimage=uImage\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ "fdt_addr=0x11000000\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
"console=" CONFIG_CONSOLE_DEV "\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
@@ -96,15 +100,46 @@
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
- "mmcboot=echo Booting from mmc ...; " \
+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
- "bootm\0" \
+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; 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 || test ${boot_fdt} = try; 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};" \
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index f1ff201..f4a082a 100644
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -15,6 +15,7 @@
#define CONFIG_MACH_TYPE 3529
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CONFIG_CONSOLE_DEV "ttymxc3"
+#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabreauto.dtb"
#define CONFIG_MMCROOT "/dev/mmcblk0p2"
#define PHYS_SDRAM_SIZE (2u * 1024 * 1024 * 1024)
diff --git a/include/configs/mx6qsabresd.h b/include/configs/mx6qsabresd.h
index ccb7751..3b8d752 100644
--- a/include/configs/mx6qsabresd.h
+++ b/include/configs/mx6qsabresd.h
@@ -21,6 +21,7 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONFIG_CONSOLE_DEV "ttymxc0"
#define CONFIG_MMCROOT "/dev/mmcblk1p2"
+#define CONFIG_DEFAULT_FDT_FILE "imx6q-sabresd.dtb"
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
#include "mx6qsabre_common.h"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 6/6] mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not
2013-01-10 19:45 ` [U-Boot] [PATCH v6 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
@ 2013-01-10 20:14 ` Fabio Estevam
0 siblings, 0 replies; 10+ messages in thread
From: Fabio Estevam @ 2013-01-10 20:14 UTC (permalink / raw)
To: u-boot
On Thu, Jan 10, 2013 at 5:45 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 4/6] mx53loco: Add support to dynamically choose between fdt use or not
2013-01-10 19:45 ` [U-Boot] [PATCH v6 4/6] mx53loco: " Otavio Salvador
@ 2013-01-13 11:00 ` Stefano Babic
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Babic @ 2013-01-13 11:00 UTC (permalink / raw)
To: u-boot
On 10/01/2013 20:45, Otavio Salvador wrote:
> The CONFIG_SYS_CBSIZE has been change to 512 to avoid runtime errors as:
>
Hi Otavio,
> ,---[ Runtime error ]
> | Hit any key to stop autoboot: 0
> | MX53LOCO U-Boot > pri netboot
> | netboot=echo Booting from net ...; run netargs; if test ...
> | prefetch abort
> | pc : [<20747368>] lr : [<20747365>]
> | sp : af566e20 ip : 00000000 fp : 00000000
> | r10: 00000002 r9 : af6dfc28 r8 : af566f58
> | r7 : af6dfc10 r6 : 00000001 r5 : 00000002 r4 : 74206669
> | r3 : 00000000 r2 : 00000060 r1 : 00000020 r0 : 0000018e
> | Flags: nZCv IRQs off FIQs off Mode SVC_32
> | Resetting CPU ...
> |
> | resetting ...
> `---
Bug is fixed !
Tested-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting
2013-01-10 19:45 ` [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
@ 2013-01-13 11:28 ` Stefano Babic
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Babic @ 2013-01-13 11:28 UTC (permalink / raw)
To: u-boot
On 10/01/2013 20:45, Otavio Salvador wrote:
> 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 v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2:
> - New patch
>
Whole series applied to u-boot-imx, thanks!
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-01-13 11:28 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-10 19:45 [U-Boot] [PATCH v6 0/6] Improve default environment for easy use Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 1/6] mx6qsabrelite: Use tabs to environment setting Otavio Salvador
2013-01-13 11:28 ` Stefano Babic
2013-01-10 19:45 ` [U-Boot] [PATCH v6 2/6] mx28evk: We shouldn't hardcode a rootfs filesystem type Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 3/6] mx28evk: Add support to dynamically choose between fdt use or not Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 4/6] mx53loco: " Otavio Salvador
2013-01-13 11:00 ` Stefano Babic
2013-01-10 19:45 ` [U-Boot] [PATCH v6 5/6] mx6qsabrelite: " Otavio Salvador
2013-01-10 19:45 ` [U-Boot] [PATCH v6 6/6] mx6qsabre{auto, sd}: " Otavio Salvador
2013-01-10 20:14 ` Fabio Estevam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox