Merge "plat/arm: do not include export header directly" into integration

plat/arm/board/a5ds/fdts/a5ds_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/fvp/fdts/fvp_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/juno/fdts/juno_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/rde1edge/fdts/rde1edge_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 / {

plat/arm/board/sgi575/fdts/sgi575_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/sgm775/fdts/sgm775_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;
 

plat/arm/board/tc0/fdts/tc0_fw_config.dts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <export/common/tbbr/tbbr_img_def_exp.h>
+#include <common/tbbr/tbbr_img_def.h>
 
 /dts-v1/;