diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
| commit | 0d3f88a6dbe59bced2530e69d241f569be58cf3c (patch) | |
| tree | ae94772c93de515e888f15de1f48d9217039a6d0 /include | |
| parent | ca275c3ef10906d1cd5c7d40ab78b2fad0a0c181 (diff) | |
| parent | f546a50feb861c4264892b2089f8e0cff9b6f68e (diff) | |
| download | barebox-0d3f88a6dbe59bced2530e69d241f569be58cf3c.tar.gz barebox-0d3f88a6dbe59bced2530e69d241f569be58cf3c.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index 772058e77d..c8a919b928 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -6,12 +6,7 @@ #define STRUCT_ALIGNMENT 32 #define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT) -#if defined CONFIG_ARCH_IMX25 || \ - defined CONFIG_ARCH_IMX35 || \ - defined CONFIG_ARCH_IMX51 || \ - defined CONFIG_ARCH_IMX53 || \ - defined CONFIG_ARCH_IMX6 || \ - defined CONFIG_X86 || \ +#if defined CONFIG_X86 || \ defined CONFIG_ARCH_EP93XX || \ defined CONFIG_ARCH_ZYNQ #include <mach/barebox.lds.h> |