summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2022-01-22 15:07:22 +0300
committerTom Rini <trini@konsulko.com>2022-02-09 07:07:58 +0300
commit5c86a8f7a191f0034fd992314874b669414dc5a0 (patch)
tree84a376522285cf787c51274765783063bab43e14 /arch
parent531c00894577a0a852431adf61ade76925f8b162 (diff)
downloadu-boot-5c86a8f7a191f0034fd992314874b669414dc5a0.tar.xz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/Makefile2
-rw-r--r--arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg1
-rw-r--r--arch/arm/mach-imx/imx8m/imximage-8mn-ddr4.cfg1
-rw-r--r--arch/arm/mach-imx/imx8m/imximage-8mn-lpddr4.cfg1
-rw-r--r--arch/arm/mach-imx/imx8m/imximage-8mp-lpddr4.cfg1
-rw-r--r--arch/arm/mach-imx/imx8m/imximage.cfg1
-rw-r--r--arch/arm/mach-imx/spl_qspi.cfg1
-rw-r--r--arch/arm/mach-imx/spl_sd.cfg1
8 files changed, 1 insertions, 8 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 <config.h>
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 <config.h>
IMAGE_VERSION 2