diff options
Diffstat (limited to 'board/icecube/icecube.c')
| -rw-r--r-- | board/icecube/icecube.c | 60 | 
1 files changed, 1 insertions, 59 deletions
| diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index 75244610c..47b219555 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -134,7 +134,6 @@ static void sdram_start (int hi_addr)   *            is something else than 0x00000000.   */ -#if defined(CONFIG_MPC5200)  phys_size_t initdram (int board_type)  {  	ulong dramsize = 0; @@ -258,65 +257,12 @@ phys_size_t initdram (int board_type)  	return dramsize + dramsize2;  } -#elif defined(CONFIG_MGT5100) - -phys_size_t initdram (int board_type) -{ -	ulong dramsize = 0; -#ifndef CONFIG_SYS_RAMBOOT -	ulong test1, test2; - -	/* setup and enable SDRAM chip selects */ -	*(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; -	*(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */ -	*(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ -	__asm__ volatile ("sync"); - -	/* setup config registers */ -	*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = SDRAM_CONFIG1; -	*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = SDRAM_CONFIG2; - -	/* address select register */ -	*(vu_long *)MPC5XXX_SDRAM_XLBSEL = SDRAM_ADDRSEL; -	__asm__ volatile ("sync"); - -	/* find RAM size */ -	sdram_start(0); -	test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); -	sdram_start(1); -	test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x80000000); -	if (test1 > test2) { -		sdram_start(0); -		dramsize = test1; -	} else { -		dramsize = test2; -	} - -	/* set SDRAM end address according to size */ -	*(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15); - -#else /* CONFIG_SYS_RAMBOOT */ - -	/* Retrieve amount of SDRAM available */ -	dramsize = ((*(vu_long *)MPC5XXX_SDRAM_STOP + 1) << 15); - -#endif /* CONFIG_SYS_RAMBOOT */ - -	return dramsize; -} - -#else -#error Neither CONFIG_MPC5200 or CONFIG_MGT5100 defined -#endif -  int checkboard (void)  {  #if defined (CONFIG_LITE5200B)  	puts ("Board: Freescale Lite5200B\n"); -#elif defined(CONFIG_MPC5200) +#else  	puts ("Board: Motorola MPC5200 (IceCube)\n"); -#elif defined(CONFIG_MGT5100) -	puts ("Board: Motorola MGT5100 (IceCube)\n");  #endif  	return 0;  } @@ -329,10 +275,6 @@ void flash_preinit(void)  	 * Note that CS_BOOT cannot be cleared when  	 * executing in flash.  	 */ -#if defined(CONFIG_MGT5100) -	*(vu_long *)MPC5XXX_ADDECR &= ~(1 << 25); /* disable CS_BOOT */ -	*(vu_long *)MPC5XXX_ADDECR |= (1 << 16); /* enable CS0 */ -#endif  	*(vu_long *)MPC5XXX_BOOTCS_CFG &= ~0x1; /* clear RO */  } |