Use __ASSEMBLY__ as the assembly macros
Some places use __ASSEMBLER__ instead which does not work since the Makefile does not define it. Fix them. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
c05ed00afb
commit
f09f1ecbe7
|
@ -589,5 +589,5 @@ struct ccsr_serdes {
|
||||||
u8 res5[0x19fc - 0xa00];
|
u8 res5[0x19fc - 0xa00];
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*__ASSEMBLY__*/
|
#endif /*__ASSEMBLY__ */
|
||||||
#endif /* __ARCH_FSL_LSCH3_IMMAP_H_ */
|
#endif /* __ARCH_FSL_LSCH3_IMMAP_H_ */
|
||||||
|
|
|
@ -21,6 +21,6 @@ struct rtc_regs {
|
||||||
u32 dayr;
|
u32 dayr;
|
||||||
u32 dayalarm;
|
u32 dayalarm;
|
||||||
};
|
};
|
||||||
#endif /* __ASSEMBLY__*/
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __MX28_REGS_RTC_H__ */
|
#endif /* __MX28_REGS_RTC_H__ */
|
||||||
|
|
|
@ -557,6 +557,6 @@ struct pwm_regs {
|
||||||
u32 cnr;
|
u32 cnr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__*/
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_MX5_IMX_REGS_H__ */
|
#endif /* __ASM_ARCH_MX5_IMX_REGS_H__ */
|
||||||
|
|
|
@ -1003,5 +1003,5 @@ struct pwm_regs {
|
||||||
*/
|
*/
|
||||||
#define is_boot_from_usb(void) (!(readl(USB_PHY0_BASE_ADDR) & (1<<20)))
|
#define is_boot_from_usb(void) (!(readl(USB_PHY0_BASE_ADDR) & (1<<20)))
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__*/
|
#endif /* __ASSEMBLY__ */
|
||||||
#endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */
|
#endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */
|
||||||
|
|
|
@ -1223,5 +1223,5 @@ struct bootrom_sw_info {
|
||||||
u32 reserved_3[3];
|
u32 reserved_3[3];
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__*/
|
#endif /* __ASSEMBLY__ */
|
||||||
#endif /* __ASM_ARCH_MX7_IMX_REGS_H__ */
|
#endif /* __ASM_ARCH_MX7_IMX_REGS_H__ */
|
||||||
|
|
|
@ -323,6 +323,6 @@ struct mscm_ir {
|
||||||
u32 ipcie[4]; /* Interconnect Parity Checking Injection Enable Register */
|
u32 ipcie[4]; /* Interconnect Parity Checking Injection Enable Register */
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_IMX_REGS_H__ */
|
#endif /* __ASM_ARCH_IMX_REGS_H__ */
|
||||||
|
|
|
@ -474,6 +474,6 @@ struct mscm {
|
||||||
u32 cpxcfg3;
|
u32 cpxcfg3;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__*/
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_IMX_REGS_H__ */
|
#endif /* __ASM_ARCH_IMX_REGS_H__ */
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
phys_addr_t socfpga_get_clkmgr_addr(void);
|
phys_addr_t socfpga_get_clkmgr_addr(void);
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLY__
|
||||||
void cm_wait_for_lock(u32 mask);
|
void cm_wait_for_lock(u32 mask);
|
||||||
int cm_wait_for_fsm(void);
|
int cm_wait_for_fsm(void);
|
||||||
void cm_print_clock_quick_summary(void);
|
void cm_print_clock_quick_summary(void);
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#ifndef CLOCK_MANAGER_ARRIA10
|
#ifndef CLOCK_MANAGER_ARRIA10
|
||||||
#define CLOCK_MANAGER_ARRIA10
|
#define CLOCK_MANAGER_ARRIA10
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
/* Clock manager group */
|
/* Clock manager group */
|
||||||
#define CLKMGR_A10_CTRL 0x00
|
#define CLKMGR_A10_CTRL 0x00
|
||||||
|
@ -69,7 +69,7 @@ unsigned long cm_get_mpu_clk_hz(void);
|
||||||
|
|
||||||
unsigned int cm_get_qspi_controller_clk_hz(void);
|
unsigned int cm_get_qspi_controller_clk_hz(void);
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#define LOCKED_MASK (CLKMGR_CLKMGR_STAT_MAINPLLLOCKED_SET_MSK | \
|
#define LOCKED_MASK (CLKMGR_CLKMGR_STAT_MAINPLLLOCKED_SET_MSK | \
|
||||||
CLKMGR_CLKMGR_STAT_PERPLLLOCKED_SET_MSK)
|
CLKMGR_CLKMGR_STAT_PERPLLLOCKED_SET_MSK)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#ifndef _CLOCK_MANAGER_GEN5_H_
|
#ifndef _CLOCK_MANAGER_GEN5_H_
|
||||||
#define _CLOCK_MANAGER_GEN5_H_
|
#define _CLOCK_MANAGER_GEN5_H_
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
struct cm_config {
|
struct cm_config {
|
||||||
/* main group */
|
/* main group */
|
||||||
|
@ -107,7 +107,7 @@ const unsigned int cm_get_f2s_sdr_ref_clk_hz(void);
|
||||||
/* Clock configuration accessors */
|
/* Clock configuration accessors */
|
||||||
int cm_basic_init(const struct cm_config * const cfg);
|
int cm_basic_init(const struct cm_config * const cfg);
|
||||||
const struct cm_config * const cm_get_default_config(void);
|
const struct cm_config * const cm_get_default_config(void);
|
||||||
#endif /* __ASSEMBLER__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#define LOCKED_MASK \
|
#define LOCKED_MASK \
|
||||||
(CLKMGR_INTER_SDRPLLLOCKED_MASK | \
|
(CLKMGR_INTER_SDRPLLLOCKED_MASK | \
|
||||||
|
|
|
@ -205,7 +205,7 @@ struct socfpga_io48_mmr {
|
||||||
u32 niosreserve2;
|
u32 niosreserve2;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*__ASSEMBLY__*/
|
#endif /*__ASSEMBLY__ */
|
||||||
|
|
||||||
#define IO48_MMR_CTRLCFG0_DB2_BURST_LENGTH_MASK 0x1F000000
|
#define IO48_MMR_CTRLCFG0_DB2_BURST_LENGTH_MASK 0x1F000000
|
||||||
#define IO48_MMR_CTRLCFG0_DB2_BURST_LENGTH_SHIFT 24
|
#define IO48_MMR_CTRLCFG0_DB2_BURST_LENGTH_SHIFT 24
|
||||||
|
|
|
@ -133,5 +133,5 @@ enum forced_boot_mode {
|
||||||
#define BSEC_OTP_MAC 57
|
#define BSEC_OTP_MAC 57
|
||||||
#define BSEC_OTP_BOARD 59
|
#define BSEC_OTP_BOARD 59
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__*/
|
#endif /* __ASSEMBLY__ */
|
||||||
#endif /* _MACH_STM32_H_ */
|
#endif /* _MACH_STM32_H_ */
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
|
|
||||||
#define MTRR_FIX_TYPE(t) ((t << 24) | (t << 16) | (t << 8) | t)
|
#define MTRR_FIX_TYPE(t) ((t << 24) | (t << 16) | (t << 8) | t)
|
||||||
|
|
||||||
#if !defined(__ASSEMBLER__)
|
#if !defined(__ASSEMBLY__)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Information about the previous MTRR state, set up by mtrr_open()
|
* Information about the previous MTRR state, set up by mtrr_open()
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#define AP_DEFAULT_BASE 0x30000
|
#define AP_DEFAULT_BASE 0x30000
|
||||||
#define AP_DEFAULT_SIZE 0x10000
|
#define AP_DEFAULT_SIZE 0x10000
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct sipi_params_16bit - 16-bit SIPI entry-point parameters
|
* struct sipi_params_16bit - 16-bit SIPI entry-point parameters
|
||||||
|
@ -81,6 +81,6 @@ void ap_start(void);
|
||||||
extern char sipi_params_16bit[];
|
extern char sipi_params_16bit[];
|
||||||
extern char sipi_params[];
|
extern char sipi_params[];
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -177,6 +177,6 @@ struct bl2_to_bl31_params_mem {
|
||||||
struct entry_point_info bl31_ep_info;
|
struct entry_point_info bl31_ep_info;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*__ASSEMBLY__*/
|
#endif /*__ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __BL_COMMON_H__ */
|
#endif /* __BL_COMMON_H__ */
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#ifndef _ELF_H
|
#ifndef _ELF_H
|
||||||
#define _ELF_H
|
#define _ELF_H
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLY__
|
||||||
#include "compiler.h"
|
#include "compiler.h"
|
||||||
|
|
||||||
/* This version doesn't work for 64-bit ABIs - Erik */
|
/* This version doesn't work for 64-bit ABIs - Erik */
|
||||||
|
@ -690,7 +690,7 @@ unsigned long elf_hash(const unsigned char *name);
|
||||||
#define R_RISCV_64 2
|
#define R_RISCV_64 2
|
||||||
#define R_RISCV_RELATIVE 3
|
#define R_RISCV_RELATIVE 3
|
||||||
|
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLY__
|
||||||
int valid_elf_image(unsigned long addr);
|
int valid_elf_image(unsigned long addr);
|
||||||
unsigned long load_elf64_image_phdr(unsigned long addr);
|
unsigned long load_elf64_image_phdr(unsigned long addr);
|
||||||
unsigned long load_elf64_image_shdr(unsigned long addr);
|
unsigned long load_elf64_image_shdr(unsigned long addr);
|
||||||
|
|
Loading…
Reference in New Issue