diff options
Diffstat (limited to 'src/cpu/samsung/exynos5-common')
-rw-r--r-- | src/cpu/samsung/exynos5-common/adc.h | 2 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/gpio.h | 2 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/mmc.h | 4 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/mshc.h | 2 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/pwm.h | 4 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/spi.h | 4 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/sromc.h | 4 | ||||
-rw-r--r-- | src/cpu/samsung/exynos5-common/watchdog.h | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/cpu/samsung/exynos5-common/adc.h b/src/cpu/samsung/exynos5-common/adc.h index dc905d14d9..64f4813495 100644 --- a/src/cpu/samsung/exynos5-common/adc.h +++ b/src/cpu/samsung/exynos5-common/adc.h @@ -25,7 +25,7 @@ #ifndef __ASM_ARM_ARCH_COMMON_ADC_H_ #define __ASM_ARM_ARCH_COMMON_ADC_H_ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct s5p_adc { unsigned int adccon; unsigned int adctsc; diff --git a/src/cpu/samsung/exynos5-common/gpio.h b/src/cpu/samsung/exynos5-common/gpio.h index 37dd678b09..d291fae770 100644 --- a/src/cpu/samsung/exynos5-common/gpio.h +++ b/src/cpu/samsung/exynos5-common/gpio.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_COMMON_GPIO_H #define __ASM_ARCH_COMMON_GPIO_H -#ifndef __ASSEMBLY__ /* FIXME: not needed (i hope)? */ +#ifndef __ASSEMBLER__ /* FIXME: not needed (i hope)? */ #include <cpu/samsung/s5p-common/gpio.h> /* FIXME: s5p's gpio.h and exynos' gpio.h have a lot of conflicting definitions */ diff --git a/src/cpu/samsung/exynos5-common/mmc.h b/src/cpu/samsung/exynos5-common/mmc.h index 4e435893aa..f607f82736 100644 --- a/src/cpu/samsung/exynos5-common/mmc.h +++ b/src/cpu/samsung/exynos5-common/mmc.h @@ -21,7 +21,7 @@ #ifndef __ASM_ARCH_COMMON_MMC_H_ #define __ASM_ARCH_COMMON_MMC_H_ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct s5p_mmc { unsigned int sysad; unsigned short blksize; @@ -73,5 +73,5 @@ int s5p_mmc_init(const void *blob); int s5p_mmc_init(int dev_index, int bus_width); #endif -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif diff --git a/src/cpu/samsung/exynos5-common/mshc.h b/src/cpu/samsung/exynos5-common/mshc.h index bdb0a9c10d..623492c17d 100644 --- a/src/cpu/samsung/exynos5-common/mshc.h +++ b/src/cpu/samsung/exynos5-common/mshc.h @@ -21,7 +21,7 @@ #define __ASM_ARCH_COMMON_MSHC_H #include <asm/arch/pinmux.h> -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct mshci_host { struct s5p_mshci *reg; /* Mapped address */ unsigned int clock; /* Current clock in MHz */ diff --git a/src/cpu/samsung/exynos5-common/pwm.h b/src/cpu/samsung/exynos5-common/pwm.h index e35d88d2d6..a4e0acf693 100644 --- a/src/cpu/samsung/exynos5-common/pwm.h +++ b/src/cpu/samsung/exynos5-common/pwm.h @@ -42,7 +42,7 @@ #define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) #define TCON4_AUTO_RELOAD (1 << 22) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct s5p_timer { unsigned int tcfg0; unsigned int tcfg1; @@ -63,6 +63,6 @@ struct s5p_timer { unsigned int tcnto4; unsigned int tintcstat; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif diff --git a/src/cpu/samsung/exynos5-common/spi.h b/src/cpu/samsung/exynos5-common/spi.h index 3430ac1ab2..3f3675921c 100644 --- a/src/cpu/samsung/exynos5-common/spi.h +++ b/src/cpu/samsung/exynos5-common/spi.h @@ -20,7 +20,7 @@ #ifndef __ASM_ARCH_EXYNOS_COMMON_SPI_H_ #define __ASM_ARCH_EXYNOS_COMMON_SPI_H_ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ /* SPI peripheral register map; padded to 64KB */ struct exynos_spi { @@ -85,5 +85,5 @@ struct exynos_spi { #define SPI_RX_BYTE_SWAP (1 << 6) #define SPI_RX_HWORD_SWAP (1 << 7) -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif diff --git a/src/cpu/samsung/exynos5-common/sromc.h b/src/cpu/samsung/exynos5-common/sromc.h index b413373cf4..d4fdae90e6 100644 --- a/src/cpu/samsung/exynos5-common/sromc.h +++ b/src/cpu/samsung/exynos5-common/sromc.h @@ -38,12 +38,12 @@ #define SROMC_BC_TACP(x) (x << 4) /* page mode access cycle */ #define SROMC_BC_PMC(x) (x << 0) /* normal(1data)page mode configuration */ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct s5p_sromc { unsigned int bw; unsigned int bc[4]; }; -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ /* Configure the Band Width and Bank Control Regs for required SROMC Bank */ void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf); diff --git a/src/cpu/samsung/exynos5-common/watchdog.h b/src/cpu/samsung/exynos5-common/watchdog.h index af986388a3..5b3b651ffa 100644 --- a/src/cpu/samsung/exynos5-common/watchdog.h +++ b/src/cpu/samsung/exynos5-common/watchdog.h @@ -41,7 +41,7 @@ #define WTCON_RESET (0x1 << WTCON_RESET_OFFSET) #define WTCON_INT (0x1 << WTCON_INTEN_OFFSET) -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ struct s5p_watchdog { unsigned int wtcon; unsigned int wtdat; @@ -52,6 +52,6 @@ struct s5p_watchdog { /* functions */ void wdt_stop(void); void wdt_start(unsigned int timeout); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif |