From 5044166838527a4184841c4dc75f5a4dae295ebd Mon Sep 17 00:00:00 2001 From: Clement Faure Date: Mon, 16 Apr 2018 11:22:05 +0200 Subject: [PATCH] MLK-18036 Remove loading of *optee.dts files Dedicated *optee.dts device trees no longer exist. The dtb loaded is the same whether or not optee is enabled. Signed-off-by: Clement Faure (cherry picked from commit cfeba2d9d508bbfd776ab264bc00eb310f45846f) --- include/configs/mx6sabre_common.h | 18 ++++++------------ include/configs/mx6slevk.h | 6 +----- include/configs/mx6sllevk.h | 6 +----- include/configs/mx6sxsabreauto.h | 6 +----- include/configs/mx6sxsabresd.h | 6 +----- include/configs/mx6ul_14x14_evk.h | 10 ++-------- include/configs/mx6ullevk.h | 10 ++-------- include/configs/mx7dsabresd.h | 6 +----- 8 files changed, 15 insertions(+), 53 deletions(-) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index a7847f9d70..2457049834 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -240,25 +240,19 @@ "findfdt="\ "if test $fdt_file = undefined; then " \ "if test $board_name = SABREAUTO && test $board_rev = MX6QP; then " \ - "setenv fdt_file imx6qp-sabreauto; fi; " \ + "setenv fdt_file imx6qp-sabreauto.dtb; fi; " \ "if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \ - "setenv fdt_file imx6q-sabreauto; fi; " \ + "setenv fdt_file imx6q-sabreauto.dtb; fi; " \ "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \ - "setenv fdt_file imx6dl-sabreauto; fi; " \ + "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6QP; then " \ - "setenv fdt_file imx6qp-sabresd; fi; " \ + "setenv fdt_file imx6qp-sabresd.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \ - "setenv fdt_file imx6q-sabresd; fi; " \ + "setenv fdt_file imx6q-sabresd.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \ - "setenv fdt_file imx6dl-sabresd; fi; " \ + "setenv fdt_file imx6dl-sabresd.dtb; fi; " \ "if test $fdt_file = undefined; then " \ "echo WARNING: Could not determine dtb to use; " \ - "else " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file $fdt_file-optee.dtb; " \ - "else " \ - "setenv fdt_file $fdt_file.dtb; " \ - "fi; " \ "fi; " \ "fi;\0" \ "findtee="\ diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 29acd85f1d..0efbcbec7e 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -159,11 +159,7 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file imx6sl-evk-optee.dtb; " \ - "else " \ - "setenv fdt_file imx6sl-evk.dtb; " \ - "fi; " \ + "setenv fdt_file imx6sl-evk.dtb; " \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 1c3153fa1a..5ce8025aca 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -124,11 +124,7 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file imx6sll-evk-optee.dtb; " \ - "else " \ - "setenv fdt_file imx6sll-evk.dtb; " \ - "fi; " \ + "setenv fdt_file imx6sll-evk.dtb; " \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 6890d9140a..fe4dfd4711 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -178,11 +178,7 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file imx6sx-sdb-optee.dtb; " \ - "else " \ - "setenv fdt_file imx6sx-sdb.dtb; " \ - "fi; " \ + "setenv fdt_file imx6sx-sdb.dtb; " \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 08c81edde1..7be718b6ad 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -159,11 +159,7 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file imx6sx-sdb-optee.dtb; " \ - "else " \ - "setenv fdt_file imx6sx-sdb.dtb; " \ - "fi; " \ + "setenv fdt_file imx6sx-sdb.dtb; " \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index a245582978..bf4653e7b9 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -214,17 +214,11 @@ "findfdt="\ "if test $fdt_file = undefined; then " \ "if test $board_name = EVK && test $board_rev = 9X9; then " \ - "setenv fdt_file imx6ul-9x9-evk; fi; " \ + "setenv fdt_file imx6ul-9x9-evk.dtb; fi; " \ "if test $board_name = EVK && test $board_rev = 14X14; then " \ - "setenv fdt_file imx6ul-14x14-evk; fi; " \ + "setenv fdt_file imx6ul-14x14-evk.dtb; fi; " \ "if test $fdt_file = undefined; then " \ "echo WARNING: Could not determine dtb to use; " \ - "else " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file $fdt_file-optee.dtb; " \ - "else " \ - "setenv fdt_file $fdt_file.dtb; " \ - "fi; " \ "fi; " \ "fi;\0" \ diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index b044bc12b6..c48acc75c8 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -200,17 +200,11 @@ "findfdt="\ "if test $fdt_file = undefined; then " \ "if test $board_name = EVK && test $board_rev = 9X9; then " \ - "setenv fdt_file imx6ull-9x9-evk; fi; " \ + "setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \ "if test $board_name = EVK && test $board_rev = 14X14; then " \ - "setenv fdt_file imx6ull-14x14-evk; fi; " \ + "setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \ "if test $fdt_file = undefined; then " \ "echo WARNING: Could not determine dtb to use; " \ - "else " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file $fdt_file-optee.dtb; " \ - "else " \ - "setenv fdt_file $fdt_file.dtb; " \ - "fi; " \ "fi; " \ "fi;\0" \ diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 7262acb4ba..05dc4db32b 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -235,11 +235,7 @@ "fi;\0" \ "findfdt="\ "if test $fdt_file = undefined; then " \ - "if test ${tee} = yes; then " \ - "setenv fdt_file imx7d-sdb-optee.dtb; " \ - "else " \ - "setenv fdt_file imx7d-sdb.dtb; " \ - "fi; " \ + "setenv fdt_file imx7d-sdb.dtb; " \ "fi;\0" \ #define CONFIG_BOOTCOMMAND \ -- 2.17.1