Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5044166838527a4184841c4dc75f5a4dae295ebd

Authored by Clement Faure
Committed by Silvano di Ninno
1 parent 79979ad54e
Exists in smarc-imx_v2017.03_o8.1.0_1.3.0_8m and in 1 other branch smarc-imx_v2017.03_4.9.88_2.0.0_ga

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 <clement.faure@nxp.com>
(cherry picked from commit cfeba2d9d508bbfd776ab264bc00eb310f45846f)

Showing 8 changed files with 15 additions and 53 deletions Side-by-side Diff

include/configs/mx6sabre_common.h
Diff comments   View file @ 5044166
... ... @@ -240,25 +240,19 @@
240 240 "findfdt="\
241 241 "if test $fdt_file = undefined; then " \
242 242 "if test $board_name = SABREAUTO && test $board_rev = MX6QP; then " \
243   - "setenv fdt_file imx6qp-sabreauto; fi; " \
  243 + "setenv fdt_file imx6qp-sabreauto.dtb; fi; " \
244 244 "if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \
245   - "setenv fdt_file imx6q-sabreauto; fi; " \
  245 + "setenv fdt_file imx6q-sabreauto.dtb; fi; " \
246 246 "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \
247   - "setenv fdt_file imx6dl-sabreauto; fi; " \
  247 + "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \
248 248 "if test $board_name = SABRESD && test $board_rev = MX6QP; then " \
249   - "setenv fdt_file imx6qp-sabresd; fi; " \
  249 + "setenv fdt_file imx6qp-sabresd.dtb; fi; " \
250 250 "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \
251   - "setenv fdt_file imx6q-sabresd; fi; " \
  251 + "setenv fdt_file imx6q-sabresd.dtb; fi; " \
252 252 "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \
253   - "setenv fdt_file imx6dl-sabresd; fi; " \
  253 + "setenv fdt_file imx6dl-sabresd.dtb; fi; " \
254 254 "if test $fdt_file = undefined; then " \
255 255 "echo WARNING: Could not determine dtb to use; " \
256   - "else " \
257   - "if test ${tee} = yes; then " \
258   - "setenv fdt_file $fdt_file-optee.dtb; " \
259   - "else " \
260   - "setenv fdt_file $fdt_file.dtb; " \
261   - "fi; " \
262 256 "fi; " \
263 257 "fi;\0" \
264 258 "findtee="\
include/configs/mx6slevk.h
Diff comments   View file @ 5044166
... ... @@ -159,11 +159,7 @@
159 159 "fi;\0" \
160 160 "findfdt="\
161 161 "if test $fdt_file = undefined; then " \
162   - "if test ${tee} = yes; then " \
163   - "setenv fdt_file imx6sl-evk-optee.dtb; " \
164   - "else " \
165   - "setenv fdt_file imx6sl-evk.dtb; " \
166   - "fi; " \
  162 + "setenv fdt_file imx6sl-evk.dtb; " \
167 163 "fi;\0" \
168 164  
169 165 #define CONFIG_BOOTCOMMAND \
include/configs/mx6sllevk.h
Diff comments   View file @ 5044166
... ... @@ -124,11 +124,7 @@
124 124 "fi;\0" \
125 125 "findfdt="\
126 126 "if test $fdt_file = undefined; then " \
127   - "if test ${tee} = yes; then " \
128   - "setenv fdt_file imx6sll-evk-optee.dtb; " \
129   - "else " \
130   - "setenv fdt_file imx6sll-evk.dtb; " \
131   - "fi; " \
  127 + "setenv fdt_file imx6sll-evk.dtb; " \
132 128 "fi;\0" \
133 129  
134 130 #define CONFIG_BOOTCOMMAND \
include/configs/mx6sxsabreauto.h
Diff comments   View file @ 5044166
... ... @@ -178,11 +178,7 @@
178 178 "fi;\0" \
179 179 "findfdt="\
180 180 "if test $fdt_file = undefined; then " \
181   - "if test ${tee} = yes; then " \
182   - "setenv fdt_file imx6sx-sdb-optee.dtb; " \
183   - "else " \
184   - "setenv fdt_file imx6sx-sdb.dtb; " \
185   - "fi; " \
  181 + "setenv fdt_file imx6sx-sdb.dtb; " \
