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>
2022-01-22 05:07:22 -07:00 · 2022-01-22 05:07:22 -07:00 · 5c86a8f7a1
commit 5c86a8f7a1
parent 531c008945
66 changed files with 1 additions and 68 deletions
--- 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:"%"=%)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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 */
--- 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
--- 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"
--- 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
--- 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 */
--- 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 */
--- 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 */
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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 */
--- 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
--- 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"
--- 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 */
--- 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
--- 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
--- 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 */
--- 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
--- 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 */
--- 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
--- 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
--- 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>

 /*
--- 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>

 /*
--- 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>

 /*
--- 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
--- 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 */
--- 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