diff options
| author | Sanchayan Maity <maitysanchayan@gmail.com> | 2016-09-02 11:21:43 +0530 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-09-29 06:03:32 +0200 |
| commit | debca976c8a1d9df1063414d0e27c37973205a25 (patch) | |
| tree | 8bc798568dd7187cd15396b58a57900eb9e5a097 /include/configs/colibri_t20.h | |
| parent | 84e4b425e6237cb026a6fe71025d89fa6359a685 (diff) | |
configs: Implement and unify use of fdt_fixup across modules
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 <sanchayan.maity@toradex.com>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'include/configs/colibri_t20.h')
| -rw-r--r-- | include/configs/colibri_t20.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index f312c8161a..0cc134cc6c 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -150,7 +150,7 @@ "nfsboot=usb start; run setup; setenv bootargs ${defargs} ${mtdparts}" \ " ${nfsargs} ${setupargs} ${vidargs}; echo Booting via DHCP/" \ "TFTP/NFS...; run nfsdtbload; dhcp ${kernel_addr_r} " \ - "&& bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \ "${soc}-colibri-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -161,7 +161,7 @@ "sdboot=run setup; setenv bootargs ${defargs} ${mtdparts} ${sdargs} " \ "${setupargs} ${vidargs}; echo Booting from SD card...; " \ "run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \ - "&& bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \ "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ "${soc}-colibri-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -173,7 +173,7 @@ " ${setupargs} ${vidargs}; echo Booting from NAND...; " \ "ubi part ubi && " \ "ubi read ${kernel_addr_r} kernel &&" \ - "run ubidtbload; " \ + "run ubidtbload && run fdt_fixup; " \ "bootz ${kernel_addr_r} - ${dtbparam}; " \ "bootz ${kernel_addr_r} - \0" \ "ubidtbload=setenv dtbparam; " \ @@ -187,7 +187,7 @@ "${setupargs} ${usbargs} ${vidargs}; echo Booting from USB " \ "stick...; usb start && run usbdtbload; load usb 0:1 " \ "${kernel_addr_r} ${boot_file} && " \ - "bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \ "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \ "${soc}-colibri-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -198,6 +198,7 @@ "defargs=vmalloc=128M usb_high_speed=1\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ + "fdt_fixup=;\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ @@ -238,6 +239,7 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_ALT_MEMTEST +#define CONFIG_OF_LIBFDT #define CONFIG_OF_SYSTEM_SETUP #define CONFIG_SUPPORT_RAW_INITRD |