From debca976c8a1d9df1063414d0e27c37973205a25 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Fri, 2 Sep 2016 11:21:43 +0530 Subject: 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 Signed-off-by: Max Krummenacher --- include/configs/apalis-tk1.h | 12 ++++++++---- include/configs/apalis_imx6.h | 12 ++++++++---- include/configs/apalis_t30.h | 13 +++++++++---- include/configs/colibri_imx6.h | 12 ++++++++---- include/configs/colibri_t20.h | 10 ++++++---- include/configs/colibri_t30.h | 13 +++++++++---- 6 files changed, 48 insertions(+), 24 deletions(-) diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index ac59ca7346..3aaf4ceb8d 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -111,7 +111,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}-apalis-${fdt_board}.dtb && " \ "setenv dtbparam ${fdt_addr_r}\0" @@ -121,7 +122,7 @@ "nfsboot=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}-apalis-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -131,7 +132,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}-apalis-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -141,7 +143,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}-apalis-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -154,6 +157,7 @@ "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ EMMC_BOOTCMD \ "fdt_board=eval\0" \ + "fdt_fixup=;\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index de117198ee..c9f5954da0 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -230,7 +230,8 @@ "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} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -247,7 +248,7 @@ "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} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -258,7 +259,8 @@ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ "${vidargs}; echo Booting from SD card in 8-bit 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} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -268,7 +270,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} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -290,6 +293,7 @@ "disable_giga=1\0" \ EMMC_BOOTCMD \ "fdt_file=" FDT_FILE "\0" \ + "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ SD_BOOTCMD \ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 64ceb18c88..3ff7c571e8 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -130,7 +130,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}-apalis-${fdt_board}.dtb && " \ "setenv dtbparam ${fdt_addr_r}\0" @@ -140,7 +141,7 @@ "nfsboot=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}-apalis-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -151,7 +152,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}-apalis-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -162,7 +164,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}-apalis-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" @@ -174,6 +177,7 @@ "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ EMMC_BOOTCMD \ "fdt_board=eval\0" \ + "fdt_fixup=;\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ @@ -214,6 +218,7 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_ALT_MEMTEST +#define CONFIG_OF_LIBFDT #define CONFIG_OF_SYSTEM_SETUP #define CONFIG_SUPPORT_RAW_INITRD diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 0557c187c1..dc46a02f95 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -201,7 +201,8 @@ "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} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -218,7 +219,7 @@ "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} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -229,7 +230,8 @@ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ "${vidargs}; echo Booting from SD card; " \ "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} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -239,7 +241,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} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" @@ -255,6 +258,7 @@ "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ EMMC_BOOTCMD \ "fdt_file=" FDT_FILE "\0" \ + "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ SD_BOOTCMD \ 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 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 -- cgit v1.2.3