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

Conflicts:

	drivers/usb/usb_ohci.c

5 files changed, 58 insertions, 58 deletions

diff --git a/cpu/leon3/cpu_init.c b/cpu/leon3/cpu_init.c
index 4fe7d4b..be22ec2 100644
--- a/cpu/leon3/cpu_init.c
+++ b/cpu/leon3/cpu_init.c
@@ -159,9 +159,9 @@ int init_memory_ctrl()
 		mctrl = (ambapp_dev_mctrl *) base;
 
 		/* config MCTRL memory controller */
-		mctrl->mcfg1 = CFG_GRLIB_MEMCFG1 | (mctrl->mcfg1 & 0x300);
-		mctrl->mcfg2 = CFG_GRLIB_MEMCFG2;
-		mctrl->mcfg3 = CFG_GRLIB_MEMCFG3;
+		mctrl->mcfg1 = CONFIG_SYS_GRLIB_MEMCFG1 | (mctrl->mcfg1 & 0x300);
+		mctrl->mcfg2 = CONFIG_SYS_GRLIB_MEMCFG2;
+		mctrl->mcfg3 = CONFIG_SYS_GRLIB_MEMCFG3;
 		not_found_mctrl = 0;
 	}
 
@@ -171,9 +171,9 @@ int init_memory_ctrl()
 		mctrl = (ambapp_dev_mctrl *) base;
 
 		/* config MCTRL memory controller */
-		mctrl->mcfg1 = CFG_GRLIB_FT_MEMCFG1 | (mctrl->mcfg1 & 0x300);
-		mctrl->mcfg2 = CFG_GRLIB_FT_MEMCFG2;
-		mctrl->mcfg3 = CFG_GRLIB_FT_MEMCFG3;
+		mctrl->mcfg1 = CONFIG_SYS_GRLIB_FT_MEMCFG1 | (mctrl->mcfg1 & 0x300);
+		mctrl->mcfg2 = CONFIG_SYS_GRLIB_FT_MEMCFG2;
+		mctrl->mcfg3 = CONFIG_SYS_GRLIB_FT_MEMCFG3;
 		not_found_mctrl = 0;
 	}
 
@@ -183,7 +183,7 @@ int init_memory_ctrl()
 		sdctrl = (ambapp_dev_sdctrl *) base;
 
 		/* config memory controller */
-		sdctrl->sdcfg = CFG_GRLIB_SDRAM;
+		sdctrl->sdcfg = CONFIG_SYS_GRLIB_SDRAM;
 		not_found_mctrl = 0;
 	}
 
@@ -192,8 +192,8 @@ int init_memory_ctrl()
 		ddr2spa = (ambapp_dev_ddr2spa *) ambapp_ahb_get_info(ahb, 1);
 
 		/* Config DDR2 memory controller */
-		ddr2spa->cfg1 = CFG_GRLIB_DDR2_CFG1;
-		ddr2spa->cfg3 = CFG_GRLIB_DDR2_CFG3;
+		ddr2spa->cfg1 = CONFIG_SYS_GRLIB_DDR2_CFG1;
+		ddr2spa->cfg3 = CONFIG_SYS_GRLIB_DDR2_CFG3;
 		not_found_mctrl = 0;
 	}
 
@@ -202,7 +202,7 @@ int init_memory_ctrl()
 		ddrspa = (ambapp_dev_ddrspa *) ambapp_ahb_get_info(ahb, 1);
 
 		/* Config DDR memory controller */
-		ddrspa->ctrl = CFG_GRLIB_DDR_CFG;
+		ddrspa->ctrl = CONFIG_SYS_GRLIB_DDR_CFG;
 		not_found_mctrl = 0;
 	}
 
