imx: Don't define __ASSEMBLY__ in source files

This is supposed to be a build-system flag. Move it there so we can
define it before linux/kconfig.h is included.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 07954bc201432d7d415ee4c6e44b3a17c0a23cbc..77e72702bbab4b638a475b277ab7d58812486323 100644 (file)
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -91,7 +91,7 @@ $(PLUGIN).bin:
 endif
 
 quiet_cmd_cpp_cfg = CFGS    $@
-      cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $<
+      cmd_cpp_cfg = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -x c -o $@ $<
 
 # mkimage source config file
 IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)

diff --git a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg
index 1a2e43e6718723f832d345f676f18e3066ee2a32..e06d53ef4171aeb258ba53fcb4bf133c67a47878 100644 (file)
--- a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg
+++ b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 FIT
 BOOT_FROM      sd

diff --git a/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg
index 1405c6560c7ef3f1744bb989f99a5a5536f87c9c..120631a423a95e529d4bb29c19de4e0a04c07943 100644 (file)
--- a/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg
+++ b/arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 FIT
 ROM_VERSION    v2

diff --git a/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg
index 4c63b31db6db66c3aea05685e08eb9777082953d..7dae3fa93aa86a1668329fdb96888a5fd65cda5f 100644 (file)
--- a/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg
+++ b/arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 FIT
 ROM_VERSION    v2

diff --git a/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg b/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg
index 586a5ff306d6a7b95ce82565fcb279d4e99429a1..0fba9f50f3e976b58fd6339a4817e64f86a72d8d 100644 (file)
--- a/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg
+++ b/arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 FIT
 ROM_VERSION    v2

diff --git a/arch/arm/mach-imx/imx8m/imximage.cfg b/arch/arm/mach-imx/imx8m/imximage.cfg
index 2a3f95918353feffc7e00cc090e4da7917b352a5..30490e0418246b60ce5abd32b94acaa239493cab 100644 (file)
--- a/arch/arm/mach-imx/imx8m/imximage.cfg
+++ b/arch/arm/mach-imx/imx8m/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright 2018-2021 NXP
  */
 
-#define __ASSEMBLY__
 
 FIT
 BOOT_FROM      sd

diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg
index 1e39ae2f01f73165db684c6ab694a3f6f6796bd1..6df779b771573b87ac76460e66bdba774a796141 100644 (file)
--- a/arch/arm/mach-imx/spl_qspi.cfg
+++ b/arch/arm/mach-imx/spl_qspi.cfg
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 IMAGE_VERSION  2

diff --git a/arch/arm/mach-imx/spl_sd.cfg b/arch/arm/mach-imx/spl_sd.cfg
index dbaee815357462aef10bc7346f4d6d118ddc7bd1..e739b547005a80b32d65a14ea950d1e227df6f70 100644 (file)
--- a/arch/arm/mach-imx/spl_sd.cfg
+++ b/arch/arm/mach-imx/spl_sd.cfg
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 IMAGE_VERSION  2

diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg
index e324c7ca37c07e998c6db8db4563881999f68f43..5ecde0c530907b0d0393422d6710205b24d5ea19 100644 (file)
--- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg
+++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM SD 0x400

diff --git a/board/aristainetos/aristainetos2.cfg b/board/aristainetos/aristainetos2.cfg
index d088cc83ad4a5eddd4dd0c7f64a20b90f6e41f3a..2454ac5515abbad5bd2dc472abc53b8096fc043d 100644 (file)
--- a/board/aristainetos/aristainetos2.cfg
+++ b/board/aristainetos/aristainetos2.cfg
@@ -21,7 +21,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg b/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg
index 90573be5fd955c67f0df8d841dfd86734129e662..20061521f227e5d45ab6958462abbfd0aad6e35c 100644 (file)
--- a/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg
+++ b/board/beacon/imx8mm/imximage-8mm-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      sd
 LOADER         u-boot-spl-ddr.bin      0x7E1000

