diff options
| author | Tom Rini <trini@ti.com> | 2015-02-09 11:44:46 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-09 11:44:46 -0500 |
| commit | a4fb5df214c7e8d5bc949c1068d92252f105427a (patch) | |
| tree | be1d6e906ba602562affae768880b96ea39e2642 /arch/microblaze/include/asm | |
| parent | 10918c03a9761db3ef8b57ca46a20d39e0be41e6 (diff) | |
| parent | 7f33899221e4235900760add69ffbb5f66f1229d (diff) | |
| download | u-boot-imx-a4fb5df214c7e8d5bc949c1068d92252f105427a.zip u-boot-imx-a4fb5df214c7e8d5bc949c1068d92252f105427a.tar.gz u-boot-imx-a4fb5df214c7e8d5bc949c1068d92252f105427a.tar.bz2 | |
Merge branch 'microblaze' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'arch/microblaze/include/asm')
| -rw-r--r-- | arch/microblaze/include/asm/asm.h | 4 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/config.h | 7 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/microblaze_intc.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/u-boot.h | 11 |
4 files changed, 12 insertions, 12 deletions
diff --git a/arch/microblaze/include/asm/asm.h b/arch/microblaze/include/asm/asm.h index c1c3b03..11f3dd0 100644 --- a/arch/microblaze/include/asm/asm.h +++ b/arch/microblaze/include/asm/asm.h @@ -43,6 +43,10 @@ #define R14(val) \ __asm__ __volatile__ ("addi %0, r14, 0":"=r" (val)); +/* get return address from interrupt */ +#define R17(val) \ + __asm__ __volatile__ ("addi %0, r17, 0" : "=r" (val)); + #define NOP __asm__ __volatile__ ("nop"); /* use machine status registe USE_MSR_REG */ diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h index cd29734..32fd636 100644 --- a/arch/microblaze/include/asm/config.h +++ b/arch/microblaze/include/asm/config.h @@ -7,4 +7,11 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ +#ifndef CONFIG_SPL_BUILD +#define CONFIG_NEEDS_MANUAL_RELOC +#endif + +#define CONFIG_NR_DRAM_BANKS 1 +#define CONFIG_SYS_GENERIC_BOARD + #endif diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h index 0fb9207..6586838 100644 --- a/arch/microblaze/include/asm/microblaze_intc.h +++ b/arch/microblaze/include/asm/microblaze_intc.h @@ -34,5 +34,3 @@ struct irq_action { */ int install_interrupt_handler(int irq, interrupt_handler_t *hdlr, void *arg); - -int interrupts_init(void); diff --git a/arch/microblaze/include/asm/u-boot.h b/arch/microblaze/include/asm/u-boot.h index 54d415e..66f8f95 100644 --- a/arch/microblaze/include/asm/u-boot.h +++ b/arch/microblaze/include/asm/u-boot.h @@ -16,16 +16,7 @@ #ifndef _U_BOOT_H_ #define _U_BOOT_H_ -typedef struct bd_info { - unsigned long bi_memstart; /* start of DRAM memory */ - phys_size_t bi_memsize; /* size of DRAM memory in bytes */ - unsigned long bi_flashstart; /* start of FLASH memory */ - unsigned long bi_flashsize; /* size of FLASH memory */ - unsigned long bi_flashoffset; /* reserved area for startup monitor */ - unsigned long bi_sramstart; /* start of SRAM memory */ - unsigned long bi_sramsize; /* size of SRAM memory */ - ulong bi_boot_params; /* where this board expects params */ -} bd_t; +#include <asm-generic/u-boot.h> /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_MICROBLAZE |