diff --git a/cpu/leon3/interrupts.c b/cpu/leon3/interrupts.c
index 2692632..ac6aca5 100644
--- a/cpu/leon3/interrupts.c
+++ b/cpu/leon3/interrupts.c
@@ -104,8 +104,8 @@ static void leon3_ic_enable(unsigned int irq)
 void handler_irq(int irq, struct pt_regs *regs)
 {
 	if (irq_handlers[irq].handler) {
-		if (((unsigned int)irq_handlers[irq].handler > CFG_RAM_END) ||
-		    ((unsigned int)irq_handlers[irq].handler < CFG_RAM_BASE)
+		if (((unsigned int)irq_handlers[irq].handler > CONFIG_SYS_RAM_END) ||
+		    ((unsigned int)irq_handlers[irq].handler < CONFIG_SYS_RAM_BASE)
 		    ) {
 			printf("handler_irq: bad handler: %x, irq number %d\n",
 			       (unsigned int)irq_handlers[irq].handler, irq);
@@ -165,8 +165,8 @@ void irq_install_handler(int irq, interrupt_handler_t * handler, void *arg)
 		printf("irq_install_handler: 0x%08lx replacing 0x%08lx\n",
 		       (ulong) handler, (ulong) irq_handlers[irq].handler);
 
-	if (((unsigned int)handler > CFG_RAM_END) ||
-	    ((unsigned int)handler < CFG_RAM_BASE)
+	if (((unsigned int)handler > CONFIG_SYS_RAM_END) ||
+	    ((unsigned int)handler < CONFIG_SYS_RAM_BASE)
 	    ) {
 		printf("irq_install_handler: bad handler: %x, irq number %d\n",
 		       (unsigned int)handler, irq);
diff --git a/cpu/leon3/prom.c b/cpu/leon3/prom.c
index 9fa2d04..18d2fb2 100644
--- a/cpu/leon3/prom.c
+++ b/cpu/leon3/prom.c
@@ -49,14 +49,14 @@ ambapp_dev_gptimer *gptimer;
 /* for __va */
 extern int __prom_start;
 #define PAGE_OFFSET 0xf0000000
-#define phys_base CFG_SDRAM_BASE
+#define phys_base CONFIG_SYS_SDRAM_BASE
 #define PROM_OFFS 8192
 #define PROM_SIZE_MASK (PROM_OFFS-1)
 #define __va(x) ( \
 	(void *)( ((unsigned long)(x))-PROM_OFFS+ \
-	(CFG_PROM_OFFSET-phys_base)+PAGE_OFFSET-TEXT_BASE ) \
+	(CONFIG_SYS_PROM_OFFSET-phys_base)+PAGE_OFFSET-TEXT_BASE ) \
 	)
-#define __phy(x) ((void *)(((unsigned long)(x))-PROM_OFFS+CFG_PROM_OFFSET-TEXT_BASE))
+#define __phy(x) ((void *)(((unsigned long)(x))-PROM_OFFS+CONFIG_SYS_PROM_OFFSET-TEXT_BASE))
 
 struct property {
 	char *name;
@@ -545,13 +545,13 @@ static struct leon_prom_info PROM_DATA spi = {
 	__va(&spi.totphys),
 	{
 	 NULL,
-	 (char *)CFG_SDRAM_BASE,
+	 (char *)CONFIG_SYS_SDRAM_BASE,
 	 0,
 	 },
 	__va(&spi.avail),
 	{
 	 NULL,
-	 (char *)CFG_SDRAM_BASE,
+	 (char *)CONFIG_SYS_SDRAM_BASE,
 	 0,
 	 },
 	NULL,			/* prommap_p */
@@ -659,7 +659,7 @@ static void PROM_TEXT leon_reboot(char *bcommand)
 
 	/* get physical address */
 	struct leon_prom_info *pspi =
-	    (void *)(CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (void *)(CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	unsigned int *srmmu_ctx_table;
 
@@ -712,7 +712,7 @@ static void PROM_TEXT leon_reboot_physical(char *bcommand)
 	srmmu_set_mmureg(0);
 
 	/* Hardcoded start address */
-	reset = CFG_MONITOR_BASE;
+	reset = CONFIG_SYS_MONITOR_BASE;
 
 	/* flush data cache */
 	sparc_dcache_flush_all();
@@ -742,7 +742,7 @@ static int PROM_TEXT leon_nbputchar(int c)
 
 	/* get physical address */
 	struct leon_prom_info *pspi =
-	    (void *)(CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (void *)(CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	uart = (ambapp_dev_apbuart *)
 	    SPARC_BYPASS_READ(&pspi->reloc_funcs.leon3_apbuart);
@@ -778,7 +778,7 @@ static int PROM_TEXT no_nextnode(int node)
 {
 	/* get physical address */
 	struct leon_prom_info *pspi =
-	    (void *)(CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (void *)(CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	/* convert into virtual address */
 	pspi = (struct leon_prom_info *)
@@ -793,7 +793,7 @@ static int PROM_TEXT no_child(int node)
 {
 	/* get physical address */
 	struct leon_prom_info *pspi = (struct leon_prom_info *)
-	    (CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	/* convert into virtual address */
 	pspi = (struct leon_prom_info *)
@@ -808,7 +808,7 @@ static struct property PROM_TEXT *find_property(int node, char *name)
 {
 	/* get physical address */
 	struct leon_prom_info *pspi = (struct leon_prom_info *)
-	    (CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	/* convert into virtual address */
 	pspi = (struct leon_prom_info *)
@@ -827,7 +827,7 @@ static int PROM_TEXT no_proplen(int node, char *name)
 {
 	/* get physical address */
 	struct leon_prom_info *pspi = (struct leon_prom_info *)
-	    (CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	/* convert into virtual address */
 	pspi = (struct leon_prom_info *)
@@ -843,7 +843,7 @@ static int PROM_TEXT no_getprop(int node, char *name, char *value)
 {
 	/* get physical address */
 	struct leon_prom_info *pspi = (struct leon_prom_info *)
-	    (CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 
 	/* convert into virtual address */
 	pspi = (struct leon_prom_info *)
@@ -866,7 +866,7 @@ static char PROM_TEXT *no_nextprop(int node, char *name)
 {
 	/* get physical address */
 	struct leon_prom_info *pspi = (struct leon_prom_info *)
-	    (CFG_PROM_OFFSET + sizeof(srmmu_tables));
+	    (CONFIG_SYS_PROM_OFFSET + sizeof(srmmu_tables));
 	struct property *prop;
 
 	/* convert into virtual address */
@@ -922,7 +922,7 @@ void leon_prom_init(struct leon_prom_info *pspi)
 	pspi->freq_khz = CONFIG_SYS_CLK_FREQ / 1000;
 
 	/* Set Available main memory size */
-	pspi->totphys.num_bytes = CFG_PROM_OFFSET - CFG_SDRAM_BASE;
+	pspi->totphys.num_bytes = CONFIG_SYS_PROM_OFFSET - CONFIG_SYS_SDRAM_BASE;
 	pspi->avail.num_bytes = pspi->totphys.num_bytes;
 
 	/* Set the pointer to the Console UART in romvec */
@@ -982,7 +982,7 @@ extern unsigned short bss_start, bss_end;
 int prom_init(void)
 {
 	struct leon_prom_info *pspi = (void *)
-	    ((((unsigned int)&spi) & PROM_SIZE_MASK) + CFG_PROM_OFFSET);
+	    ((((unsigned int)&spi) & PROM_SIZE_MASK) + CONFIG_SYS_PROM_OFFSET);
 
 	/* disable mmu */
 	srmmu_set_mmureg(0x00000000);
@@ -1008,7 +1008,7 @@ void prepare_bootargs(char *bootargs)
 	/* if no bootargs set, skip copying ==> default bootline */
 	if (bootargs && (*bootargs != '\0')) {
 		pspi = (void *)((((unsigned int)&spi) & PROM_SIZE_MASK) +
-				CFG_PROM_OFFSET);
+				CONFIG_SYS_PROM_OFFSET);
 		src = bootargs;
 		dst = &pspi->arg[0];
 		left = 255;	/* max len */
@@ -1025,7 +1025,7 @@ void srmmu_init_cpu(unsigned int entry)
 {
 	sparc_srmmu_setup *psrmmu_tables = (void *)
 	    ((((unsigned int)&srmmu_tables) & PROM_SIZE_MASK) +
-	     CFG_PROM_OFFSET);
+	     CONFIG_SYS_PROM_OFFSET);
 
 	/* Make context 0 (kernel's context) point
 	 * to our prepared memory mapping
@@ -1041,21 +1041,21 @@ void srmmu_init_cpu(unsigned int entry)
 #define PTE 2
 #define ACC_SU_ALL 0x1c
 	psrmmu_tables->pgd_table[0xf0] =
-	    (CFG_SDRAM_BASE >> 4) | ACC_SU_ALL | PTE;
+	    (CONFIG_SYS_SDRAM_BASE >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf1] =
-	    ((CFG_SDRAM_BASE + 0x1000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x1000000) >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf2] =
-	    ((CFG_SDRAM_BASE + 0x2000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x2000000) >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf3] =
-	    ((CFG_SDRAM_BASE + 0x3000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x3000000) >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf4] =
-	    ((CFG_SDRAM_BASE + 0x4000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x4000000) >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf5] =
-	    ((CFG_SDRAM_BASE + 0x5000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x5000000) >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf6] =
-	    ((CFG_SDRAM_BASE + 0x6000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x6000000) >> 4) | ACC_SU_ALL | PTE;
 	psrmmu_tables->pgd_table[0xf7] =
-	    ((CFG_SDRAM_BASE + 0x7000000) >> 4) | ACC_SU_ALL | PTE;
+	    ((CONFIG_SYS_SDRAM_BASE + 0x7000000) >> 4) | ACC_SU_ALL | PTE;
 
 	/* convert rom vec pointer to virtual address */
 	kernel_arg_promvec = (struct linux_romvec *)
diff --git a/cpu/leon3/serial.c b/cpu/leon3/serial.c
index 27d5cd3..4b2fcb8 100644
--- a/cpu/leon3/serial.c
+++ b/cpu/leon3/serial.c
@@ -58,7 +58,7 @@ int serial_init(void)
 		 *
 		 * Receiver & transmitter enable
 		 */
-		leon3_apbuart->scaler = CFG_GRLIB_APBUART_SCALER;
+		leon3_apbuart->scaler = CONFIG_SYS_GRLIB_APBUART_SCALER;
 
 		/* Let bit 11 be unchanged (debug bit for GRMON) */
 		tmp = READ_WORD(leon3_apbuart->ctrl);
diff --git a/cpu/leon3/start.S b/cpu/leon3/start.S
index d421898..7afe10e 100644
--- a/cpu/leon3/start.S
+++ b/cpu/leon3/start.S
@@ -68,7 +68,7 @@ ARGPUSH = (WINDOWSIZE + 4)
 MINFRAME = (WINDOWSIZE + ARGPUSHSIZE + 4)
 
 /* Number of register windows */
-#ifndef CFG_SPARC_NWINDOWS
+#ifndef CONFIG_SYS_SPARC_NWINDOWS
 #error Must define number of SPARC register windows, default is 8
 #endif
 
@@ -251,7 +251,7 @@ wininit:
 	mov	%g3, %wim
 
 stackp:
-	set	CFG_INIT_SP_OFFSET, %fp
+	set	CONFIG_SYS_INIT_SP_OFFSET, %fp
 	andn	%fp, 0x0f, %fp
 	sub	%fp, 64, %sp
 
@@ -268,7 +268,7 @@ cpu_init_unreloc:
 reloc:
 	set	TEXT_START,%g2
 	set	DATA_END,%g3
-	set	CFG_RELOC_MONITOR_BASE,%g4
+	set	CONFIG_SYS_RELOC_MONITOR_BASE,%g4
 reloc_loop:
 	ldd	[%g2],%l0
 	ldd	[%g2+8],%l2
@@ -314,10 +314,10 @@ fixup_got:
 	set	__got_end,%g3
 /*
  * new got offset = (old GOT-PTR (read with ld) -
- *   CFG_RELOC_MONITOR_BASE(from define) ) +
+ *   CONFIG_SYS_RELOC_MONITOR_BASE(from define) ) +
  *   Destination Address (from define)
  */
-	set	CFG_RELOC_MONITOR_BASE,%g2
+	set	CONFIG_SYS_RELOC_MONITOR_BASE,%g2
 	set	TEXT_START, %g1
 	add	%g4,%g2,%g4
 	sub	%g4,%g1,%g4
@@ -338,7 +338,7 @@ got_loop:
 prom_relocate:
 	set	__prom_start, %g2
 	set	__prom_end, %g3
-	set	CFG_PROM_OFFSET, %g4
+	set	CONFIG_SYS_PROM_OFFSET, %g4
 
 prom_relocate_loop:
 	ldd	[%g2],%l0
@@ -354,7 +354,7 @@ prom_relocate_loop:
  * the new trap table address
  */
 
-	set	CFG_RELOC_MONITOR_BASE, %g2
+	set	CONFIG_SYS_RELOC_MONITOR_BASE, %g2
 	wr	%g0, %g2, %tbr
 	nop
 	nop
@@ -368,22 +368,22 @@ snoop_detect:
 	sethi	%hi(0x00800000), %o0
 	lda	[%g0] 2, %o1
 	and	%o0, %o1, %o0
-	sethi	%hi(leon3_snooping_avail+CFG_RELOC_MONITOR_BASE-TEXT_BASE), %o1
-	st	%o0, [%lo(leon3_snooping_avail+CFG_RELOC_MONITOR_BASE-TEXT_BASE)+%o1]
+	sethi	%hi(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o1
+	st	%o0, [%lo(leon3_snooping_avail+CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE)+%o1]
 
 /*	call	relocate*/
 	nop
 /* Call relocated init functions */
 jump:
 	set	cpu_init_f2,%o1
-	set	CFG_RELOC_MONITOR_BASE,%o2
+	set	CONFIG_SYS_RELOC_MONITOR_BASE,%o2
 	add	%o1,%o2,%o1
 	sub	%o1,%g1,%o1
 	call	%o1
 	clr	%o0
 
 	set	board_init_f,%o1
-	set	CFG_RELOC_MONITOR_BASE,%o2
+	set	CONFIG_SYS_RELOC_MONITOR_BASE,%o2
 	add	%o1,%o2,%o1
 	sub	%o1,%g1,%o1
 	call	%o1
@@ -409,7 +409,7 @@ _irq_entry:
 	WRITE_PAUSE
 	mov	%l7, %o0		! irq level
 	set	handler_irq, %o1
-	set	(CFG_RELOC_MONITOR_BASE-TEXT_BASE), %o2
+	set	(CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o2
 	add	%o1, %o2, %o1
 	call	%o1
 	add	%sp, SF_REGS_SZ, %o1	! pt_regs ptr
@@ -427,7 +427,7 @@ _window_overflow:
 	mov	%wim, %l3		! Calculate next WIM
 	mov	%g1, %l7
 	srl	%l3, 1, %g1
-	sll	%l3, (CFG_SPARC_NWINDOWS-1) , %l4
+	sll	%l3, (CONFIG_SYS_SPARC_NWINDOWS-1) , %l4
 	or	%l4, %g1, %g1
 
 	save				! Get into window to be saved.
@@ -464,7 +464,7 @@ _window_underflow:
 
 	mov  %wim, %l3			! Calculate next WIM
 	sll  %l3, 1, %l4
-	srl  %l3, (CFG_SPARC_NWINDOWS-1), %l5
+	srl  %l3, (CONFIG_SYS_SPARC_NWINDOWS-1), %l5
 	or   %l5, %l4, %l5
 	mov  %l5, %wim
 	nop; nop; nop
@@ -533,7 +533,7 @@ trap_setup:
 	 */
 	srl	%t_wim, 0x1, %g2		! begin computation of new %wim
 
-	set	(CFG_SPARC_NWINDOWS-1), %g3	!NWINDOWS-1
+	set	(CONFIG_SYS_SPARC_NWINDOWS-1), %g3	!NWINDOWS-1
 
 	sll	%t_wim, %g3, %t_wim	! NWINDOWS-1
 	or	%t_wim, %g2, %g2
@@ -567,7 +567,7 @@ ret_trap_entry:
 	mov	2, %g1
 	sll	%g1, %t_psr, %g1
 
-	set	CFG_SPARC_NWINDOWS, %g2	!NWINDOWS
+	set	CONFIG_SYS_SPARC_NWINDOWS, %g2	!NWINDOWS
 
 	srl	%g1, %g2, %g2
 	or	%g1, %g2, %g1
@@ -577,7 +577,7 @@ ret_trap_entry:
 	 sll	%g2, 0x1, %g1
 
 	/* We have to grab a window before returning. */
-	set	(CFG_SPARC_NWINDOWS-1), %g3	!NWINDOWS-1
+	set	(CONFIG_SYS_SPARC_NWINDOWS-1), %g3	!NWINDOWS-1
 
 	srl	%g2, %g3,  %g2
 	or	%g1, %g2, %g1