| Message ID | 20161202085827.14787-1-maitysanchayan@gmail.com |
|---|---|
| State | Accepted |
| Commit | faf1e62bf04b01dc7110a459f558aaf414bfcac0 |
| Delegated to: | Stefano Babic |
| Headers | show |
On 02/12/2016 09:58, Sanchayan Maity wrote: > u-boot allows modifying a device tree after it is loaded into > memory. Add fdt_fixup hook in u-boot environment which can > facilitate such modifications. > > Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> > --- > include/configs/colibri_vf.h | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h > index d58145e..be28324 100644 > --- a/include/configs/colibri_vf.h > +++ b/include/configs/colibri_vf.h > @@ -99,7 +99,7 @@ > "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ > "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ > "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ > - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ > + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ > > #define NFS_BOOTCMD \ > "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ > @@ -108,7 +108,7 @@ > "${setupargs} ${vidargs}; echo Booting from NFS...;" \ > "dhcp ${kernel_addr_r} && " \ > "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ > - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ > + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ > > #define UBI_BOOTCMD \ > "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \ > @@ -119,7 +119,7 @@ > "ubi part ubi && " \ > "ubi read ${kernel_addr_r} kernel && " \ > "ubi read ${fdt_addr_r} dtb && " \ > - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ > + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ > > #define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" > > @@ -131,6 +131,7 @@ > "kernel_file=zImage\0" \ > "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ > "fdt_board=eval-v3\0" \ > + "fdt_fixup=;\0" \ > "defargs=\0" \ > "console=ttyLP0\0" \ > "setup=setenv setupargs " \ > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index d58145e..be28324 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -99,7 +99,7 @@ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ @@ -108,7 +108,7 @@ "${setupargs} ${vidargs}; echo Booting from NFS...;" \ "dhcp ${kernel_addr_r} && " \ "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define UBI_BOOTCMD \ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \ @@ -119,7 +119,7 @@ "ubi part ubi && " \ "ubi read ${kernel_addr_r} kernel && " \ "ubi read ${fdt_addr_r} dtb && " \ - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" @@ -131,6 +131,7 @@ "kernel_file=zImage\0" \ "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ "fdt_board=eval-v3\0" \ + "fdt_fixup=;\0" \ "defargs=\0" \ "console=ttyLP0\0" \ "setup=setenv setupargs " \
u-boot allows modifying a device tree after it is loaded into memory. Add fdt_fixup hook in u-boot environment which can facilitate such modifications. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com> --- include/configs/colibri_vf.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)