diff options
Diffstat (limited to 'cpu/mpc5xxx/cpu_init.c')
| -rw-r--r-- | cpu/mpc5xxx/cpu_init.c | 120 | 
1 files changed, 60 insertions, 60 deletions
| diff --git a/cpu/mpc5xxx/cpu_init.c b/cpu/mpc5xxx/cpu_init.c index bc6201ec0..14bd417d7 100644 --- a/cpu/mpc5xxx/cpu_init.c +++ b/cpu/mpc5xxx/cpu_init.c @@ -35,11 +35,11 @@ DECLARE_GLOBAL_DATA_PTR;  void cpu_init_f (void)  {  	unsigned long addecr = (1 << 25); /* Boot_CS */ -#if defined(CFG_RAMBOOT) && defined(CONFIG_MGT5100) +#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_MGT5100)  	addecr |= (1 << 22); /* SDRAM enable */  #endif  	/* Pointer is writable since we allocated a register for it */ -	gd = (gd_t *) (CFG_INIT_RAM_ADDR + CFG_GBL_DATA_OFFSET); +	gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);  	/* Clear initial global data */  	memset ((void *) gd, 0, sizeof (gd_t)); @@ -47,95 +47,95 @@ void cpu_init_f (void)  	/*  	 * Memory Controller: configure chip selects and enable them  	 */ -#if defined(CFG_BOOTCS_START) && defined(CFG_BOOTCS_SIZE) -	*(vu_long *)MPC5XXX_BOOTCS_START = START_REG(CFG_BOOTCS_START); -	*(vu_long *)MPC5XXX_BOOTCS_STOP = STOP_REG(CFG_BOOTCS_START, -			CFG_BOOTCS_SIZE); +#if defined(CONFIG_SYS_BOOTCS_START) && defined(CONFIG_SYS_BOOTCS_SIZE) +	*(vu_long *)MPC5XXX_BOOTCS_START = START_REG(CONFIG_SYS_BOOTCS_START); +	*(vu_long *)MPC5XXX_BOOTCS_STOP = STOP_REG(CONFIG_SYS_BOOTCS_START, +			CONFIG_SYS_BOOTCS_SIZE);  #endif -#if defined(CFG_BOOTCS_CFG) -	*(vu_long *)MPC5XXX_BOOTCS_CFG = CFG_BOOTCS_CFG; +#if defined(CONFIG_SYS_BOOTCS_CFG) +	*(vu_long *)MPC5XXX_BOOTCS_CFG = CONFIG_SYS_BOOTCS_CFG;  #endif -#if defined(CFG_CS0_START) && defined(CFG_CS0_SIZE) -	*(vu_long *)MPC5XXX_CS0_START = START_REG(CFG_CS0_START); -	*(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(CFG_CS0_START, CFG_CS0_SIZE); +#if defined(CONFIG_SYS_CS0_START) && defined(CONFIG_SYS_CS0_SIZE) +	*(vu_long *)MPC5XXX_CS0_START = START_REG(CONFIG_SYS_CS0_START); +	*(vu_long *)MPC5XXX_CS0_STOP = STOP_REG(CONFIG_SYS_CS0_START, CONFIG_SYS_CS0_SIZE);  	/* CS0 and BOOT_CS cannot be enabled at once. */  	/*	addecr |= (1 << 16); */  #endif -#if defined(CFG_CS0_CFG) -	*(vu_long *)MPC5XXX_CS0_CFG = CFG_CS0_CFG; +#if defined(CONFIG_SYS_CS0_CFG) +	*(vu_long *)MPC5XXX_CS0_CFG = CONFIG_SYS_CS0_CFG;  #endif -#if defined(CFG_CS1_START) && defined(CFG_CS1_SIZE) -	*(vu_long *)MPC5XXX_CS1_START = START_REG(CFG_CS1_START); -	*(vu_long *)MPC5XXX_CS1_STOP = STOP_REG(CFG_CS1_START, CFG_CS1_SIZE); +#if defined(CONFIG_SYS_CS1_START) && defined(CONFIG_SYS_CS1_SIZE) +	*(vu_long *)MPC5XXX_CS1_START = START_REG(CONFIG_SYS_CS1_START); +	*(vu_long *)MPC5XXX_CS1_STOP = STOP_REG(CONFIG_SYS_CS1_START, CONFIG_SYS_CS1_SIZE);  	addecr |= (1 << 17);  #endif -#if defined(CFG_CS1_CFG) -	*(vu_long *)MPC5XXX_CS1_CFG = CFG_CS1_CFG; +#if defined(CONFIG_SYS_CS1_CFG) +	*(vu_long *)MPC5XXX_CS1_CFG = CONFIG_SYS_CS1_CFG;  #endif -#if defined(CFG_CS2_START) && defined(CFG_CS2_SIZE) -	*(vu_long *)MPC5XXX_CS2_START = START_REG(CFG_CS2_START); -	*(vu_long *)MPC5XXX_CS2_STOP = STOP_REG(CFG_CS2_START, CFG_CS2_SIZE); +#if defined(CONFIG_SYS_CS2_START) && defined(CONFIG_SYS_CS2_SIZE) +	*(vu_long *)MPC5XXX_CS2_START = START_REG(CONFIG_SYS_CS2_START); +	*(vu_long *)MPC5XXX_CS2_STOP = STOP_REG(CONFIG_SYS_CS2_START, CONFIG_SYS_CS2_SIZE);  	addecr |= (1 << 18);  #endif -#if defined(CFG_CS2_CFG) -	*(vu_long *)MPC5XXX_CS2_CFG = CFG_CS2_CFG; +#if defined(CONFIG_SYS_CS2_CFG) +	*(vu_long *)MPC5XXX_CS2_CFG = CONFIG_SYS_CS2_CFG;  #endif -#if defined(CFG_CS3_START) && defined(CFG_CS3_SIZE) -	*(vu_long *)MPC5XXX_CS3_START = START_REG(CFG_CS3_START); -	*(vu_long *)MPC5XXX_CS3_STOP = STOP_REG(CFG_CS3_START, CFG_CS3_SIZE); +#if defined(CONFIG_SYS_CS3_START) && defined(CONFIG_SYS_CS3_SIZE) +	*(vu_long *)MPC5XXX_CS3_START = START_REG(CONFIG_SYS_CS3_START); +	*(vu_long *)MPC5XXX_CS3_STOP = STOP_REG(CONFIG_SYS_CS3_START, CONFIG_SYS_CS3_SIZE);  	addecr |= (1 << 19);  #endif -#if defined(CFG_CS3_CFG) -	*(vu_long *)MPC5XXX_CS3_CFG = CFG_CS3_CFG; +#if defined(CONFIG_SYS_CS3_CFG) +	*(vu_long *)MPC5XXX_CS3_CFG = CONFIG_SYS_CS3_CFG;  #endif -#if defined(CFG_CS4_START) && defined(CFG_CS4_SIZE) -	*(vu_long *)MPC5XXX_CS4_START = START_REG(CFG_CS4_START); -	*(vu_long *)MPC5XXX_CS4_STOP = STOP_REG(CFG_CS4_START, CFG_CS4_SIZE); +#if defined(CONFIG_SYS_CS4_START) && defined(CONFIG_SYS_CS4_SIZE) +	*(vu_long *)MPC5XXX_CS4_START = START_REG(CONFIG_SYS_CS4_START); +	*(vu_long *)MPC5XXX_CS4_STOP = STOP_REG(CONFIG_SYS_CS4_START, CONFIG_SYS_CS4_SIZE);  	addecr |= (1 << 20);  #endif -#if defined(CFG_CS4_CFG) -	*(vu_long *)MPC5XXX_CS4_CFG = CFG_CS4_CFG; +#if defined(CONFIG_SYS_CS4_CFG) +	*(vu_long *)MPC5XXX_CS4_CFG = CONFIG_SYS_CS4_CFG;  #endif -#if defined(CFG_CS5_START) && defined(CFG_CS5_SIZE) -	*(vu_long *)MPC5XXX_CS5_START = START_REG(CFG_CS5_START); -	*(vu_long *)MPC5XXX_CS5_STOP = STOP_REG(CFG_CS5_START, CFG_CS5_SIZE); +#if defined(CONFIG_SYS_CS5_START) && defined(CONFIG_SYS_CS5_SIZE) +	*(vu_long *)MPC5XXX_CS5_START = START_REG(CONFIG_SYS_CS5_START); +	*(vu_long *)MPC5XXX_CS5_STOP = STOP_REG(CONFIG_SYS_CS5_START, CONFIG_SYS_CS5_SIZE);  	addecr |= (1 << 21);  #endif -#if defined(CFG_CS5_CFG) -	*(vu_long *)MPC5XXX_CS5_CFG = CFG_CS5_CFG; +#if defined(CONFIG_SYS_CS5_CFG) +	*(vu_long *)MPC5XXX_CS5_CFG = CONFIG_SYS_CS5_CFG;  #endif  #if defined(CONFIG_MPC5200)  	addecr |= 1; -#if defined(CFG_CS6_START) && defined(CFG_CS6_SIZE) -	*(vu_long *)MPC5XXX_CS6_START = START_REG(CFG_CS6_START); -	*(vu_long *)MPC5XXX_CS6_STOP = STOP_REG(CFG_CS6_START, CFG_CS6_SIZE); +#if defined(CONFIG_SYS_CS6_START) && defined(CONFIG_SYS_CS6_SIZE) +	*(vu_long *)MPC5XXX_CS6_START = START_REG(CONFIG_SYS_CS6_START); +	*(vu_long *)MPC5XXX_CS6_STOP = STOP_REG(CONFIG_SYS_CS6_START, CONFIG_SYS_CS6_SIZE);  	addecr |= (1 << 26);  #endif -#if defined(CFG_CS6_CFG) -	*(vu_long *)MPC5XXX_CS6_CFG = CFG_CS6_CFG; +#if defined(CONFIG_SYS_CS6_CFG) +	*(vu_long *)MPC5XXX_CS6_CFG = CONFIG_SYS_CS6_CFG;  #endif -#if defined(CFG_CS7_START) && defined(CFG_CS7_SIZE) -	*(vu_long *)MPC5XXX_CS7_START = START_REG(CFG_CS7_START); -	*(vu_long *)MPC5XXX_CS7_STOP = STOP_REG(CFG_CS7_START, CFG_CS7_SIZE); +#if defined(CONFIG_SYS_CS7_START) && defined(CONFIG_SYS_CS7_SIZE) +	*(vu_long *)MPC5XXX_CS7_START = START_REG(CONFIG_SYS_CS7_START); +	*(vu_long *)MPC5XXX_CS7_STOP = STOP_REG(CONFIG_SYS_CS7_START, CONFIG_SYS_CS7_SIZE);  	addecr |= (1 << 27);  #endif -#if defined(CFG_CS7_CFG) -	*(vu_long *)MPC5XXX_CS7_CFG = CFG_CS7_CFG; +#if defined(CONFIG_SYS_CS7_CFG) +	*(vu_long *)MPC5XXX_CS7_CFG = CONFIG_SYS_CS7_CFG;  #endif -#if defined(CFG_CS_BURST) -	*(vu_long *)MPC5XXX_CS_BURST = CFG_CS_BURST; +#if defined(CONFIG_SYS_CS_BURST) +	*(vu_long *)MPC5XXX_CS_BURST = CONFIG_SYS_CS_BURST;  #endif -#if defined(CFG_CS_DEADCYCLE) -	*(vu_long *)MPC5XXX_CS_DEADCYCLE = CFG_CS_DEADCYCLE; +#if defined(CONFIG_SYS_CS_DEADCYCLE) +	*(vu_long *)MPC5XXX_CS_DEADCYCLE = CONFIG_SYS_CS_DEADCYCLE;  #endif  #endif /* CONFIG_MPC5200 */ @@ -144,8 +144,8 @@ void cpu_init_f (void)  	*(vu_long *)MPC5XXX_CS_CTRL = (1 << 24);  	/* Setup pin multiplexing */ -#if defined(CFG_GPS_PORT_CONFIG) -	*(vu_long *)MPC5XXX_GPS_PORT_CONFIG = CFG_GPS_PORT_CONFIG; +#if defined(CONFIG_SYS_GPS_PORT_CONFIG) +	*(vu_long *)MPC5XXX_GPS_PORT_CONFIG = CONFIG_SYS_GPS_PORT_CONFIG;  #endif  #if defined(CONFIG_MPC5200) @@ -154,28 +154,28 @@ void cpu_init_f (void)  	/* Enable snooping for RAM */  	*(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (1 << 15); -	*(vu_long *)(MPC5XXX_XLBARB + 0x70) = CFG_SDRAM_BASE | 0x1d; +	*(vu_long *)(MPC5XXX_XLBARB + 0x70) = CONFIG_SYS_SDRAM_BASE | 0x1d; -# if defined(CFG_IPBCLK_EQUALS_XLBCLK) +# if defined(CONFIG_SYS_IPBCLK_EQUALS_XLBCLK)  	/* Motorola reports IPB should better run at 133 MHz. */  	*(vu_long *)MPC5XXX_ADDECR |= 1;  	/* pci_clk_sel = 0x02, ipb_clk_sel = 0x00; */  	addecr = *(vu_long *)MPC5XXX_CDM_CFG;  	addecr &= ~0x103; -#  if defined(CFG_PCICLK_EQUALS_IPBCLK_DIV2) +#  if defined(CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2)  	/* pci_clk_sel = 0x01 -> IPB_CLK/2 */  	addecr |= 0x01;  #  else  	/* pci_clk_sel = 0x02 -> XLB_CLK/4 = IPB_CLK/4 */  	addecr |= 0x02; -#  endif /* CFG_PCICLK_EQUALS_IPBCLK_DIV2 */ +#  endif /* CONFIG_SYS_PCICLK_EQUALS_IPBCLK_DIV2 */  	*(vu_long *)MPC5XXX_CDM_CFG = addecr; -# endif	/* CFG_IPBCLK_EQUALS_XLBCLK */ +# endif	/* CONFIG_SYS_IPBCLK_EQUALS_XLBCLK */  	/* Configure the XLB Arbiter */  	*(vu_long *)MPC5XXX_XLBARB_MPRIEN = 0xff;  	*(vu_long *)MPC5XXX_XLBARB_MPRIVAL = 0x11111111; -# if defined(CFG_XLB_PIPELINING) +# if defined(CONFIG_SYS_XLB_PIPELINING)  	/* Enable piplining */  	*(vu_long *)(MPC5XXX_XLBARB + 0x40) &= ~(1 << 31);  # endif |