diff --git a/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg b/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg
index 7286b26494461d733f87314599fc033f4d52b8bb..0edda9c5e069d2888bdc62c77a94fc07ad0997d2 100644 (file)
--- a/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg
+++ b/board/beacon/imx8mn/imximage-8mn-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 ROM_VERSION    v2
 BOOT_FROM      sd

diff --git a/board/boundary/nitrogen6x/nitrogen6dl.cfg b/board/boundary/nitrogen6x/nitrogen6dl.cfg
index 9558e26a2f11e6fbf835b2c72dd67af08f208959..a57b16a767061c87d8b38179887a9128df5b429f 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6dl.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6dl.cfg
@@ -17,7 +17,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg
index f5a107c22543e7fb39cf19cde3ef041f4e72c3c0..7379b891a657c24305d3dd0a9c23ad78963946a7 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg
@@ -17,7 +17,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/boundary/nitrogen6x/nitrogen6q.cfg b/board/boundary/nitrogen6x/nitrogen6q.cfg
index b0bbf0d7975b63ca92af61d519922d27a55f8eb2..c7029ab03436b8a8dd4320ad9cfac67053a06b3e 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6q.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6q.cfg
@@ -17,7 +17,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/boundary/nitrogen6x/nitrogen6q2g.cfg b/board/boundary/nitrogen6x/nitrogen6q2g.cfg
index 4999254329fde0de1d7925b6ebdd9ac6d833114b..1d58cd4d13df777d5bac5a991126951e207ac881 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6q2g.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6q2g.cfg
@@ -17,7 +17,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/boundary/nitrogen6x/nitrogen6s.cfg b/board/boundary/nitrogen6x/nitrogen6s.cfg
index 16d778491a4014a4826dffcfdb6f30a966bfb3c7..b16d9447fa9aa39341d21191a5ccd81220b18cd6 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6s.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6s.cfg
@@ -17,7 +17,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/boundary/nitrogen6x/nitrogen6s1g.cfg b/board/boundary/nitrogen6x/nitrogen6s1g.cfg
index 0320078a911722ecf08ab2616379f621b15a90e7..debec755d6bb6ae08b9a791e0325c9c9a3c884dc 100644 (file)
--- a/board/boundary/nitrogen6x/nitrogen6s1g.cfg
+++ b/board/boundary/nitrogen6x/nitrogen6s1g.cfg
@@ -17,7 +17,6 @@ IMAGE_VERSION 2
  */
 BOOT_FROM      spi
 
-#define __ASSEMBLY__
 #include <config.h>
 #ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE

diff --git a/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg b/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg
index 4071219fbf4a452d18c8bf7ea74cce0c2a384fbb..f9ce7f89d7c453f7702ebf3fb6be0e552a6ff3bf 100644 (file)
--- a/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg
+++ b/board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      sd
 LOADER         u-boot-spl-ddr.bin      0x7e1000

diff --git a/board/congatec/cgtqmx8/imximage.cfg b/board/congatec/cgtqmx8/imximage.cfg
index e324c7ca37c07e998c6db8db4563881999f68f43..5ecde0c530907b0d0393422d6710205b24d5ea19 100644 (file)
--- a/board/congatec/cgtqmx8/imximage.cfg
+++ b/board/congatec/cgtqmx8/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM SD 0x400

diff --git a/board/ea/mx7ulp_com/imximage.cfg b/board/ea/mx7ulp_com/imximage.cfg
index 1b218996aea95f3ba5857d736c6ac1a5beb6500a..1731da814d0a67fd44a5240e5353e6fb38c6c7ae 100644 (file)
--- a/board/ea/mx7ulp_com/imximage.cfg
+++ b/board/ea/mx7ulp_com/imximage.cfg
@@ -9,7 +9,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg
index 90573be5fd955c67f0df8d841dfd86734129e662..20061521f227e5d45ab6958462abbfd0aad6e35c 100644 (file)
--- a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg
+++ b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      sd
 LOADER         u-boot-spl-ddr.bin      0x7E1000

