diff options
Diffstat (limited to 'include/configs/colibri_t30.h')
| -rw-r--r-- | include/configs/colibri_t30.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 9e50602645..777b65f9db 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -121,7 +121,8 @@ "emmcboot=run setup; setenv bootargs ${defargs} ${emmcargs} " \ "${setupargs} ${vidargs}; echo Booting from internal eMMC " \ "chip...; run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ - "${boot_file} && bootm ${kernel_addr_r} - ${dtbparam}\0" \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} - ${dtbparam}\0" \ "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \ "${soc}-colibri-${fdt_board}.dtb && " \ "setenv dtbparam ${fdt_addr_r}\0" @@ -131,7 +132,7 @@ "nfsboot=usb start; run setup; setenv bootargs ${defargs} ${nfsargs} " \ "${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ "run nfsdtbload; dhcp ${kernel_addr_r} " \ - "&& bootm ${kernel_addr_r} - ${dtbparam}\0" \ + "&& run fdt_fixup && bootm ${kernel_addr_r} - ${dtbparam}\0" \ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \ "${soc}-colibri-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -142,7 +143,8 @@ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ "${vidargs}; echo Booting from SD card in 8bit slot...; " \ "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ - "${boot_file} && bootm ${kernel_addr_r} - ${dtbparam}\0" \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${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" @@ -153,7 +155,8 @@ "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \ "${usbargs} ${vidargs}; echo Booting from USB stick...; " \ "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ - "${boot_file} && bootm ${kernel_addr_r} - ${dtbparam}\0" \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${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" @@ -165,6 +168,7 @@ "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ EMMC_BOOTCMD \ "fdt_board=eval-v3\0" \ + "fdt_fixup=;\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ @@ -203,6 +207,7 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_ALT_MEMTEST +#define CONFIG_OF_LIBFDT #define CONFIG_OF_SYSTEM_SETUP #define CONFIG_SUPPORT_RAW_INITRD |