Merge git://git.denx.de/u-boot into x1

Conflicts:

	drivers/usb/usb_ohci.c

1 files changed, 178 insertions, 178 deletions

diff --git a/cpu/mcf52x2/cpu_init.c b/cpu/mcf52x2/cpu_init.c
index 68aefe9..7bb358e 100644
--- a/cpu/mcf52x2/cpu_init.c
+++ b/cpu/mcf52x2/cpu_init.c
@@ -72,20 +72,20 @@ void cpu_init_f(void)
 	 *  Setup chip selects...
 	 */
 
-	mbar_writeShort(MCFSIM_CSAR1, CFG_CSAR1);
-	mbar_writeShort(MCFSIM_CSCR1, CFG_CSCR1);
-	mbar_writeLong(MCFSIM_CSMR1, CFG_CSMR1);
+	mbar_writeShort(MCFSIM_CSAR1, CONFIG_SYS_CSAR1);
+	mbar_writeShort(MCFSIM_CSCR1, CONFIG_SYS_CSCR1);
+	mbar_writeLong(MCFSIM_CSMR1, CONFIG_SYS_CSMR1);
 
-	mbar_writeShort(MCFSIM_CSAR0, CFG_CSAR0);
-	mbar_writeShort(MCFSIM_CSCR0, CFG_CSCR0);
-	mbar_writeLong(MCFSIM_CSMR0, CFG_CSMR0);
+	mbar_writeShort(MCFSIM_CSAR0, CONFIG_SYS_CSAR0);
+	mbar_writeShort(MCFSIM_CSCR0, CONFIG_SYS_CSCR0);
+	mbar_writeLong(MCFSIM_CSMR0, CONFIG_SYS_CSMR0);
 
 #ifdef CONFIG_FSL_I2C
-	CFG_I2C_PINMUX_REG = CFG_I2C_PINMUX_REG & CFG_I2C_PINMUX_CLR;
-	CFG_I2C_PINMUX_REG |= CFG_I2C_PINMUX_SET;
-#ifdef CFG_I2C2_OFFSET
-	CFG_I2C2_PINMUX_REG &= CFG_I2C2_PINMUX_CLR;
-	CFG_I2C2_PINMUX_REG |= CFG_I2C2_PINMUX_SET;
+	CONFIG_SYS_I2C_PINMUX_REG = CONFIG_SYS_I2C_PINMUX_REG & CONFIG_SYS_I2C_PINMUX_CLR;
+	CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
+#ifdef CONFIG_SYS_I2C2_OFFSET
+	CONFIG_SYS_I2C2_PINMUX_REG &= CONFIG_SYS_I2C2_PINMUX_CLR;
+	CONFIG_SYS_I2C2_PINMUX_REG |= CONFIG_SYS_I2C2_PINMUX_SET;
 #endif
 #endif
 