diff --git a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg b/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
index 7286b26494461d733f87314599fc033f4d52b8bb..0edda9c5e069d2888bdc62c77a94fc07ad0997d2 100644 (file)
--- a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
+++ b/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 ROM_VERSION    v2
 BOOT_FROM      sd

diff --git a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg b/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
index 4c3ecf5a71ad7ac9f9f36594022167fb7d36d0a9..6dedf1724ab656aacffefef2bec9855c155658c7 100644 (file)
--- a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
+++ b/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 ROM_VERSION    v2
 BOOT_FROM      sd

diff --git a/board/freescale/imx8qm_mek/imximage.cfg b/board/freescale/imx8qm_mek/imximage.cfg
index 7dc6b93eb581bfd6ebe7b805ce526d5ae6e160df..71612678c99e897f6b065c5ddf2c5a0aa6e41af6 100644 (file)
--- a/board/freescale/imx8qm_mek/imximage.cfg
+++ b/board/freescale/imx8qm_mek/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright 2018 NXP
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM SD 0x400

diff --git a/board/freescale/imx8qm_mek/uboot-container.cfg b/board/freescale/imx8qm_mek/uboot-container.cfg
index 6cc47cd1027fc065497633289fc31a08af968957..93c5d39ae9b96b9adeba332ce29e6b4629afff94 100644 (file)
--- a/board/freescale/imx8qm_mek/uboot-container.cfg
+++ b/board/freescale/imx8qm_mek/uboot-container.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 /* This file is to create a container image could be loaded by SPL */
 BOOT_FROM SD 0x400

diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/freescale/imx8qxp_mek/imximage.cfg
index cd747d2eee7c3771938cf8e534c9f120e5913197..89a4736ab7a661c896e2cdc496b23bf39e142faf 100644 (file)
--- a/board/freescale/imx8qxp_mek/imximage.cfg
+++ b/board/freescale/imx8qxp_mek/imximage.cfg
@@ -6,7 +6,6 @@
  * and create imx8image boot image
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM SD 0x400

diff --git a/board/freescale/imx8qxp_mek/uboot-container.cfg b/board/freescale/imx8qxp_mek/uboot-container.cfg
index 8165811818523014029703af0707c06f626d410f..b53896f2354ceb1273df52e0c4775251292d367a 100644 (file)
--- a/board/freescale/imx8qxp_mek/uboot-container.cfg
+++ b/board/freescale/imx8qxp_mek/uboot-container.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 /* This file is to create a container image could be loaded by SPL */
 BOOT_FROM SD 0x400

diff --git a/board/freescale/imxrt1020-evk/imximage.cfg b/board/freescale/imxrt1020-evk/imximage.cfg
index 9bcc2c1590775a9108c6d4d807642c82054046df..0ed71479a6061709eb889867e6066bf876098130 100644 (file)
--- a/board/freescale/imxrt1020-evk/imximage.cfg
+++ b/board/freescale/imxrt1020-evk/imximage.cfg
@@ -4,7 +4,6 @@
  * Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/imxrt1050-evk/imximage.cfg b/board/freescale/imxrt1050-evk/imximage.cfg
index cf1665be61087c22dd9e88fc7781af78f788b81c..f1f09fd7ebbb5c2586c6932595adcf91cc8c9ccb 100644 (file)
--- a/board/freescale/imxrt1050-evk/imximage.cfg
+++ b/board/freescale/imxrt1050-evk/imximage.cfg
@@ -4,7 +4,6 @@
  * Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg
