diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-01-18 16:14:24 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-01-22 10:20:13 +0100 |
| commit | 71a988aa630f013b8425789351971dc4e202593d (patch) | |
| tree | 88f007e7daecf39e11381e326faaddad50ca4b2d /arch/arm/cpu | |
| parent | 00239977097001c1c1331a50a03708faba46e8f4 (diff) | |
| download | talos-obmc-uboot-71a988aa630f013b8425789351971dc4e202593d.tar.gz talos-obmc-uboot-71a988aa630f013b8425789351971dc4e202593d.zip | |
imximage.cfg: run files through C preprocessor
The '#' used as comments in the files cause the preprocessor
trouble, so change to /* */.
The mkimage command which uses this preprocessor output
was moved to arch/arm/imx-common/Makefile
.gitignore was updated to ignore .cfgtmp files.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/config.mk | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/config.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/config.mk b/arch/arm/cpu/arm926ejs/config.mk index 6a3a1bb354..47f24f580e 100644 --- a/arch/arm/cpu/arm926ejs/config.mk +++ b/arch/arm/cpu/arm926ejs/config.mk @@ -34,6 +34,6 @@ PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT) ifneq ($(CONFIG_IMX_CONFIG),) -ALL-y += $(obj)u-boot.imx +ALL-y += $(OBJTREE)/u-boot.imx endif diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk index 9c3e2f3ce4..350e946392 100644 --- a/arch/arm/cpu/armv7/config.mk +++ b/arch/arm/cpu/armv7/config.mk @@ -40,5 +40,5 @@ PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,) PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED) ifneq ($(CONFIG_IMX_CONFIG),) -ALL-y += $(obj)u-boot.imx +ALL-y += $(OBJTREE)/u-boot.imx endif |
