imx: ventana: config: add fixfdt script to apply manual fdt fixups

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 3aeb0df15e03e756c3c8cf2b71089312c9f44777..e57b120555b47e3c669ae1dc7f9f2b3ab2099a12 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -287,14 +287,19 @@
        "fdt_high=0xffffffff\0" \
        "fdt_addr=0x18000000\0" \
        "initrd_high=0xffffffff\0" \
+       "fixfdt=" \
+               "fdt addr ${fdt_addr}\0" \
        "bootdir=boot\0" \
        "loadfdt=" \
-               "if ${fsload} ${fdt_addr} ${bootdir}/${fdt_file}; then " \
-                       "echo Loaded DTB from ${bootdir}/${fdt_file}; " \
-               "elif ${fsload} ${fdt_addr} ${bootdir}/${fdt_file1}; then " \
-                       "echo Loaded DTB from ${bootdir}/${fdt_file1}; " \
-               "elif ${fsload} ${fdt_addr} ${bootdir}/${fdt_file2}; then " \
-                       "echo Loaded DTB from ${bootdir}/${fdt_file2}; " \
+               "if ${fsload} ${fdt_addr} boot/${fdt_file}; then " \
+                       "echo Loaded DTB from boot/${fdt_file}; " \
+                       "run fixfdt; " \
+               "elif ${fsload} ${fdt_addr} boot/${fdt_file1}; then " \
+                       "echo Loaded DTB from boot/${fdt_file1}; " \
+                       "run fixfdt; " \
+               "elif ${fsload} ${fdt_addr} boot/${fdt_file2}; then " \
+                       "echo Loaded DTB from boot/${fdt_file2}; " \
+                       "run fixfdt; " \
                "fi\0" \
        \
        "script=6x_bootscript-ventana\0" \
@@ -313,7 +318,7 @@
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=/dev/mmcblk0p1 rootfstype=ext4 " \
                                "rootwait rw ${video} ${extra}; " \
-                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                       "if run loadfdt; then " \
                                "bootm ${loadaddr} - ${fdt_addr}; " \
                        "else " \
                                "bootm; " \
@@ -328,7 +333,7 @@
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=/dev/sda1 rootfstype=ext4 " \
                                "rootwait rw ${video} ${extra}; " \
-                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                       "if run loadfdt; then " \
                                "bootm ${loadaddr} - ${fdt_addr}; " \
                        "else " \
                                "bootm; " \
@@ -342,7 +347,7 @@
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=/dev/sda1 rootfstype=ext4 " \
                                "rootwait rw ${video} ${extra}; " \
-                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                       "if run loadfdt; then " \
                                "bootm ${loadaddr} - ${fdt_addr}; " \
                        "else " \
                                "bootm; " \
@@ -405,7 +410,7 @@
                "if ${fsload} ${loadaddr} ${bootdir}/${uimage}; then " \
                        "setenv bootargs console=${console},${baudrate} " \
                                "root=${root} ${video} ${extra}; " \
-                       "if run loadfdt && fdt addr ${fdt_addr}; then " \
+                       "if run loadfdt; then " \
                                "ubifsumount; " \
                                "bootm ${loadaddr} - ${fdt_addr}; " \
                        "else " \