index b97761a51629af9987c9dbed7845ee90632d930a..64be101d6eca170ccd8b05fdc0e3cfc7d8e71806 100644 (file)
--- a/board/freescale/mx6slevk/imximage.cfg
+++ b/board/freescale/mx6slevk/imximage.cfg
@@ -7,7 +7,6 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx6sllevk/imximage.cfg b/board/freescale/mx6sllevk/imximage.cfg
index 74b3a907bf2feba8898fb7957f658f70be50be0a..550be3f6c129e359cf5bd1d48008b64cd8ef0462 100644 (file)
--- a/board/freescale/mx6sllevk/imximage.cfg
+++ b/board/freescale/mx6sllevk/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/freescale/mx6sxsabreauto/imximage.cfg
index 4a0bcc5f7d68e50a79670ff3ae6a1b442884cb04..da703093aa6f96804216da93ebec2aa5347d894f 100644 (file)
--- a/board/freescale/mx6sxsabreauto/imximage.cfg
+++ b/board/freescale/mx6sxsabreauto/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg
index 28ffb2f8bc9ce78d15a528599945940e6491066f..313ab5895051983abd925acc6779bc3dab44cfd6 100644 (file)
--- a/board/freescale/mx6sxsabresd/imximage.cfg
+++ b/board/freescale/mx6sxsabresd/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg
index 155503997d26134377d68a8fabfc57cf4354e4c3..0c6f444a7a3986512e11d548467739ddeb675f82 100644 (file)
--- a/board/freescale/mx6ullevk/imximage.cfg
+++ b/board/freescale/mx6ullevk/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg
index 05446ac833dffea24be82ab17ed189a6a70a62f4..59e66fbda16341dd22444295936b54676b7c13ac 100644 (file)
--- a/board/freescale/mx7dsabresd/imximage.cfg
+++ b/board/freescale/mx7dsabresd/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/freescale/mx7ulp_evk/imximage.cfg b/board/freescale/mx7ulp_evk/imximage.cfg
index ec3673040bad76f546374c6b42313c09389dcc7d..62fd79afd6ce66f546695796ad776729ff07f205 100644 (file)
--- a/board/freescale/mx7ulp_evk/imximage.cfg
+++ b/board/freescale/mx7ulp_evk/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/gateworks/venice/imximage-8mm-lpddr4.cfg b/board/gateworks/venice/imximage-8mm-lpddr4.cfg
index ccaa765cb7d4204fd092d0db48d0930741e5b9fb..6bc457c6a20ec8c0dd4cfaba7d957e250a953205 100644 (file)
--- a/board/gateworks/venice/imximage-8mm-lpddr4.cfg
+++ b/board/gateworks/venice/imximage-8mm-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 Gateworks Corporation
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      sd
 LOADER         u-boot-spl-ddr.bin      0x7E1000

diff --git a/board/ge/bx50v3/bx50v3.cfg b/board/ge/bx50v3/bx50v3.cfg
index de3955a94d26c8ab7ddd073b9fb7d110d83292a7..1386516a16f6124c87ad06d04a3cedbd014edaa8 100644 (file)
--- a/board/ge/bx50v3/bx50v3.cfg
+++ b/board/ge/bx50v3/bx50v3.cfg
@@ -13,7 +13,6 @@
 IMAGE_VERSION 2
 BOOT_FROM sd
 
-#define __ASSEMBLY__
 #include <config.h>
 #include "asm/arch/mx6-ddr.h"
 #include "asm/arch/iomux.h"

diff --git a/board/kontron/sl-mx8mm/imximage.cfg b/board/kontron/sl-mx8mm/imximage.cfg
index f101f3d228fd3fd1e8f61f2d92a4215711665721..b5380267114162a2879aed5733e740500a8d0604 100644 (file)
--- a/board/kontron/sl-mx8mm/imximage.cfg
+++ b/board/kontron/sl-mx8mm/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Kontron Electronics GmbH
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      sd
 LOADER         u-boot-spl-ddr.bin      0x7E1000

