GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARMv7: drop __ASSEMBLY__ 

We moved to using __ASSEMBLER__ years ago since it is set by as.

Change-Id: I60103ba23ebe87be1d0bc63beed0ef5b05eed4f2
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2111
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Stefan Reinauer 2013-01-04 16:29:29 -08:00 committed by Ronald G. Minnich
parent 9bcab0c72b
commit 2f25d9963e
20 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/armv7/include/system.h
View File

@ -60,7 +60,7 @@
#define arch_align_stack(x) (x) #define arch_align_stack(x) (x)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
static inline unsigned int get_cr(void) static inline unsigned int get_cr(void)
{ {
unsigned int val; unsigned int val;

1
src/arch/armv7/init.S
View File

@ -29,7 +29,6 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#define __ASSEMBLY__
#include <system.h> #include <system.h>
.globl _start .globl _start

1
src/arch/armv7/start.S
View File

@ -29,7 +29,6 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#define __ASSEMBLY__
#include <system.h> #include <system.h>
.globl _start .globl _start

2
src/cpu/samsung/exynos5-common/adc.h
View File

@ -25,7 +25,7 @@
#ifndef __ASM_ARM_ARCH_COMMON_ADC_H_ #ifndef __ASM_ARM_ARCH_COMMON_ADC_H_
#define __ASM_ARM_ARCH_COMMON_ADC_H_ #define __ASM_ARM_ARCH_COMMON_ADC_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_adc { struct s5p_adc {
unsigned int adccon; unsigned int adccon;
unsigned int adctsc; unsigned int adctsc;

2
src/cpu/samsung/exynos5-common/gpio.h
View File

@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_COMMON_GPIO_H #ifndef __ASM_ARCH_COMMON_GPIO_H
#define __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> #include <cpu/samsung/s5p-common/gpio.h>
/* FIXME: s5p's gpio.h and exynos' gpio.h have a lot of conflicting /* FIXME: s5p's gpio.h and exynos' gpio.h have a lot of conflicting
definitions */ definitions */

4
src/cpu/samsung/exynos5-common/mmc.h
View File

@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_COMMON_MMC_H_ #ifndef __ASM_ARCH_COMMON_MMC_H_
#define __ASM_ARCH_COMMON_MMC_H_ #define __ASM_ARCH_COMMON_MMC_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_mmc { struct s5p_mmc {
unsigned int sysad; unsigned int sysad;
unsigned short blksize; unsigned short blksize;
@ -73,5 +73,5 @@ int s5p_mmc_init(const void *blob);
int s5p_mmc_init(int dev_index, int bus_width); int s5p_mmc_init(int dev_index, int bus_width);
#endif #endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

2
src/cpu/samsung/exynos5-common/mshc.h
View File

@ -21,7 +21,7 @@
#define __ASM_ARCH_COMMON_MSHC_H #define __ASM_ARCH_COMMON_MSHC_H
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct mshci_host { struct mshci_host {
struct s5p_mshci *reg; /* Mapped address */ struct s5p_mshci *reg; /* Mapped address */
unsigned int clock; /* Current clock in MHz */ unsigned int clock; /* Current clock in MHz */

4
src/cpu/samsung/exynos5-common/pwm.h
View File

@ -42,7 +42,7 @@
#define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) #define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3))
#define TCON4_AUTO_RELOAD (1 << 22) #define TCON4_AUTO_RELOAD (1 << 22)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_timer { struct s5p_timer {
unsigned int tcfg0; unsigned int tcfg0;
unsigned int tcfg1; unsigned int tcfg1;
@ -63,6 +63,6 @@ struct s5p_timer {
unsigned int tcnto4; unsigned int tcnto4;
unsigned int tintcstat; unsigned int tintcstat;
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

4
src/cpu/samsung/exynos5-common/spi.h
View File

@ -20,7 +20,7 @@
#ifndef __ASM_ARCH_EXYNOS_COMMON_SPI_H_ #ifndef __ASM_ARCH_EXYNOS_COMMON_SPI_H_
#define __ASM_ARCH_EXYNOS_COMMON_SPI_H_ #define __ASM_ARCH_EXYNOS_COMMON_SPI_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* SPI peripheral register map; padded to 64KB */ /* SPI peripheral register map; padded to 64KB */
struct exynos_spi { struct exynos_spi {
@ -85,5 +85,5 @@ struct exynos_spi {
#define SPI_RX_BYTE_SWAP (1 << 6) #define SPI_RX_BYTE_SWAP (1 << 6)
#define SPI_RX_HWORD_SWAP (1 << 7) #define SPI_RX_HWORD_SWAP (1 << 7)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

4
src/cpu/samsung/exynos5-common/sromc.h
View File

@ -38,12 +38,12 @@
#define SROMC_BC_TACP(x) (x << 4) /* page mode access cycle */ #define SROMC_BC_TACP(x) (x << 4) /* page mode access cycle */
#define SROMC_BC_PMC(x) (x << 0) /* normal(1data)page mode configuration */ #define SROMC_BC_PMC(x) (x << 0) /* normal(1data)page mode configuration */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_sromc { struct s5p_sromc {
unsigned int bw; unsigned int bw;
unsigned int bc[4]; unsigned int bc[4];
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/* Configure the Band Width and Bank Control Regs for required SROMC Bank */ /* 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); void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf);

4
src/cpu/samsung/exynos5-common/watchdog.h
View File

@ -41,7 +41,7 @@
#define WTCON_RESET (0x1 << WTCON_RESET_OFFSET) #define WTCON_RESET (0x1 << WTCON_RESET_OFFSET)
#define WTCON_INT (0x1 << WTCON_INTEN_OFFSET) #define WTCON_INT (0x1 << WTCON_INTEN_OFFSET)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_watchdog { struct s5p_watchdog {
unsigned int wtcon; unsigned int wtcon;
unsigned int wtdat; unsigned int wtdat;
@ -52,6 +52,6 @@ struct s5p_watchdog {
/* functions */ /* functions */
void wdt_stop(void); void wdt_stop(void);
void wdt_start(unsigned int timeout); void wdt_start(unsigned int timeout);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

2
src/cpu/samsung/exynos5250/cpu.h
View File

@ -79,7 +79,7 @@
/* Distance between each Trust Zone PC register set */ /* Distance between each Trust Zone PC register set */
#define TZPC_BASE_OFFSET 0x10000 #define TZPC_BASE_OFFSET 0x10000
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define SAMSUNG_BASE(device, base) \ #define SAMSUNG_BASE(device, base) \
static inline unsigned int samsung_get_base_##device(void) \ static inline unsigned int samsung_get_base_##device(void) \

4
src/cpu/samsung/exynos5250/spi.h
View File

@ -20,7 +20,7 @@
#ifndef __ASM_ARCH_EXYNOS_COMMON_SPI_H_ #ifndef __ASM_ARCH_EXYNOS_COMMON_SPI_H_
#define __ASM_ARCH_EXYNOS_COMMON_SPI_H_ #define __ASM_ARCH_EXYNOS_COMMON_SPI_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* SPI peripheral register map; padded to 64KB */ /* SPI peripheral register map; padded to 64KB */
struct exynos_spi { struct exynos_spi {
@ -85,5 +85,5 @@ struct exynos_spi {
#define SPI_RX_BYTE_SWAP (1 << 6) #define SPI_RX_BYTE_SWAP (1 << 6)
#define SPI_RX_HWORD_SWAP (1 << 7) #define SPI_RX_HWORD_SWAP (1 << 7)
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

2
src/cpu/samsung/s5p-common/clock.h
View File

@ -23,7 +23,7 @@
#ifndef __ASM_ARM_ARCH_CLOCK_H_ #ifndef __ASM_ARM_ARCH_CLOCK_H_
#define __ASM_ARM_ARCH_CLOCK_H_ #define __ASM_ARM_ARCH_CLOCK_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5pc100_clock { struct s5pc100_clock {
unsigned int apll_lock; unsigned int apll_lock;
unsigned int mpll_lock; unsigned int mpll_lock;

2
src/cpu/samsung/s5p-common/gpio.h
View File

@ -23,7 +23,7 @@
#include <cpu/samsung/s5p-common/cpu.h> /* FIXME: for S5PC110_GPIO_BASE */ #include <cpu/samsung/s5p-common/cpu.h> /* FIXME: for S5PC110_GPIO_BASE */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_gpio_bank { struct s5p_gpio_bank {
unsigned int con; unsigned int con;
unsigned int dat; unsigned int dat;

4
src/cpu/samsung/s5p-common/mmc.h
View File

@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_MMC_H_ #ifndef __ASM_ARCH_MMC_H_
#define __ASM_ARCH_MMC_H_ #define __ASM_ARCH_MMC_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_mmc { struct s5p_mmc {
unsigned int sysad; unsigned int sysad;
unsigned short blksize; unsigned short blksize;
@ -69,5 +69,5 @@ struct mmc_host {
int s5p_mmc_init(int dev_index, int bus_width); int s5p_mmc_init(int dev_index, int bus_width);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

4
src/cpu/samsung/s5p-common/pwm.h
View File

@ -42,7 +42,7 @@
#define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) #define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3))
#define TCON4_AUTO_RELOAD (1 << 22) #define TCON4_AUTO_RELOAD (1 << 22)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_timer { struct s5p_timer {
unsigned int tcfg0; unsigned int tcfg0;
unsigned int tcfg1; unsigned int tcfg1;
@ -63,7 +63,7 @@ struct s5p_timer {
unsigned int tcnto4; unsigned int tcnto4;
unsigned int tintcstat; unsigned int tintcstat;
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/* FIXME(dhendrix): added missing prototypes... */ /* FIXME(dhendrix): added missing prototypes... */
int pwm_config(int pwm_id, int duty_ns, int period_ns); int pwm_config(int pwm_id, int duty_ns, int period_ns);

4
src/cpu/samsung/s5p-common/sromc.h
View File

@ -40,12 +40,12 @@
#define SMC_BC_TACP(x) (x << 4) /* 6clk page mode access cycle */ #define SMC_BC_TACP(x) (x << 4) /* 6clk page mode access cycle */
#define SMC_BC_PMC(x) (x << 0) /* normal(1data)page mode configuration */ #define SMC_BC_PMC(x) (x << 0) /* normal(1data)page mode configuration */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_sromc { struct s5p_sromc {
unsigned int bw; unsigned int bw;
unsigned int bc[6]; unsigned int bc[6];
}; };
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
/* Configure the Band Width and Bank Control Regs for required SROMC Bank */ /* 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); void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf);

4
src/cpu/samsung/s5p-common/uart.h
View File

@ -23,7 +23,7 @@
#ifndef __ASM_ARCH_UART_H_ #ifndef __ASM_ARCH_UART_H_
#define __ASM_ARCH_UART_H_ #define __ASM_ARCH_UART_H_
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
/* baudrate rest value */ /* baudrate rest value */
union br_rest { union br_rest {
unsigned short slot; /* udivslot */ unsigned short slot; /* udivslot */
@ -53,6 +53,6 @@ static inline int s5p_uart_divslot(void)
return 1; return 1;
} }
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif

4
src/cpu/samsung/s5p-common/watchdog.h
View File

@ -42,7 +42,7 @@
#define WTCON_RESET (0x1 << WTCON_RESET_OFFSET) #define WTCON_RESET (0x1 << WTCON_RESET_OFFSET)
#define WTCON_INT (0x1 << WTCON_INTEN_OFFSET) #define WTCON_INT (0x1 << WTCON_INTEN_OFFSET)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct s5p_watchdog { struct s5p_watchdog {
unsigned int wtcon; unsigned int wtcon;
unsigned int wtdat; unsigned int wtdat;
@ -53,6 +53,6 @@ struct s5p_watchdog {
/* functions */ /* functions */
void wdt_stop(void); void wdt_stop(void);
void wdt_start(unsigned int timeout); void wdt_start(unsigned int timeout);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif #endif