Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 08:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-microblaze

Browse source
This commit is contained in:
Wolfgang Denk 2011-01-12 23:46:37 +01:00
commit 1ad98ad66e
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/microblaze/cpu/interrupts.c
View file

@ -41,8 +41,11 @@ void enable_interrupts (void)
int disable_interrupts (void) int disable_interrupts (void)
{ {
unsigned int msr;
MFS(msr, rmsr);
MSRCLR(0x2); MSRCLR(0x2);
return 0; return (msr & 0x2) != 0;
} }
#ifdef CONFIG_SYS_INTC_0 #ifdef CONFIG_SYS_INTC_0

8
arch/microblaze/lib/board.c
View file

@ -90,16 +90,18 @@ void board_init (void)
{ {
bd_t *bd; bd_t *bd;
init_fnc_t **init_fnc_ptr; init_fnc_t **init_fnc_ptr;
gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET; gd = (gd_t *) (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET);
bd = (bd_t *) (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \
- GENERATED_BD_INFO_SIZE);
char *s; char *s;
#if defined(CONFIG_CMD_FLASH) #if defined(CONFIG_CMD_FLASH)
ulong flash_size = 0; ulong flash_size = 0;
#endif #endif
asm ("nop"); /* FIXME gd is not initialize - wait */ asm ("nop"); /* FIXME gd is not initialize - wait */
memset ((void *)gd, 0, GENERATED_GBL_DATA_SIZE); memset ((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
gd->bd = (bd_t *) (gd + 1); /* At end of global data */ memset ((void *)bd, 0, GENERATED_BD_INFO_SIZE);
gd->bd = bd;
gd->baudrate = CONFIG_BAUDRATE; gd->baudrate = CONFIG_BAUDRATE;
bd = gd->bd;
bd->bi_baudrate = CONFIG_BAUDRATE; bd->bi_baudrate = CONFIG_BAUDRATE;
bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;
bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;

8
include/configs/microblaze-generic.h
View file

@ -137,14 +137,14 @@
/* global pointer */ /* global pointer */
/* start of global data */ /* start of global data */
#define CONFIG_SYS_GBL_DATA_OFFSET \ #define CONFIG_SYS_GBL_DATA_OFFSET \
(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE \ (CONFIG_SYS_SDRAM_SIZE - GENERATED_GBL_DATA_SIZE)
- GENERATED_GBL_DATA_SIZE)
/* monitor code */ /* monitor code */
#define SIZE 0x40000 #define SIZE 0x40000
#define CONFIG_SYS_MONITOR_LEN (SIZE - GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_MONITOR_LEN SIZE
#define CONFIG_SYS_MONITOR_BASE \ #define CONFIG_SYS_MONITOR_BASE \
(CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN) (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \
- CONFIG_SYS_MONITOR_LEN - GENERATED_BD_INFO_SIZE)
#define CONFIG_SYS_MONITOR_END \ #define CONFIG_SYS_MONITOR_END \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_SYS_MALLOC_LEN SIZE #define CONFIG_SYS_MALLOC_LEN SIZE