diff --git a/board/novtech/meerkat96/imximage.cfg b/board/novtech/meerkat96/imximage.cfg
index 86275b84d9c87ad9881a62a2c897fd6cfd793133..a67ce5331416b3b1117830c57b6dcb4c49c0fd89 100644 (file)
--- a/board/novtech/meerkat96/imximage.cfg
+++ b/board/novtech/meerkat96/imximage.cfg
@@ -9,7 +9,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg b/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg
index c0dcfe9a0c594dac021fb6dbd421dc7d30f8e566..38c4572152beb256fde2ce5cee9bcecffb653888 100644 (file)
--- a/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg
+++ b/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg
@@ -2,7 +2,6 @@
 // Copyright (C) 2016 Freescale Semiconductor, Inc.
 // Copyright (C) 2021 Oleh Kravchenko <oleg@kaa.org.ua>
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg b/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg
index 6f823a7272abe73b14cbd16fda6c9f2320285679..497e7f8fc4a712c798237f39603ad3ad4b26e64a 100644 (file)
--- a/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg
+++ b/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg
@@ -2,7 +2,6 @@
 // Copyright (C) 2016 Freescale Semiconductor, Inc.
 // Copyright (C) 2021 Oleh Kravchenko <oleg@kaa.org.ua>
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg b/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg
index ea74fb7e590fa3c04b19a8efb06e575011e182bb..722e62c92d6e7b3fe1d577a22057faa3fac59060 100644 (file)
--- a/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg
+++ b/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 Phytec Messtechnik GmbH
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM       sd
 LOADER          u-boot-spl-ddr.bin      0x7E1000

diff --git a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
index 4c3ecf5a71ad7ac9f9f36594022167fb7d36d0a9..6dedf1724ab656aacffefef2bec9855c155658c7 100644 (file)
--- a/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
+++ b/board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 ROM_VERSION    v2
 BOOT_FROM      sd

diff --git a/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg b/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg
index 268b5ae7163aeed179ed88b16a20fd49a4396fa8..fae7ad836937357e32c182fae7e72982b7ca6bee 100644 (file)
--- a/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg
+++ b/board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg
@@ -3,7 +3,6 @@
  * Copyright 2021 NXP
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      sd
 LOADER         mkimage.flash.mkimage   0x7E1000
\ No newline at end of file

diff --git a/board/siemens/capricorn/imximage.cfg b/board/siemens/capricorn/imximage.cfg
index 9f9df68e64c089e5a9ebf91dffc2cd8c3d8a5f99..fa871bac212c0e2001695a8ee58f7acc7be323e8 100644 (file)
--- a/board/siemens/capricorn/imximage.cfg
+++ b/board/siemens/capricorn/imximage.cfg
@@ -6,7 +6,6 @@
  * and create imx8image boot image
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM SD 0x400

diff --git a/board/siemens/capricorn/uboot-container.cfg b/board/siemens/capricorn/uboot-container.cfg
index 8165811818523014029703af0707c06f626d410f..b53896f2354ceb1273df52e0c4775251292d367a 100644 (file)
--- a/board/siemens/capricorn/uboot-container.cfg
+++ b/board/siemens/capricorn/uboot-container.cfg
@@ -3,7 +3,6 @@
  * Copyright 2019 NXP
  */
 
-#define __ASSEMBLY__
 
 /* This file is to create a container image could be loaded by SPL */
 BOOT_FROM SD 0x400

diff --git a/board/softing/vining_2000/imximage.cfg b/board/softing/vining_2000/imximage.cfg
index f6f59ddf55c26e55915e975a7cca04dc965cc0d6..300aafcae240e42482cace0945fc8269dad35858 100644 (file)
--- a/board/softing/vining_2000/imximage.cfg
+++ b/board/softing/vining_2000/imximage.cfg
@@ -4,7 +4,6 @@
  * Copyright (C) 2017-2019 softing automotive electronics gmbH
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/somlabs/visionsom-6ull/imximage.cfg b/board/somlabs/visionsom-6ull/imximage.cfg
index b49a2df6dd88ef25528393e6fcd8ee62729d4a9b..370b303cfa6a987b0260823c13a95d90125d1d94 100644 (file)
--- a/board/somlabs/visionsom-6ull/imximage.cfg
+++ b/board/somlabs/visionsom-6ull/imximage.cfg
@@ -9,7 +9,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/storopack/smegw01/imximage.cfg b/board/storopack/smegw01/imximage.cfg
index 5ebeea56a772719c7e002c88eef801d8bc36fa76..f8628280262f10e1e77fb86f48f51d3fcc8bf26d 100644 (file)
--- a/board/storopack/smegw01/imximage.cfg
+++ b/board/storopack/smegw01/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 IMAGE_VERSION  2

