summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-07-04 11:46:21 -0400
committerTom Rini <trini@konsulko.com>2016-07-04 11:46:21 -0400
commite8009beff6d5c55c1bf1ae8184791f167e6378b0 (patch)
tree5b5812b386e4d7b05a295a28c7c06b07da9cf5d9 /arch
parent8d24176a674a678d0421cf9c253eb848646f60e2 (diff)
parentc7dea6e259d68cc0645daf3fe2188e077748ef9e (diff)
downloadblackbird-obmc-uboot-e8009beff6d5c55c1bf1ae8184791f167e6378b0.tar.gz
blackbird-obmc-uboot-e8009beff6d5c55c1bf1ae8184791f167e6378b0.zip
Merge git://git.denx.de/u-boot-arc
Diffstat (limited to 'arch')
-rw-r--r--arch/arc/config.mk4
-rw-r--r--arch/arc/include/asm/global_data.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index 74943d9ffe..7c974f0055 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 e25b966feb..f0242f1ad6 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>
OpenPOWER on IntegriCloud