diff options
Diffstat (limited to 'lib_sh')
| -rw-r--r-- | lib_sh/board.c | 20 | ||||
| -rw-r--r-- | lib_sh/bootm.c | 2 | ||||
| -rw-r--r-- | lib_sh/time.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lib_sh/board.c b/lib_sh/board.c index 6dfab4e..b6be22e 100644 --- a/lib_sh/board.c +++ b/lib_sh/board.c @@ -35,7 +35,7 @@ extern int timer_init(void); const char version_string[] = U_BOOT_VERSION" (" __DATE__ " - " __TIME__ ")"; -unsigned long monitor_flash_len = CFG_MONITOR_LEN; +unsigned long monitor_flash_len = CONFIG_SYS_MONITOR_LEN; static unsigned long mem_malloc_start; static unsigned long mem_malloc_end; @@ -44,8 +44,8 @@ static unsigned long mem_malloc_brk; static void mem_malloc_init(void) { - mem_malloc_start = (TEXT_BASE - CFG_GBL_DATA_SIZE - CFG_MALLOC_LEN); - mem_malloc_end = (mem_malloc_start + CFG_MALLOC_LEN - 16); + mem_malloc_start = (TEXT_BASE - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN); + mem_malloc_end = (mem_malloc_start + CONFIG_SYS_MALLOC_LEN - 16); mem_malloc_brk = mem_malloc_start; memset((void *) mem_malloc_start, 0, (mem_malloc_end - mem_malloc_start)); @@ -178,7 +178,7 @@ void sh_generic_init(void) bd_t *bd; init_fnc_t **init_fnc_ptr; - memset(gd, 0, CFG_GBL_DATA_SIZE); + memset(gd, 0, CONFIG_SYS_GBL_DATA_SIZE); gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ @@ -188,12 +188,12 @@ void sh_generic_init(void) gd->cpu_clk = CONFIG_SYS_CLK_FREQ; bd = gd->bd; - bd->bi_memstart = CFG_SDRAM_BASE; - bd->bi_memsize = CFG_SDRAM_SIZE; - bd->bi_flashstart = CFG_FLASH_BASE; -#if defined(CFG_SRAM_BASE) && defined(CFG_SRAM_SIZE) - bd->bi_sramstart = CFG_SRAM_BASE; - bd->bi_sramsize = CFG_SRAM_SIZE; + bd->bi_memstart = CONFIG_SYS_SDRAM_BASE; + bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; + bd->bi_flashstart = CONFIG_SYS_FLASH_BASE; +#if defined(CONFIG_SYS_SRAM_BASE) && defined(CONFIG_SYS_SRAM_SIZE) + bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; + bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; #endif bd->bi_baudrate = CONFIG_BAUDRATE; diff --git a/lib_sh/bootm.c b/lib_sh/bootm.c index e3d4985..078a24d 100644 --- a/lib_sh/bootm.c +++ b/lib_sh/bootm.c @@ -28,7 +28,7 @@ #include <command.h> #include <asm/byteorder.h> -#ifdef CFG_DEBUG +#ifdef CONFIG_SYS_DEBUG static void hexdump(unsigned char *buf, int len) { int i; diff --git a/lib_sh/time.c b/lib_sh/time.c index 9c1dc50..e637e95 100644 --- a/lib_sh/time.c +++ b/lib_sh/time.c @@ -63,7 +63,7 @@ void reset_timer (void) void udelay (unsigned long usec) { unsigned int start = get_timer (0); - unsigned int end = start + (usec * ((CFG_HZ + 500000) / 1000000)); + unsigned int end = start + (usec * ((CONFIG_SYS_HZ + 500000) / 1000000)); while (get_timer (0) < end) continue; @@ -71,5 +71,5 @@ void udelay (unsigned long usec) unsigned long get_tbclk (void) { - return CFG_HZ; + return CONFIG_SYS_HZ; } |