diff --git a/board/tbs/tbs2910/tbs2910.cfg b/board/tbs/tbs2910/tbs2910.cfg
index 3ca807b31578c8628d810368e9a05aa34ab7aff5..2fa70947cec0c86965b58176d0a48277ca2bb8a5 100644 (file)
--- a/board/tbs/tbs2910/tbs2910.cfg
+++ b/board/tbs/tbs2910/tbs2910.cfg
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 Soeren Moch <smoch@web.de>
  */
 
-#define __ASSEMBLY__
 #include "asm/arch/crm_regs.h"
 #include "asm/arch/iomux.h"
 #include "asm/arch/mx6-ddr.h"

diff --git a/board/technexion/pico-imx6ul/imximage.cfg b/board/technexion/pico-imx6ul/imximage.cfg
index 993c1da6700ea456c58a72accacd720f5b5f44df..98de1782037e4f01243cdc505aa2127447b53d4b 100644 (file)
--- a/board/technexion/pico-imx6ul/imximage.cfg
+++ b/board/technexion/pico-imx6ul/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg
index b8f0f3dc10f836a4bd205dac6721db396c610159..16183f96679d9d1ed65f4d73e36410503491b97f 100644 (file)
--- a/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg
+++ b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg
@@ -6,7 +6,6 @@
  * and create imx8image boot image
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM EMMC_FASTBOOT 0x400

diff --git a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg b/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
index 58c62d0a6595da92e1c11cd326508416aa5c58b8..c229706f80a7817d4cf549d11fdcc4314472498b 100644 (file)
--- a/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
+++ b/board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg
@@ -6,7 +6,6 @@
  * and create imx8image boot image
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM EMMC_FASTBOOT 0x400

diff --git a/board/toradex/colibri-imx6ull/imximage.cfg b/board/toradex/colibri-imx6ull/imximage.cfg
index e162cff90f0ff693fc0c39c85e1a5f5c6dc994cc..0d81f9b2f4c85354a844c6deda537424960a0381 100644 (file)
--- a/board/toradex/colibri-imx6ull/imximage.cfg
+++ b/board/toradex/colibri-imx6ull/imximage.cfg
@@ -9,7 +9,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg
index 44f6c0c4554256e7c458fd53018539c682d2dd87..fa176b0408403db52d0c4cc388d6f5080ce286ba 100644 (file)
--- a/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg
+++ b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg
@@ -6,7 +6,6 @@
  * and create imx8image boot image
  */
 
-#define __ASSEMBLY__
 
 /* Boot from SD, sector size 0x400 */
 BOOT_FROM EMMC_FASTBOOT 0x400

diff --git a/board/toradex/colibri_imx7/imximage.cfg b/board/toradex/colibri_imx7/imximage.cfg
index bdce48b7ffa4376cf80f1fecd002fbb8fbd1f925..41b3577b10dc81513cc9d346a3ff69f2354f5a89 100644 (file)
--- a/board/toradex/colibri_imx7/imximage.cfg
+++ b/board/toradex/colibri_imx7/imximage.cfg
@@ -9,7 +9,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/toradex/verdin-imx8mm/imximage.cfg b/board/toradex/verdin-imx8mm/imximage.cfg
index fcc92009f3b51e02cb6562d5f36105f581635953..0e02e447992ddf777a2cda05982536d07424d176 100644 (file)
--- a/board/toradex/verdin-imx8mm/imximage.cfg
+++ b/board/toradex/verdin-imx8mm/imximage.cfg
@@ -3,7 +3,6 @@
  * Copyright 2020-2021 Toradex
  */
 
