From dced260b6e1715b806049d60e9cc5cd63e1dc60c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 14 Jul 2015 19:03:00 -0300 Subject: [PATCH] wandboard: Drop revision specific DeviceTree support 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 --- include/configs/wandboard.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 295f834602..19cf072b70 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -145,14 +145,10 @@ "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" \ -- 2.40.1