Merge git://git.denx.de/u-boot-arc

8 years ago · e8009beff6
parent 8d24176a67 c7dea6e259
commit e8009beff6
2 changed files with 4 additions and 2 deletions
--- 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
--- 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>