From 5c86a8f7a191f0034fd992314874b669414dc5a0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 22 Jan 2022 05:07:22 -0700 Subject: [PATCH] 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 --- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg | 1 - arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg | 1 - arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg | 1 - arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg | 1 - arch/arm/mach-imx/imx8m/imximage.cfg | 1 - arch/arm/mach-imx/spl_qspi.cfg | 1 - arch/arm/mach-imx/spl_sd.cfg | 1 - board/advantech/imx8qm_rom7720_a1/imximage.cfg | 1 - board/aristainetos/aristainetos2.cfg | 1 - board/beacon/imx8mm/imximage-8mm-lpddr4.cfg | 1 - board/beacon/imx8mn/imximage-8mn-lpddr4.cfg | 1 - board/boundary/nitrogen6x/nitrogen6dl.cfg | 1 - board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 1 - board/boundary/nitrogen6x/nitrogen6q.cfg | 1 - board/boundary/nitrogen6x/nitrogen6q2g.cfg | 1 - board/boundary/nitrogen6x/nitrogen6s.cfg | 1 - board/boundary/nitrogen6x/nitrogen6s1g.cfg | 1 - board/compulab/imx8mm-cl-iot-gate/imximage-8mm-lpddr4.cfg | 1 - board/congatec/cgtqmx8/imximage.cfg | 1 - board/ea/mx7ulp_com/imximage.cfg | 1 - board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg | 1 - board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg | 1 - board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg | 1 - board/freescale/imx8qm_mek/imximage.cfg | 1 - board/freescale/imx8qm_mek/uboot-container.cfg | 1 - board/freescale/imx8qxp_mek/imximage.cfg | 1 - board/freescale/imx8qxp_mek/uboot-container.cfg | 1 - board/freescale/imxrt1020-evk/imximage.cfg | 1 - board/freescale/imxrt1050-evk/imximage.cfg | 1 - board/freescale/mx6slevk/imximage.cfg | 1 - board/freescale/mx6sllevk/imximage.cfg | 1 - board/freescale/mx6sxsabreauto/imximage.cfg | 1 - board/freescale/mx6sxsabresd/imximage.cfg | 1 - board/freescale/mx6ullevk/imximage.cfg | 1 - board/freescale/mx7dsabresd/imximage.cfg | 1 - board/freescale/mx7ulp_evk/imximage.cfg | 1 - board/gateworks/venice/imximage-8mm-lpddr4.cfg | 1 - board/ge/bx50v3/bx50v3.cfg | 1 - board/kontron/sl-mx8mm/imximage.cfg | 1 - board/novtech/meerkat96/imximage.cfg | 1 - board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg | 1 - board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg | 1 - board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg | 1 - board/phytec/phycore_imx8mp/imximage-8mp-sd.cfg | 1 - board/ronetix/imx8mq-cm/imximage-8mq-lpddr4.cfg | 1 - board/siemens/capricorn/imximage.cfg | 1 - board/siemens/capricorn/uboot-container.cfg | 1 - board/softing/vining_2000/imximage.cfg | 1 - board/somlabs/visionsom-6ull/imximage.cfg | 1 - board/storopack/smegw01/imximage.cfg | 1 - board/tbs/tbs2910/tbs2910.cfg | 1 - board/technexion/pico-imx6ul/imximage.cfg | 1 - board/toradex/apalis-imx8/apalis-imx8-imximage.cfg | 1 - board/toradex/apalis-imx8x/apalis-imx8x-imximage.cfg | 1 - board/toradex/colibri-imx6ull/imximage.cfg | 1 - board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg | 1 - board/toradex/colibri_imx7/imximage.cfg | 1 - board/toradex/verdin-imx8mm/imximage.cfg | 1 - board/toradex/verdin-imx8mp/imximage.cfg | 2 -- board/tq/tqma6/tqma6dl.cfg | 1 - board/tq/tqma6/tqma6q.cfg | 1 - board/tq/tqma6/tqma6s.cfg | 1 - board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg | 2 -- board/warp/imximage.cfg | 1 - board/warp7/imximage.cfg | 1 - 66 files changed, 1 insertion(+), 68 deletions(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 07954bc201..77e72702bb 100644 --- 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 1a2e43e671..e06d53ef41 100644 --- 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 1405c6560c..120631a423 100644 --- 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 4c63b31db6..7dae3fa93a 100644 --- 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 586a5ff306..0fba9f50f3 100644 --- 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 2a3f959183..30490e0418 100644 --- 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 1e39ae2f01..6df779b771 100644 --- 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 IMAGE_VERSION 2 diff --git a/arch/arm/mach-imx/spl_sd.cfg b/arch/arm/mach-imx/spl_sd.cfg index dbaee81535..e739b54700 100644 --- 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 IMAGE_VERSION 2 diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index e324c7ca37..5ecde0c530 100644 --- 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 d088cc83ad..2454ac5515 100644 --- a/board/aristainetos/aristainetos2.cfg +++ b/board/aristainetos/aristainetos2.cfg @@ -21,7 +21,6 @@ IMAGE_VERSION 2 */ BOOT_FROM spi -#define __ASSEMBLY__ #include #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 90573be5fd..20061521f2 100644 --- 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 7286b26494..0edda9c5e0 100644 --- 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 9558e26a2f..a57b16a767 100644 --- 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 #ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE diff --git a/board/boundary/nitrogen6x/nitrogen6dl2g.cfg b/board/boundary/nitrogen6x/nitrogen6dl2g.cfg index f5a107c225..7379b891a6 100644 --- 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 #ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE diff --git a/board/boundary/nitrogen6x/nitrogen6q.cfg b/board/boundary/nitrogen6x/nitrogen6q.cfg index b0bbf0d797..c7029ab034 100644 --- 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 #ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE diff --git a/board/boundary/nitrogen6x/nitrogen6q2g.cfg b/board/boundary/nitrogen6x/nitrogen6q2g.cfg index 4999254329..1d58cd4d13 100644 --- 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 #ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE diff --git a/board/boundary/nitrogen6x/nitrogen6s.cfg b/board/boundary/nitrogen6x/nitrogen6s.cfg index 16d778491a..b16d9447fa 100644 --- 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 #ifdef CONFIG_IMX_HAB CSF CONFIG_CSF_SIZE diff --git a/board/boundary/nitrogen6x/nitrogen6s1g.cfg b/board/boundary/nitrogen6x/nitrogen6s1g.cfg index 0320078a91..debec755d6 100644 --- 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 #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 4071219fbf..f9ce7f89d7 100644 --- 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 e324c7ca37..5ecde0c530 100644 --- 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 1b218996ae..1731da814d 100644 --- 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 /* image version */ diff --git a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg b/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg index 90573be5fd..20061521f2 100644 --- 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 7286b26494..0edda9c5e0 100644 --- 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 4c3ecf5a71..6dedf1724a 100644 --- 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 7dc6b93eb5..71612678c9 100644 --- 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 6cc47cd102..93c5d39ae9 100644 --- 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 cd747d2eee..89a4736ab7 100644 --- 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 8165811818..b53896f235 100644 --- 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 9bcc2c1590..0ed71479a6 100644 --- a/board/freescale/imxrt1020-evk/imximage.cfg +++ b/board/freescale/imxrt1020-evk/imximage.cfg @@ -4,7 +4,6 @@ * Author(s): Giulio Benetti */ -#define __ASSEMBLY__ #include /* image version */ diff --git a/board/freescale/imxrt1050-evk/imximage.cfg b/board/freescale/imxrt1050-evk/imximage.cfg index cf1665be61..f1f09fd7eb 100644 --- a/board/freescale/imxrt1050-evk/imximage.cfg +++ b/board/freescale/imxrt1050-evk/imximage.cfg @@ -4,7 +4,6 @@ * Author(s): Giulio Benetti */ -#define __ASSEMBLY__ #include /* image version */ diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg index b97761a516..64be101d6e 100644 --- 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 /* image version */ diff --git a/board/freescale/mx6sllevk/imximage.cfg b/board/freescale/mx6sllevk/imximage.cfg index 74b3a907bf..550be3f6c1 100644 --- 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 /* image version */ diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/freescale/mx6sxsabreauto/imximage.cfg index 4a0bcc5f7d..da703093aa 100644 --- 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 /* image version */ diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg index 28ffb2f8bc..313ab58950 100644 --- 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 /* image version */ diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/freescale/mx6ullevk/imximage.cfg index 155503997d..0c6f444a7a 100644 --- 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 /* image version */ diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg index 05446ac833..59e66fbda1 100644 --- 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 /* image version */ diff --git a/board/freescale/mx7ulp_evk/imximage.cfg b/board/freescale/mx7ulp_evk/imximage.cfg index ec3673040b..62fd79afd6 100644 --- 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 /* image version */ diff --git a/board/gateworks/venice/imximage-8mm-lpddr4.cfg b/board/gateworks/venice/imximage-8mm-lpddr4.cfg index ccaa765cb7..6bc457c6a2 100644 --- 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 de3955a94d..1386516a16 100644 --- 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 #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 f101f3d228..b538026711 100644 --- 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 86275b84d9..a67ce53314 100644 --- 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 /* image version */ diff --git a/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg b/board/out4/o4-imx6ull-nano/K4B4G1646D-BCMA.cfg index c0dcfe9a0c..38c4572152 100644 --- 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 -#define __ASSEMBLY__ #include /* image version */ diff --git a/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg b/board/out4/o4-imx6ull-nano/MT41K256M16HA-125E.cfg index 6f823a7272..497e7f8fc4 100644 --- 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 -#define __ASSEMBLY__ #include /* image version */ diff --git a/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg b/board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg index ea74fb7e59..722e62c92d 100644 --- 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 4c3ecf5a71..6dedf1724a 100644 --- 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 268b5ae716..fae7ad8369 100644 --- 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 9f9df68e64..fa871bac21 100644 --- 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 8165811818..b53896f235 100644 --- 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 f6f59ddf55..300aafcae2 100644 --- 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 /* image version */ diff --git a/board/somlabs/visionsom-6ull/imximage.cfg b/board/somlabs/visionsom-6ull/imximage.cfg index b49a2df6dd..370b303cfa 100644 --- 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 /* image version */ diff --git a/board/storopack/smegw01/imximage.cfg b/board/storopack/smegw01/imximage.cfg index 5ebeea56a7..f862828026 100644 --- 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 IMAGE_VERSION 2 diff --git a/board/tbs/tbs2910/tbs2910.cfg b/board/tbs/tbs2910/tbs2910.cfg index 3ca807b315..2fa70947ce 100644 --- a/board/tbs/tbs2910/tbs2910.cfg +++ b/board/tbs/tbs2910/tbs2910.cfg @@ -3,7 +3,6 @@ * Copyright (C) 2017 Soeren Moch */ -#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 993c1da670..98de178203 100644 --- 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 /* image version */ diff --git a/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg b/board/toradex/apalis-imx8/apalis-imx8-imximage.cfg index b8f0f3dc10..16183f9667 100644 --- 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 58c62d0a65..c229706f80 100644 --- 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 e162cff90f..0d81f9b2f4 100644 --- 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 /* image version */ diff --git a/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg index 44f6c0c455..fa176b0408 100644 --- 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 bdce48b7ff..41b3577b10 100644 --- 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 /* image version */ diff --git a/board/toradex/verdin-imx8mm/imximage.cfg b/board/toradex/verdin-imx8mm/imximage.cfg index fcc92009f3..0e02e44799 100644 --- 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 7d72de86b1..969cc73c26 100644 --- 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 80c7150316..8cd1885b43 100644 --- a/board/tq/tqma6/tqma6dl.cfg +++ b/board/tq/tqma6/tqma6dl.cfg @@ -11,7 +11,6 @@ /* image version */ IMAGE_VERSION 2 -#define __ASSEMBLY__ #include /* diff --git a/board/tq/tqma6/tqma6q.cfg b/board/tq/tqma6/tqma6q.cfg index 82a0a271d4..a49489aed3 100644 --- a/board/tq/tqma6/tqma6q.cfg +++ b/board/tq/tqma6/tqma6q.cfg @@ -11,7 +11,6 @@ /* image version */ IMAGE_VERSION 2 -#define __ASSEMBLY__ #include /* diff --git a/board/tq/tqma6/tqma6s.cfg b/board/tq/tqma6/tqma6s.cfg index 9cdbb3c767..02f7e10910 100644 --- a/board/tq/tqma6/tqma6s.cfg +++ b/board/tq/tqma6/tqma6s.cfg @@ -11,7 +11,6 @@ /* image version */ IMAGE_VERSION 2 -#define __ASSEMBLY__ #include /* diff --git a/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg b/board/variscite/imx8mn_var_som/imximage-8mn-ddr4.cfg index 2083233e50..a0091cddfb 100644 --- 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 d952c6f2e9..f6bc604c8b 100644 --- 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 /* image version */ diff --git a/board/warp7/imximage.cfg b/board/warp7/imximage.cfg index 9e7d4725e4..ca22ee159b 100644 --- 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 IMAGE_VERSION 2 -- 2.39.5