]> code.ossystems Code Review - bsp/u-boot.git/commitdiff
wandboard: Drop revision specific DeviceTree support
authorOtavio Salvador <otavio@ossystems.com.br>
Tue, 14 Jul 2015 22:03:00 +0000 (19:03 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Fri, 18 Mar 2016 17:33:58 +0000 (14:33 -0300)
The 3.10.53 and 3.14.28 Wandboard kernels handles the revision in a
single DeviceTree file so the boot script needs to respect that.

This should be reworked in the Wandboard kernel to make it to use the
same schema adppted by the Linux mainline and allow an easy change
between them, however, this need be coordinated before we can do this
in the FSL Community fork as well.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
include/configs/wandboard.h

index 8fb0abc915a0d1bcc4189f3fd7e742ff3eeda74f..538d4d2d06395b5ec619f15a34980817750a8b0b 100644 (file)
                "fi; " \
                "setenv bootargs ${bootargs} ${fbmem}\0" \
        "findfdt="\
-               "if test $board_name = C1 && test $board_rev = MX6Q ; then " \
+               "if test $board_rev = MX6Q ; then " \
                        "setenv fdtfile imx6q-wandboard.dtb; fi; " \
-               "if test $board_name = C1 && test $board_rev = MX6DL ; then " \
+               "if test $board_rev = MX6DL ; then " \
                        "setenv fdtfile imx6dl-wandboard.dtb; fi; " \
-               "if test $board_name = B1 && test $board_rev = MX6Q ; then " \
-                       "setenv fdtfile imx6q-wandboard-revb1.dtb; fi; " \
-               "if test $board_name = B1 && test $board_rev = MX6DL ; then " \
-                       "setenv fdtfile imx6dl-wandboard-revb1.dtb; fi; " \
                "if test $fdtfile = undefined; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \