mx51evk: Update environment in order to allow booting a dt kernel
PATCH v2 1/1 mx51evk: Update environment in order to allow booting a dt kernel
From: Fabio Estevam <[email protected]>
Update the environment as done in other imx boards to allow easy switching between booting a non-dt kernel and a dt kernel.
Boot tested the following kernels:
- 2.6.35 from FSL (11.09 branch)
- 3.9-rc7 non-dt
- 3.9-rc7 dt
---
Changes since v1:
- Do not remove mmcrootfstype
- Fix typo in Subject
- Improve commit log by adding the tested booted kernels
include/configs/mx51evk.h | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-)
include/configs/mx51evk.h +39 -3
@@ -149,11 +149,15 @@#define CONFIG_ETHPRIME "FEC0" -#define CONFIG_LOADADDR 0x90800000/* loadaddr env var */ +#define CONFIG_LOADADDR 0x92000000/* loadaddr env var */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ + "fdt_file=imx51-babbage.dtb\0" \ + "fdt_addr=0x91000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ "mmcdev=0\0" \ "mmcpart=2\0" \ "mmcroot=/dev/mmcblk0p3 rw\0" \
@@ -166,15 +170,47 @@"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 " \
Signature · 1 line
1.7.9.5
PATCH v2 1/1 mx51evk: Update environment in order to allow booting a dt kernel
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Update the environment as done in other imx boards to allow easy switching between booting a non-dt kernel and a dt kernel.
Quoted 7 lines
Boot tested the following kernels:
- 2.6.35 from FSL (11.09 branch)
- 3.9-rc7 non-dt
- 3.9-rc7 dtSigned-off-by Fabio Estevam <[email protected]>
Your commit log say nothing about the LOADADDR; I'd also prefer if you could reuse most of other environments as it'd keep them mostly in sync (so please remove mmcfstype if you have no other reason to keep it).
--
Otavio Salvador O.S. Systems
E-mail: otavio at ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
PATCH v2 1/1 mx51evk: Update environment in order to allow booting a dt kernel
Quoted 1 line · Otavio Salvador
Your commit log say nothing about the LOADADDR; I'd also prefer if you
Ok, I can add a comment about the LOADADDR change in v3.
Quoted 3 lines
could reuse most of other environments as it'd keep them mostly in sync (so please remove mmcfstype if you have no other reason to keep it).
The removal of mmcrootfstype is unrelated to the change proposed by this patch.
The goal of this patch is to be able to boot a dt kernel.