diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-21 11:43:08 +0200 |
| commit | f61f1e150c84f5b9347fca79a4bc5f2286c545d2 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /lib_microblaze | |
| parent | ec081c2c190148b374e86a795fb6b1c49caeb549 (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.zip u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.gz u-boot-imx-f61f1e150c84f5b9347fca79a4bc5f2286c545d2.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'lib_microblaze')
| -rw-r--r-- | lib_microblaze/board.c | 26 | ||||
| -rw-r--r-- | lib_microblaze/time.c | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c index 09d4d94..cd61918 100644 --- a/lib_microblaze/board.c +++ b/lib_microblaze/board.c @@ -34,10 +34,10 @@ DECLARE_GLOBAL_DATA_PTR; const char version_string[] = U_BOOT_VERSION " (" __DATE__ " - " __TIME__ ")"; -#ifdef CFG_GPIO_0 +#ifdef CONFIG_SYS_GPIO_0 extern int gpio_init (void); #endif -#ifdef CFG_INTC_0 +#ifdef CONFIG_SYS_INTC_0 extern int interrupts_init (void); #endif #if defined(CONFIG_CMD_NET) @@ -54,13 +54,13 @@ static ulong mem_malloc_brk; /* * The Malloc area is immediately below the monitor copy in DRAM - * aka CFG_MONITOR_BASE - Note there is no need for reloc_off + * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off * as our monitory code is run from SDRAM */ static void mem_malloc_init (void) { - mem_malloc_end = (CFG_MALLOC_BASE + CFG_MALLOC_LEN); - mem_malloc_start = CFG_MALLOC_BASE; + mem_malloc_end = (CONFIG_SYS_MALLOC_BASE + CONFIG_SYS_MALLOC_LEN); + mem_malloc_start = CONFIG_SYS_MALLOC_BASE; mem_malloc_brk = mem_malloc_start; memset ((void *)mem_malloc_start, 0, mem_malloc_end - mem_malloc_start); } @@ -94,10 +94,10 @@ typedef int (init_fnc_t) (void); init_fnc_t *init_sequence[] = { env_init, serial_init, -#ifdef CFG_GPIO_0 +#ifdef CONFIG_SYS_GPIO_0 gpio_init, #endif -#ifdef CFG_INTC_0 +#ifdef CONFIG_SYS_INTC_0 interrupts_init, #endif NULL, @@ -107,18 +107,18 @@ void board_init (void) { bd_t *bd; init_fnc_t **init_fnc_ptr; - gd = (gd_t *) CFG_GBL_DATA_OFFSET; + gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET; #if defined(CONFIG_CMD_FLASH) ulong flash_size = 0; #endif asm ("nop"); /* FIXME gd is not initialize - wait */ - memset ((void *)gd, 0, CFG_GBL_DATA_SIZE); + memset ((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE); gd->bd = (bd_t *) (gd + 1); /* At end of global data */ gd->baudrate = CONFIG_BAUDRATE; bd = gd->bd; bd->bi_baudrate = CONFIG_BAUDRATE; - bd->bi_memstart = CFG_SDRAM_BASE; - bd->bi_memsize = CFG_SDRAM_SIZE; + bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; + bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; /* Initialise malloc() area */ mem_malloc_init (); @@ -131,10 +131,10 @@ void board_init (void) } #if defined(CONFIG_CMD_FLASH) - bd->bi_flashstart = CFG_FLASH_BASE; + bd->bi_flashstart = CONFIG_SYS_FLASH_BASE; if (0 < (flash_size = flash_init ())) { bd->bi_flashsize = flash_size; - bd->bi_flashoffset = CFG_FLASH_BASE + flash_size; + bd->bi_flashoffset = CONFIG_SYS_FLASH_BASE + flash_size; } else { puts ("Flash init FAILED"); bd->bi_flashstart = 0; diff --git a/lib_microblaze/time.c b/lib_microblaze/time.c index b5d8f19..cbb4341 100644 --- a/lib_microblaze/time.c +++ b/lib_microblaze/time.c @@ -26,7 +26,7 @@ #include <common.h> -#ifdef CFG_TIMER_0 +#ifdef CONFIG_SYS_TIMER_0 void udelay (unsigned long usec) { int i; |