-#define __ASSEMBLY__
 
 BOOT_FROM      emmc_fastboot
 LOADER         u-boot-spl-ddr.bin      0x7e1000

diff --git a/board/toradex/verdin-imx8mp/imximage.cfg b/board/toradex/verdin-imx8mp/imximage.cfg
index 7d72de86b1489e02b1103ce7b46122dd3239e05e..969cc73c2650373646cc0379e02a4cb1863818d8 100644 (file)
--- a/board/toradex/verdin-imx8mp/imximage.cfg
+++ b/board/toradex/verdin-imx8mp/imximage.cfg
@@ -3,8 +3,6 @@
  * Copyright 2022 Toradex
  */
 
-#define __ASSEMBLY__
-
 ROM_VERSION    v2
 BOOT_FROM      emmc_fastboot
 LOADER         u-boot-spl-ddr.bin      0x920000

diff --git a/board/tq/tqma6/tqma6dl.cfg b/board/tq/tqma6/tqma6dl.cfg
index 80c71503161dd418f4333d5c20c3573d75294f3f..8cd1885b43fb8f923cd012ab883d4565c85838db 100644 (file)
--- a/board/tq/tqma6/tqma6dl.cfg
+++ b/board/tq/tqma6/tqma6dl.cfg
@@ -11,7 +11,6 @@
 /* image version */
 IMAGE_VERSION 2
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /*

diff --git a/board/tq/tqma6/tqma6q.cfg b/board/tq/tqma6/tqma6q.cfg
index 82a0a271d4f867824c57a944f1dc69d2f8086754..a49489aed3f9ccfe74629d8d15a6adc855915751 100644 (file)
--- a/board/tq/tqma6/tqma6q.cfg
+++ b/board/tq/tqma6/tqma6q.cfg
@@ -11,7 +11,6 @@
 /* image version */
 IMAGE_VERSION 2
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /*

diff --git a/board/tq/tqma6/tqma6s.cfg b/board/tq/tqma6/tqma6s.cfg
index 9cdbb3c7676cdad540910ffc862c8ebb383dd7af..02f7e10910039d2e234b4b2ce8b75634dba9fbcc 100644 (file)
--- a/board/tq/tqma6/tqma6s.cfg
+++ b/board/tq/tqma6/tqma6s.cfg
@@ -11,7 +11,6 @@
 /* image version */
 IMAGE_VERSION 2
 
-#define __ASSEMBLY__
 #include <config.h>
 
 /*

diff --git a/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg b/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg
index 2083233e500b2f4de09b8a0de42637b2e8bfa1fa..a0091cddfb85cb2e7949dceb60ab3447177a9024 100644 (file)
--- a/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg
+++ b/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg
@@ -3,8 +3,6 @@
  * Copyright 2021 Collabora Ltd.
  */
 
-#define __ASSEMBLY__
-
 ROM_VERSION    v2
 BOOT_FROM      sd
 LOADER         u-boot-spl-ddr.bin      0x912000

diff --git a/board/warp/imximage.cfg b/board/warp/imximage.cfg
index d952c6f2e9eac68d77287df5c23cdffe4aa804f8..f6bc604c8b2234cd5406d89a56fbbaa950417b8a 100644 (file)
--- a/board/warp/imximage.cfg
+++ b/board/warp/imximage.cfg
@@ -7,7 +7,6 @@
  *
  * The syntax is taken as close as possible with the kwbimage
  */
-#define __ASSEMBLY__
 #include <config.h>
 
 /* image version */

diff --git a/board/warp7/imximage.cfg b/board/warp7/imximage.cfg
index 9e7d4725e4a161a77096a71513fd9c986dbc0906..ca22ee159b74109520b9fac080266b2c25f83944 100644 (file)
--- a/board/warp7/imximage.cfg
+++ b/board/warp7/imximage.cfg
@@ -8,7 +8,6 @@
  * The syntax is taken as close as possible with the kwbimage
  */
 
-#define __ASSEMBLY__
 #include <config.h>
 
 IMAGE_VERSION  2