186 182 "fi;\0" \
187 183  
188 184 #define CONFIG_BOOTCOMMAND \
include/configs/mx6sxsabresd.h
Diff comments   View file @ 5044166
... ... @@ -159,11 +159,7 @@
159 159 "fi;\0" \
160 160 "findfdt="\
161 161 "if test $fdt_file = undefined; then " \
162   - "if test ${tee} = yes; then " \
163   - "setenv fdt_file imx6sx-sdb-optee.dtb; " \
164   - "else " \
165   - "setenv fdt_file imx6sx-sdb.dtb; " \
166   - "fi; " \
  162 + "setenv fdt_file imx6sx-sdb.dtb; " \
167 163 "fi;\0" \
168 164  
169 165 #define CONFIG_BOOTCOMMAND \
include/configs/mx6ul_14x14_evk.h
Diff comments   View file @ 5044166
... ... @@ -214,17 +214,11 @@
214 214 "findfdt="\
215 215 "if test $fdt_file = undefined; then " \
216 216 "if test $board_name = EVK && test $board_rev = 9X9; then " \
217   - "setenv fdt_file imx6ul-9x9-evk; fi; " \
  217 + "setenv fdt_file imx6ul-9x9-evk.dtb; fi; " \
218 218 "if test $board_name = EVK && test $board_rev = 14X14; then " \
219   - "setenv fdt_file imx6ul-14x14-evk; fi; " \
  219 + "setenv fdt_file imx6ul-14x14-evk.dtb; fi; " \
220 220 "if test $fdt_file = undefined; then " \
221 221 "echo WARNING: Could not determine dtb to use; " \
222   - "else " \
223   - "if test ${tee} = yes; then " \
224   - "setenv fdt_file $fdt_file-optee.dtb; " \
225   - "else " \
226   - "setenv fdt_file $fdt_file.dtb; " \
227   - "fi; " \
228 222 "fi; " \
229 223 "fi;\0" \
230 224  
include/configs/mx6ullevk.h
Diff comments   View file @ 5044166
... ... @@ -200,17 +200,11 @@
200 200 "findfdt="\
201 201 "if test $fdt_file = undefined; then " \
202 202 "if test $board_name = EVK && test $board_rev = 9X9; then " \
203   - "setenv fdt_file imx6ull-9x9-evk; fi; " \
  203 + "setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \
204 204 "if test $board_name = EVK && test $board_rev = 14X14; then " \
205   - "setenv fdt_file imx6ull-14x14-evk; fi; " \
  205 + "setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \
206 206 "if test $fdt_file = undefined; then " \
207 207 "echo WARNING: Could not determine dtb to use; " \
208   - "else " \
209   - "if test ${tee} = yes; then " \
210   - "setenv fdt_file $fdt_file-optee.dtb; " \
211   - "else " \
212   - "setenv fdt_file $fdt_file.dtb; " \
213   - "fi; " \
214 208 "fi; " \
215 209 "fi;\0" \
216 210  
include/configs/mx7dsabresd.h
Diff comments   View file @ 5044166
... ... @@ -235,11 +235,7 @@
235 235 "fi;\0" \
236 236 "findfdt="\
237 237 "if test $fdt_file = undefined; then " \
238   - "if test ${tee} = yes; then " \
239   - "setenv fdt_file imx7d-sdb-optee.dtb; " \
240   - "else " \
241   - "setenv fdt_file imx7d-sdb.dtb; " \
242   - "fi; " \
  238 + "setenv fdt_file imx7d-sdb.dtb; " \
243 239 "fi;\0" \
244 240  
245 241 #define CONFIG_BOOTCOMMAND \