diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-04 11:46:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-04 11:46:21 -0400 |
| commit | e8009beff6d5c55c1bf1ae8184791f167e6378b0 (patch) | |
| tree | 5b5812b386e4d7b05a295a28c7c06b07da9cf5d9 | |
| parent | 8d24176a674a678d0421cf9c253eb848646f60e2 (diff) | |
| parent | c7dea6e259d68cc0645daf3fe2188e077748ef9e (diff) | |
| download | u-boot-imx-e8009beff6d5c55c1bf1ae8184791f167e6378b0.zip u-boot-imx-e8009beff6d5c55c1bf1ae8184791f167e6378b0.tar.gz u-boot-imx-e8009beff6d5c55c1bf1ae8184791f167e6378b0.tar.bz2 | |
Merge git://git.denx.de/u-boot-arc
| -rw-r--r-- | arch/arc/config.mk | 4 | ||||
| -rw-r--r-- | arch/arc/include/asm/global_data.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arc/config.mk b/arch/arc/config.mk index 74943d9..7c974f0 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -43,11 +43,11 @@ PLATFORM_CPPFLAGS += -marcem endif ifdef CONFIG_CPU_ARCHS34 -PLATFORM_CPPFLAGS += -marchs +PLATFORM_CPPFLAGS += -mcpu=archs endif ifdef CONFIG_CPU_ARCHS38 -PLATFORM_CPPFLAGS += -marchs +PLATFORM_CPPFLAGS += -mcpu=archs endif PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index e25b966..f0242f1 100644 --- a/arch/arc/include/asm/global_data.h +++ b/arch/arc/include/asm/global_data.h @@ -7,9 +7,11 @@ #ifndef __ASM_ARC_GLOBAL_DATA_H #define __ASM_ARC_GLOBAL_DATA_H +#ifndef __ASSEMBLY__ /* Architecture-specific global data */ struct arch_global_data { }; +#endif /* __ASSEMBLY__ */ #include <asm-generic/global_data.h> |