@@ -102,7 +102,7 @@ int cpu_init_r(void)
 void uart_port_conf(void)
 {
 	/* Setup Ports: */
-	switch (CFG_UART_PORT) {
+	switch (CONFIG_SYS_UART_PORT) {
 	case 0:
 		break;
 	case 1:
@@ -138,7 +138,7 @@ int cpu_init_r(void)
 void uart_port_conf(void)
 {
 	/* Setup Ports: */
-	switch (CFG_UART_PORT) {
+	switch (CONFIG_SYS_UART_PORT) {
 	case 0:
 		mbar_writeShort(MCF_GPIO_PAR_UART, MCF_GPIO_PAR_UART_U0TXD |
 				MCF_GPIO_PAR_UART_U0RXD);
@@ -169,59 +169,59 @@ void cpu_init_f(void)
 	 * already initialized.
 	 */
 #ifndef CONFIG_MONITOR_IS_IN_RAM
-	volatile sysctrl_t *sysctrl = (sysctrl_t *) (CFG_MBAR);
+	volatile sysctrl_t *sysctrl = (sysctrl_t *) (CONFIG_SYS_MBAR);
 	volatile gpio_t *gpio = (gpio_t *) (MMAP_GPIO);
 	volatile csctrl_t *csctrl = (csctrl_t *) (MMAP_FBCS);
 
-	sysctrl->sc_scr = CFG_SCR;
-	sysctrl->sc_spr = CFG_SPR;
+	sysctrl->sc_scr = CONFIG_SYS_SCR;
+	sysctrl->sc_spr = CONFIG_SYS_SPR;
 
 	/* Setup Ports: */
-	gpio->gpio_pacnt = CFG_PACNT;
-	gpio->gpio_paddr = CFG_PADDR;
-	gpio->gpio_padat = CFG_PADAT;
-	gpio->gpio_pbcnt = CFG_PBCNT;
-	gpio->gpio_pbddr = CFG_PBDDR;
-	gpio->gpio_pbdat = CFG_PBDAT;
-	gpio->gpio_pdcnt = CFG_PDCNT;
+	gpio->gpio_pacnt = CONFIG_SYS_PACNT;
+	gpio->gpio_paddr = CONFIG_SYS_PADDR;
+	gpio->gpio_padat = CONFIG_SYS_PADAT;
+	gpio->gpio_pbcnt = CONFIG_SYS_PBCNT;
+	gpio->gpio_pbddr = CONFIG_SYS_PBDDR;
+	gpio->gpio_pbdat = CONFIG_SYS_PBDAT;
+	gpio->gpio_pdcnt = CONFIG_SYS_PDCNT;
 
 	/* Memory Controller: */
-	csctrl->cs_br0 = CFG_BR0_PRELIM;
-	csctrl->cs_or0 = CFG_OR0_PRELIM;
+	csctrl->cs_br0 = CONFIG_SYS_BR0_PRELIM;
+	csctrl->cs_or0 = CONFIG_SYS_OR0_PRELIM;
 
-#if (defined(CFG_OR1_PRELIM) && defined(CFG_BR1_PRELIM))
-	csctrl->cs_br1 = CFG_BR1_PRELIM;
-	csctrl->cs_or1 = CFG_OR1_PRELIM;
+#if (defined(CONFIG_SYS_OR1_PRELIM) && defined(CONFIG_SYS_BR1_PRELIM))
+	csctrl->cs_br1 = CONFIG_SYS_BR1_PRELIM;
+	csctrl->cs_or1 = CONFIG_SYS_OR1_PRELIM;
 #endif
 
-#if defined(CFG_OR2_PRELIM) && defined(CFG_BR2_PRELIM)
-	csctrl->cs_br2 = CFG_BR2_PRELIM;
-	csctrl->cs_or2 = CFG_OR2_PRELIM;
+#if defined(CONFIG_SYS_OR2_PRELIM) && defined(CONFIG_SYS_BR2_PRELIM)
+	csctrl->cs_br2 = CONFIG_SYS_BR2_PRELIM;
+	csctrl->cs_or2 = CONFIG_SYS_OR2_PRELIM;
 #endif
 
-#if defined(CFG_OR3_PRELIM) && defined(CFG_BR3_PRELIM)
-	csctrl->cs_br3 = CFG_BR3_PRELIM;
-	csctrl->cs_or3 = CFG_OR3_PRELIM;
+#if defined(CONFIG_SYS_OR3_PRELIM) && defined(CONFIG_SYS_BR3_PRELIM)
+	csctrl->cs_br3 = CONFIG_SYS_BR3_PRELIM;
+	csctrl->cs_or3 = CONFIG_SYS_OR3_PRELIM;
 #endif
 
-#if defined(CFG_OR4_PRELIM) && defined(CFG_BR4_PRELIM)
-	csctrl->cs_br4 = CFG_BR4_PRELIM;
-	csctrl->cs_or4 = CFG_OR4_PRELIM;
+#if defined(CONFIG_SYS_OR4_PRELIM) && defined(CONFIG_SYS_BR4_PRELIM)
+	csctrl->cs_br4 = CONFIG_SYS_BR4_PRELIM;
+	csctrl->cs_or4 = CONFIG_SYS_OR4_PRELIM;
 #endif
 
-#if defined(CFG_OR5_PRELIM) && defined(CFG_BR5_PRELIM)
-	csctrl->cs_br5 = CFG_BR5_PRELIM;
-	csctrl->cs_or5 = CFG_OR5_PRELIM;
+#if defined(CONFIG_SYS_OR5_PRELIM) && defined(CONFIG_SYS_BR5_PRELIM)
+	csctrl->cs_br5 = CONFIG_SYS_BR5_PRELIM;
+	csctrl->cs_or5 = CONFIG_SYS_OR5_PRELIM;
 #endif
 
-#if defined(CFG_OR6_PRELIM) && defined(CFG_BR6_PRELIM)
-	csctrl->cs_br6 = CFG_BR6_PRELIM;
-	csctrl->cs_or6 = CFG_OR6_PRELIM;
+#if defined(CONFIG_SYS_OR6_PRELIM) && defined(CONFIG_SYS_BR6_PRELIM)
+	csctrl->cs_br6 = CONFIG_SYS_BR6_PRELIM;
+	csctrl->cs_or6 = CONFIG_SYS_OR6_PRELIM;
 #endif
 
-#if defined(CFG_OR7_PRELIM) && defined(CFG_BR7_PRELIM)
-	csctrl->cs_br7 = CFG_BR7_PRELIM;
-	csctrl->cs_or7 = CFG_OR7_PRELIM;
+#if defined(CONFIG_SYS_OR7_PRELIM) && defined(CONFIG_SYS_BR7_PRELIM)
+	csctrl->cs_br7 = CONFIG_SYS_BR7_PRELIM;
+	csctrl->cs_or7 = CONFIG_SYS_OR7_PRELIM;
 #endif
 
 #endif				/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
@@ -244,7 +244,7 @@ void uart_port_conf(void)
 	volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO;
 
 	/* Setup Ports: */
-	switch (CFG_UART_PORT) {
+	switch (CONFIG_SYS_UART_PORT) {
 	case 0:
 		gpio->gpio_pbcnt &= ~(GPIO_PBCNT_PB0MSK | GPIO_PBCNT_PB1MSK);
 		gpio->gpio_pbcnt |= (GPIO_PBCNT_URT0_TXD | GPIO_PBCNT_URT0_RXD);
@@ -282,57 +282,57 @@ void cpu_init_f(void)
 
 	/* Memory Controller: */
 	/* Flash */
-	csctrl_reg->ar0 = CFG_AR0_PRELIM;
-	csctrl_reg->cr0 = CFG_CR0_PRELIM;
-	csctrl_reg->mr0 = CFG_MR0_PRELIM;
+	csctrl_reg->ar0 = CONFIG_SYS_AR0_PRELIM;
+	csctrl_reg->cr0 = CONFIG_SYS_CR0_PRELIM;
+	csctrl_reg->mr0 = CONFIG_SYS_MR0_PRELIM;
 
-#if (defined(CFG_AR1_PRELIM) && defined(CFG_CR1_PRELIM) && defined(CFG_MR1_PRELIM))
-	csctrl_reg->ar1 = CFG_AR1_PRELIM;
-	csctrl_reg->cr1 = CFG_CR1_PRELIM;
-	csctrl_reg->mr1 = CFG_MR1_PRELIM;
+#if (defined(CONFIG_SYS_AR1_PRELIM) && defined(CONFIG_SYS_CR1_PRELIM) && defined(CONFIG_SYS_MR1_PRELIM))
+	csctrl_reg->ar1 = CONFIG_SYS_AR1_PRELIM;
+	csctrl_reg->cr1 = CONFIG_SYS_CR1_PRELIM;
+	csctrl_reg->mr1 = CONFIG_SYS_MR1_PRELIM;
 #endif
 
-#if (defined(CFG_AR2_PRELIM) && defined(CFG_CR2_PRELIM) && defined(CFG_MR2_PRELIM))
-	csctrl_reg->ar2 = CFG_AR2_PRELIM;
-	csctrl_reg->cr2 = CFG_CR2_PRELIM;
-	csctrl_reg->mr2 = CFG_MR2_PRELIM;
+#if (defined(CONFIG_SYS_AR2_PRELIM) && defined(CONFIG_SYS_CR2_PRELIM) && defined(CONFIG_SYS_MR2_PRELIM))
+	csctrl_reg->ar2 = CONFIG_SYS_AR2_PRELIM;
+	csctrl_reg->cr2 = CONFIG_SYS_CR2_PRELIM;
+	csctrl_reg->mr2 = CONFIG_SYS_MR2_PRELIM;
 #endif
 
-#if (defined(CFG_AR3_PRELIM) && defined(CFG_CR3_PRELIM) && defined(CFG_MR3_PRELIM))
-	csctrl_reg->ar3 = CFG_AR3_PRELIM;
-	csctrl_reg->cr3 = CFG_CR3_PRELIM;
-	csctrl_reg->mr3 = CFG_MR3_PRELIM;
+#if (defined(CONFIG_SYS_AR3_PRELIM) && defined(CONFIG_SYS_CR3_PRELIM) && defined(CONFIG_SYS_MR3_PRELIM))
+	csctrl_reg->ar3 = CONFIG_SYS_AR3_PRELIM;
+	csctrl_reg->cr3 = CONFIG_SYS_CR3_PRELIM;
+	csctrl_reg->mr3 = CONFIG_SYS_MR3_PRELIM;
 #endif
 
-#if (defined(CFG_AR4_PRELIM) && defined(CFG_CR4_PRELIM) && defined(CFG_MR4_PRELIM))
-	csctrl_reg->ar4 = CFG_AR4_PRELIM;
-	csctrl_reg->cr4 = CFG_CR4_PRELIM;
-	csctrl_reg->mr4 = CFG_MR4_PRELIM;
+#if (defined(CONFIG_SYS_AR4_PRELIM) && defined(CONFIG_SYS_CR4_PRELIM) && defined(CONFIG_SYS_MR4_PRELIM))
+	csctrl_reg->ar4 = CONFIG_SYS_AR4_PRELIM;
+	csctrl_reg->cr4 = CONFIG_SYS_CR4_PRELIM;
+	csctrl_reg->mr4 = CONFIG_SYS_MR4_PRELIM;
 #endif
 
-#if (defined(CFG_AR5_PRELIM) && defined(CFG_CR5_PRELIM) && defined(CFG_MR5_PRELIM))
-	csctrl_reg->ar5 = CFG_AR5_PRELIM;
-	csctrl_reg->cr5 = CFG_CR5_PRELIM;
-	csctrl_reg->mr5 = CFG_MR5_PRELIM;
+#if (defined(CONFIG_SYS_AR5_PRELIM) && defined(CONFIG_SYS_CR5_PRELIM) && defined(CONFIG_SYS_MR5_PRELIM))
+	csctrl_reg->ar5 = CONFIG_SYS_AR5_PRELIM;
+	csctrl_reg->cr5 = CONFIG_SYS_CR5_PRELIM;
+	csctrl_reg->mr5 = CONFIG_SYS_MR5_PRELIM;
 #endif
 
-#if (defined(CFG_AR6_PRELIM) && defined(CFG_CR6_PRELIM) && defined(CFG_MR6_PRELIM))
-	csctrl_reg->ar6 = CFG_AR6_PRELIM;
-	csctrl_reg->cr6 = CFG_CR6_PRELIM;
-	csctrl_reg->mr6 = CFG_MR6_PRELIM;
+#if (defined(CONFIG_SYS_AR6_PRELIM) && defined(CONFIG_SYS_CR6_PRELIM) && defined(CONFIG_SYS_MR6_PRELIM))
+	csctrl_reg->ar6 = CONFIG_SYS_AR6_PRELIM;
+	csctrl_reg->cr6 = CONFIG_SYS_CR6_PRELIM;
+	csctrl_reg->mr6 = CONFIG_SYS_MR6_PRELIM;
 #endif
 
-#if (defined(CFG_AR7_PRELIM) && defined(CFG_CR7_PRELIM) && defined(CFG_MR7_PRELIM))
-	csctrl_reg->ar7 = CFG_AR7_PRELIM;
-	csctrl_reg->cr7 = CFG_CR7_PRELIM;
-	csctrl_reg->mr7 = CFG_MR7_PRELIM;
+#if (defined(CONFIG_SYS_AR7_PRELIM) && defined(CONFIG_SYS_CR7_PRELIM) && defined(CONFIG_SYS_MR7_PRELIM))
+	csctrl_reg->ar7 = CONFIG_SYS_AR7_PRELIM;
+	csctrl_reg->cr7 = CONFIG_SYS_CR7_PRELIM;
+	csctrl_reg->mr7 = CONFIG_SYS_MR7_PRELIM;
 #endif
 
 #endif				/* #ifndef CONFIG_MONITOR_IS_IN_RAM */
 
 #ifdef CONFIG_FSL_I2C
-	CFG_I2C_PINMUX_REG &= CFG_I2C_PINMUX_CLR;
-	CFG_I2C_PINMUX_REG |= CFG_I2C_PINMUX_SET;
+	CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR;
+	CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET;
 #endif
 
 	/* enable instruction cache now */
@@ -352,7 +352,7 @@ void uart_port_conf(void)
 	volatile gpio_t *gpio = (gpio_t *)MMAP_GPIO;
 
 	/* Setup Ports: */
-	switch (CFG_UART_PORT) {
+	switch (CONFIG_SYS_UART_PORT) {
 	case 0:
 		gpio->par_uart |= UART0_ENABLE_MASK;
 		break;
@@ -384,155 +384,155 @@ void cpu_init_f(void)
 #ifndef CONFIG_MONITOR_IS_IN_RAM
 	/* Set speed /PLL */
 	MCFCLOCK_SYNCR =
-	    MCFCLOCK_SYNCR_MFD(CFG_MFD) | MCFCLOCK_SYNCR_RFD(CFG_RFD);
+	    MCFCLOCK_SYNCR_MFD(CONFIG_SYS_MFD) | MCFCLOCK_SYNCR_RFD(CONFIG_SYS_RFD);
 	while (!(MCFCLOCK_SYNSR & MCFCLOCK_SYNSR_LOCK)) ;
 
 	MCFGPIO_PBCDPAR = 0xc0;
 
 	/* Set up the GPIO ports */
-#ifdef CFG_PEPAR
-	MCFGPIO_PEPAR = CFG_PEPAR;
+#ifdef CONFIG_SYS_PEPAR
+	MCFGPIO_PEPAR = CONFIG_SYS_PEPAR;
 #endif
-#ifdef	CFG_PFPAR
-	MCFGPIO_PFPAR = CFG_PFPAR;
+#ifdef	CONFIG_SYS_PFPAR
+	MCFGPIO_PFPAR = CONFIG_SYS_PFPAR;
 #endif
-#ifdef CFG_PJPAR
-	MCFGPIO_PJPAR = CFG_PJPAR;
+#ifdef CONFIG_SYS_PJPAR
+	MCFGPIO_PJPAR = CONFIG_SYS_PJPAR;
 #endif
-#ifdef CFG_PSDPAR
-	MCFGPIO_PSDPAR = CFG_PSDPAR;
+#ifdef CONFIG_SYS_PSDPAR
+	MCFGPIO_PSDPAR = CONFIG_SYS_PSDPAR;
 #endif
-#ifdef CFG_PASPAR
-	MCFGPIO_PASPAR = CFG_PASPAR;
+#ifdef CONFIG_SYS_PASPAR
+	MCFGPIO_PASPAR = CONFIG_SYS_PASPAR;
 #endif
-#ifdef CFG_PEHLPAR
-	MCFGPIO_PEHLPAR = CFG_PEHLPAR;
+#ifdef CONFIG_SYS_PEHLPAR
+	MCFGPIO_PEHLPAR = CONFIG_SYS_PEHLPAR;
 #endif
-#ifdef CFG_PQSPAR
-	MCFGPIO_PQSPAR = CFG_PQSPAR;
+#ifdef CONFIG_SYS_PQSPAR
+	MCFGPIO_PQSPAR = CONFIG_SYS_PQSPAR;
 #endif
-#ifdef CFG_PTCPAR
-	MCFGPIO_PTCPAR = CFG_PTCPAR;
+#ifdef CONFIG_SYS_PTCPAR
+	MCFGPIO_PTCPAR = CONFIG_SYS_PTCPAR;
 #endif
-#ifdef CFG_PTDPAR
-	MCFGPIO_PTDPAR = CFG_PTDPAR;
+#ifdef CONFIG_SYS_PTDPAR
+	MCFGPIO_PTDPAR = CONFIG_SYS_PTDPAR;
 #endif
-#ifdef CFG_PUAPAR
-	MCFGPIO_PUAPAR = CFG_PUAPAR;
+#ifdef CONFIG_SYS_PUAPAR
+	MCFGPIO_PUAPAR = CONFIG_SYS_PUAPAR;
 #endif
 
-#ifdef CFG_DDRUA
-	MCFGPIO_DDRUA = CFG_DDRUA;
+#ifdef CONFIG_SYS_DDRUA
+	MCFGPIO_DDRUA = CONFIG_SYS_DDRUA;
 #endif
 
 	/* This is probably a bad place to setup chip selects, but everyone
 	   else is doing it! */
 
-#if defined(CFG_CS0_BASE) & defined(CFG_CS0_SIZE) & \
-    defined(CFG_CS0_WIDTH) & defined(CFG_CS0_WS)
+#if defined(CONFIG_SYS_CS0_BASE) & defined(CONFIG_SYS_CS0_SIZE) & \
+    defined(CONFIG_SYS_CS0_WIDTH) & defined(CONFIG_SYS_CS0_WS)
 
-	MCFCSM_CSAR0 = (CFG_CS0_BASE >> 16) & 0xFFFF;
+	MCFCSM_CSAR0 = (CONFIG_SYS_CS0_BASE >> 16) & 0xFFFF;
 
-#if (CFG_CS0_WIDTH == 8)
-#define	 CFG_CS0_PS  MCFCSM_CSCR_PS_8
-#elif (CFG_CS0_WIDTH == 16)
-#define	 CFG_CS0_PS  MCFCSM_CSCR_PS_16
-#elif (CFG_CS0_WIDTH == 32)
-#define	 CFG_CS0_PS  MCFCSM_CSCR_PS_32
+#if (CONFIG_SYS_CS0_WIDTH == 8)
+#define	 CONFIG_SYS_CS0_PS  MCFCSM_CSCR_PS_8
+#elif (CONFIG_SYS_CS0_WIDTH == 16)
+#define	 CONFIG_SYS_CS0_PS  MCFCSM_CSCR_PS_16
+#elif (CONFIG_SYS_CS0_WIDTH == 32)
+#define	 CONFIG_SYS_CS0_PS  MCFCSM_CSCR_PS_32
 #else
-#error	"CFG_CS0_WIDTH: Fault - wrong bus with for CS0"
+#error	"CONFIG_SYS_CS0_WIDTH: Fault - wrong bus with for CS0"
 #endif
-	MCFCSM_CSCR0 = MCFCSM_CSCR_WS(CFG_CS0_WS)
-	    | CFG_CS0_PS | MCFCSM_CSCR_AA;
+	MCFCSM_CSCR0 = MCFCSM_CSCR_WS(CONFIG_SYS_CS0_WS)
+	    | CONFIG_SYS_CS0_PS | MCFCSM_CSCR_AA;
 
-#if (CFG_CS0_RO != 0)
-	MCFCSM_CSMR0 = MCFCSM_CSMR_BAM(CFG_CS0_SIZE - 1)
+#if (CONFIG_SYS_CS0_RO != 0)
+	MCFCSM_CSMR0 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS0_SIZE - 1)
 	    | MCFCSM_CSMR_WP | MCFCSM_CSMR_V;
 #else
-	MCFCSM_CSMR0 = MCFCSM_CSMR_BAM(CFG_CS0_SIZE - 1) | MCFCSM_CSMR_V;
+	MCFCSM_CSMR0 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS0_SIZE - 1) | MCFCSM_CSMR_V;
 #endif
 #else
 #warning "Chip Select 0 are not initialized/used"
 #endif
 
-#if defined(CFG_CS1_BASE) & defined(CFG_CS1_SIZE) & \
-    defined(CFG_CS1_WIDTH) & defined(CFG_CS1_WS)
+#if defined(CONFIG_SYS_CS1_BASE) & defined(CONFIG_SYS_CS1_SIZE) & \
+    defined(CONFIG_SYS_CS1_WIDTH) & defined(CONFIG_SYS_CS1_WS)
 
-	MCFCSM_CSAR1 = (CFG_CS1_BASE >> 16) & 0xFFFF;
+	MCFCSM_CSAR1 = (CONFIG_SYS_CS1_BASE >> 16) & 0xFFFF;
 
-#if (CFG_CS1_WIDTH == 8)
-#define	 CFG_CS1_PS  MCFCSM_CSCR_PS_8
-#elif (CFG_CS1_WIDTH == 16)
-#define	 CFG_CS1_PS  MCFCSM_CSCR_PS_16
-#elif (CFG_CS1_WIDTH == 32)
-#define	 CFG_CS1_PS  MCFCSM_CSCR_PS_32
+#if (CONFIG_SYS_CS1_WIDTH == 8)
+#define	 CONFIG_SYS_CS1_PS  MCFCSM_CSCR_PS_8
+#elif (CONFIG_SYS_CS1_WIDTH == 16)
+#define	 CONFIG_SYS_CS1_PS  MCFCSM_CSCR_PS_16
+#elif (CONFIG_SYS_CS1_WIDTH == 32)
+#define	 CONFIG_SYS_CS1_PS  MCFCSM_CSCR_PS_32
 #else
-#error	"CFG_CS1_WIDTH: Fault - wrong bus with for CS1"
+#error	"CONFIG_SYS_CS1_WIDTH: Fault - wrong bus with for CS1"
 #endif
-	MCFCSM_CSCR1 = MCFCSM_CSCR_WS(CFG_CS1_WS)
-	    | CFG_CS1_PS | MCFCSM_CSCR_AA;
+	MCFCSM_CSCR1 = MCFCSM_CSCR_WS(CONFIG_SYS_CS1_WS)
+	    | CONFIG_SYS_CS1_PS | MCFCSM_CSCR_AA;
 
-#if (CFG_CS1_RO != 0)
-	MCFCSM_CSMR1 = MCFCSM_CSMR_BAM(CFG_CS1_SIZE - 1)
+#if (CONFIG_SYS_CS1_RO != 0)
+	MCFCSM_CSMR1 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS1_SIZE - 1)
 	    | MCFCSM_CSMR_WP | MCFCSM_CSMR_V;
 #else
-	MCFCSM_CSMR1 = MCFCSM_CSMR_BAM(CFG_CS1_SIZE - 1)
+	MCFCSM_CSMR1 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS1_SIZE - 1)
 	    | MCFCSM_CSMR_V;
 #endif
 #else
 #warning "Chip Select 1 are not initialized/used"
 #endif
 
-#if defined(CFG_CS2_BASE) & defined(CFG_CS2_SIZE) & \
-    defined(CFG_CS2_WIDTH) & defined(CFG_CS2_WS)
+#if defined(CONFIG_SYS_CS2_BASE) & defined(CONFIG_SYS_CS2_SIZE) & \
+    defined(CONFIG_SYS_CS2_WIDTH) & defined(CONFIG_SYS_CS2_WS)
 
-	MCFCSM_CSAR2 = (CFG_CS2_BASE >> 16) & 0xFFFF;
+	MCFCSM_CSAR2 = (CONFIG_SYS_CS2_BASE >> 16) & 0xFFFF;
 
-#if (CFG_CS2_WIDTH == 8)
-#define	 CFG_CS2_PS  MCFCSM_CSCR_PS_8
-#elif (CFG_CS2_WIDTH == 16)
-#define	 CFG_CS2_PS  MCFCSM_CSCR_PS_16
-#elif (CFG_CS2_WIDTH == 32)
-#define	 CFG_CS2_PS  MCFCSM_CSCR_PS_32
+#if (CONFIG_SYS_CS2_WIDTH == 8)
+#define	 CONFIG_SYS_CS2_PS  MCFCSM_CSCR_PS_8
+#elif (CONFIG_SYS_CS2_WIDTH == 16)
+#define	 CONFIG_SYS_CS2_PS  MCFCSM_CSCR_PS_16
+#elif (CONFIG_SYS_CS2_WIDTH == 32)
+#define	 CONFIG_SYS_CS2_PS  MCFCSM_CSCR_PS_32
 #else
-#error	"CFG_CS2_WIDTH: Fault - wrong bus with for CS2"
+#error	"CONFIG_SYS_CS2_WIDTH: Fault - wrong bus with for CS2"
 #endif
-	MCFCSM_CSCR2 = MCFCSM_CSCR_WS(CFG_CS2_WS)
-	    | CFG_CS2_PS | MCFCSM_CSCR_AA;
+	MCFCSM_CSCR2 = MCFCSM_CSCR_WS(CONFIG_SYS_CS2_WS)
+	    | CONFIG_SYS_CS2_PS | MCFCSM_CSCR_AA;
 
-#if (CFG_CS2_RO != 0)
-	MCFCSM_CSMR2 = MCFCSM_CSMR_BAM(CFG_CS2_SIZE - 1)
+#if (CONFIG_SYS_CS2_RO != 0)
+	MCFCSM_CSMR2 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS2_SIZE - 1)
 	    | MCFCSM_CSMR_WP | MCFCSM_CSMR_V;
 #else
-	MCFCSM_CSMR2 = MCFCSM_CSMR_BAM(CFG_CS2_SIZE - 1)
+	MCFCSM_CSMR2 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS2_SIZE - 1)
 	    | MCFCSM_CSMR_V;
 #endif
 #else
 #warning "Chip Select 2 are not initialized/used"
 #endif
 
-#if defined(CFG_CS3_BASE) & defined(CFG_CS3_SIZE) & \
-    defined(CFG_CS3_WIDTH) & defined(CFG_CS3_WS)
+#if defined(CONFIG_SYS_CS3_BASE) & defined(CONFIG_SYS_CS3_SIZE) & \
+    defined(CONFIG_SYS_CS3_WIDTH) & defined(CONFIG_SYS_CS3_WS)
 
-	MCFCSM_CSAR3 = (CFG_CS3_BASE >> 16) & 0xFFFF;
+	MCFCSM_CSAR3 = (CONFIG_SYS_CS3_BASE >> 16) & 0xFFFF;
 
-#if (CFG_CS3_WIDTH == 8)
-#define	 CFG_CS3_PS  MCFCSM_CSCR_PS_8
-#elif (CFG_CS3_WIDTH == 16)
-#define	 CFG_CS3_PS  MCFCSM_CSCR_PS_16
-#elif (CFG_CS3_WIDTH == 32)
-#define	 CFG_CS3_PS  MCFCSM_CSCR_PS_32
+#if (CONFIG_SYS_CS3_WIDTH == 8)
+#define	 CONFIG_SYS_CS3_PS  MCFCSM_CSCR_PS_8
+#elif (CONFIG_SYS_CS3_WIDTH == 16)
+#define	 CONFIG_SYS_CS3_PS  MCFCSM_CSCR_PS_16
+#elif (CONFIG_SYS_CS3_WIDTH == 32)
+#define	 CONFIG_SYS_CS3_PS  MCFCSM_CSCR_PS_32
 #else
-#error	"CFG_CS3_WIDTH: Fault - wrong bus with for CS1"
+#error	"CONFIG_SYS_CS3_WIDTH: Fault - wrong bus with for CS1"
 #endif
-	MCFCSM_CSCR3 = MCFCSM_CSCR_WS(CFG_CS3_WS)
-	    | CFG_CS3_PS | MCFCSM_CSCR_AA;
+	MCFCSM_CSCR3 = MCFCSM_CSCR_WS(CONFIG_SYS_CS3_WS)
+	    | CONFIG_SYS_CS3_PS | MCFCSM_CSCR_AA;
 
-#if (CFG_CS3_RO != 0)
-	MCFCSM_CSMR3 = MCFCSM_CSMR_BAM(CFG_CS3_SIZE - 1)
+#if (CONFIG_SYS_CS3_RO != 0)
+	MCFCSM_CSMR3 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS3_SIZE - 1)
 	    | MCFCSM_CSMR_WP | MCFCSM_CSMR_V;
 #else
-	MCFCSM_CSMR3 = MCFCSM_CSMR_BAM(CFG_CS3_SIZE - 1)
+	MCFCSM_CSMR3 = MCFCSM_CSMR_BAM(CONFIG_SYS_CS3_SIZE - 1)
 	    | MCFCSM_CSMR_V;
 #endif
 #else
@@ -556,7 +556,7 @@ int cpu_init_r(void)
 void uart_port_conf(void)
 {
 	/* Setup Ports: */
-	switch (CFG_UART_PORT) {
+	switch (CONFIG_SYS_UART_PORT) {
 	case 0:
 		MCFGPIO_PUAPAR &= 0xFc;
 		MCFGPIO_PUAPAR |= 0x03;
@@ -589,12 +589,12 @@ void cpu_init_f(void)
 	 *        which is their primary function.
 	 *        ~Jeremy
 	 */
-	mbar2_writeLong(MCFSIM_GPIO_FUNC, CFG_GPIO_FUNC);
-	mbar2_writeLong(MCFSIM_GPIO1_FUNC, CFG_GPIO1_FUNC);
-	mbar2_writeLong(MCFSIM_GPIO_EN, CFG_GPIO_EN);
-	mbar2_writeLong(MCFSIM_GPIO1_EN, CFG_GPIO1_EN);
-	mbar2_writeLong(MCFSIM_GPIO_OUT, CFG_GPIO_OUT);
-	mbar2_writeLong(MCFSIM_GPIO1_OUT, CFG_GPIO1_OUT);
+	mbar2_writeLong(MCFSIM_GPIO_FUNC, CONFIG_SYS_GPIO_FUNC);
+	mbar2_writeLong(MCFSIM_GPIO1_FUNC, CONFIG_SYS_GPIO1_FUNC);
+	mbar2_writeLong(MCFSIM_GPIO_EN, CONFIG_SYS_GPIO_EN);
+	mbar2_writeLong(MCFSIM_GPIO1_EN, CONFIG_SYS_GPIO1_EN);
+	mbar2_writeLong(MCFSIM_GPIO_OUT, CONFIG_SYS_GPIO_OUT);
+	mbar2_writeLong(MCFSIM_GPIO1_OUT, CONFIG_SYS_GPIO1_OUT);
 
 	/*
 	 *  dBug Compliance:
@@ -636,13 +636,13 @@ void cpu_init_f(void)
 	 *  Setup chip selects...
 	 */
 
-	mbar_writeShort(MCFSIM_CSAR1, CFG_CSAR1);
-	mbar_writeShort(MCFSIM_CSCR1, CFG_CSCR1);
-	mbar_writeLong(MCFSIM_CSMR1, CFG_CSMR1);
+	mbar_writeShort(MCFSIM_CSAR1, CONFIG_SYS_CSAR1);
+	mbar_writeShort(MCFSIM_CSCR1, CONFIG_SYS_CSCR1);
+	mbar_writeLong(MCFSIM_CSMR1, CONFIG_SYS_CSMR1);
 
-	mbar_writeShort(MCFSIM_CSAR0, CFG_CSAR0);
-	mbar_writeShort(MCFSIM_CSCR0, CFG_CSCR0);
-	mbar_writeLong(MCFSIM_CSMR0, CFG_CSMR0);
+	mbar_writeShort(MCFSIM_CSAR0, CONFIG_SYS_CSAR0);
+	mbar_writeShort(MCFSIM_CSCR0, CONFIG_SYS_CSCR0);
+	mbar_writeLong(MCFSIM_CSMR0, CONFIG_SYS_CSMR0);
 
 	/* enable instruction cache now */
 	icache_enable();
@@ -659,7 +659,7 @@ int cpu_init_r(void)
 void uart_port_conf(void)
 {
 	/* Setup Ports: */
-	switch (CFG_UART_PORT) {
+	switch (CONFIG_SYS_UART_PORT) {
 	case 0:
 		break;
 	case 1: