Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:

	board/eukrea/cpu9260/cpu9260.c
	drivers/serial/serial_s5pc1xx.c
	include/asm-arm/arch-s5pc1xx/clock.h
	include/asm-arm/arch-s5pc1xx/gpio.h
	include/asm-arm/arch-s5pc1xx/pwm.h
	include/asm-arm/arch-s5pc1xx/uart.h
	include/configs/cpu9260.h
	include/configs/cpuat91.h
	include/configs/davinci_dm355evm.h
	include/linux/mtd/samsung_onenand.h

8 files changed, 84 insertions, 78 deletions

diff --git a/include/asm-arm/arch-davinci/hardware.h b/include/asm-arm/arch-davinci/hardware.h
index ac32510a30..acf12ea7a2 100644
--- a/include/asm-arm/arch-davinci/hardware.h
+++ b/include/asm-arm/arch-davinci/hardware.h
@@ -71,10 +71,12 @@ typedef volatile unsigned int *	dv_reg_p;
 #define DAVINCI_SPI_BASE			(0x01c66800)
 #define DAVINCI_GPIO_BASE			(0x01c67000)
 #define DAVINCI_VPSS_REGS_BASE			(0x01c70000)
+#if !defined(CONFIG_SOC_DM646X)
 #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE	(0x02000000)
 #define DAVINCI_ASYNC_EMIF_DATA_CE1_BASE	(0x04000000)
 #define DAVINCI_ASYNC_EMIF_DATA_CE2_BASE	(0x06000000)
 #define DAVINCI_ASYNC_EMIF_DATA_CE3_BASE	(0x08000000)
+#endif
 #define DAVINCI_DDR_BASE			(0x80000000)
 
 #ifdef CONFIG_SOC_DM644X
diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h
index 2246f801e5..34bd515b05 100644
--- a/include/asm-arm/arch-omap3/sys_proto.h
+++ b/include/asm-arm/arch-omap3/sys_proto.h
@@ -34,6 +34,8 @@ void memif_init(void);
 void sdrc_init(void);
 void do_sdrc_init(u32, u32);
 void gpmc_init(void);
+void enable_gpmc_cs_config(const u32 *gpmc_config, struct gpmc_cs *cs, u32 base,
+			u32 size);
 
 void watchdog_init(void);
 void set_muxconf_regs(void);
diff --git a/include/asm-arm/arch-s5pc1xx/clock.h b/include/asm-arm/arch-s5pc1xx/clock.h
index 0cad9225bd..7b4eb89905 100644
--- a/include/asm-arm/arch-s5pc1xx/clock.h
+++ b/include/asm-arm/arch-s5pc1xx/clock.h
@@ -25,69 +25,69 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc100_clock {
-	unsigned long	apll_lock;
-	unsigned long	mpll_lock;
-	unsigned long	epll_lock;
-	unsigned long	hpll_lock;
+	unsigned int	apll_lock;
+	unsigned int	mpll_lock;
+	unsigned int	epll_lock;
+	unsigned int	hpll_lock;
 	unsigned char	res1[0xf0];
-	unsigned long	apll_con;
-	unsigned long	mpll_con;
-	unsigned long	epll_con;
-	unsigned long	hpll_con;
+	unsigned int	apll_con;
+	unsigned int	mpll_con;
+	unsigned int	epll_con;
+	unsigned int	hpll_con;
 	unsigned char	res2[0xf0];
-	unsigned long	src0;
-	unsigned long	src1;
-	unsigned long	src2;
-	unsigned long	src3;
+	unsigned int	src0;
+	unsigned int	src1;
+	unsigned int	src2;
+	unsigned int	src3;
 	unsigned char	res3[0xf0];
-	unsigned long	div0;
-	unsigned long	div1;
-	unsigned long	div2;
-	unsigned long	div3;
-	unsigned long	div4;
+	unsigned int	div0;
+	unsigned int	div1;
+	unsigned int	div2;
+	unsigned int	div3;
+	unsigned int	div4;
 	unsigned char	res4[0x1ec];
-	unsigned long	gate_d00;
-	unsigned long	gate_d01;
-	unsigned long	gate_d02;
+	unsigned int	gate_d00;
+	unsigned int	gate_d01;
+	unsigned int	gate_d02;
 	unsigned char	res5[0x54];
-	unsigned long	gate_sclk0;
-	unsigned long	gate_sclk1;
+	unsigned int	gate_sclk0;
+	unsigned int	gate_sclk1;
 };
 
 struct s5pc110_clock {
-	unsigned long	apll_lock;
+	unsigned int	apll_lock;
 	unsigned char	res1[0x4];
-	unsigned long	mpll_lock;
+	unsigned int	mpll_lock;
 	unsigned char	res2[0x4];
-	unsigned long	epll_lock;
+	unsigned int	epll_lock;
 	unsigned char	res3[0xc];
-	unsigned long	vpll_lock;
+	unsigned int	vpll_lock;
 	unsigned char	res4[0xdc];
-	unsigned long	apll_con;
+	unsigned int	apll_con;
 	unsigned char	res5[0x4];
-	unsigned long	mpll_con;
+	unsigned int	mpll_con;
 	unsigned char	res6[0x4];
-	unsigned long	epll_con;
+	unsigned int	epll_con;
 	unsigned char	res7[0xc];
-	unsigned long	vpll_con;
+	unsigned int	vpll_con;
 	unsigned char	res8[0xdc];
-	unsigned long	src0;
-	unsigned long	src1;
-	unsigned long	src2;
-	unsigned long	src3;
+	unsigned int	src0;
+	unsigned int	src1;
+	unsigned int	src2;
+	unsigned int	src3;
 	unsigned char	res9[0xf0];
-	unsigned long	div0;
-	unsigned long	div1;
-	unsigned long	div2;
-	unsigned long	div3;
-	unsigned long	div4;
+	unsigned int	div0;
+	unsigned int	div1;
+	unsigned int	div2;
+	unsigned int	div3;
+	unsigned int	div4;
 	unsigned char	res10[0x1ec];
-	unsigned long	gate_d00;
-	unsigned long	gate_d01;
-	unsigned long	gate_d02;
+	unsigned int	gate_d00;
+	unsigned int	gate_d01;
+	unsigned int	gate_d02;
 	unsigned char	res11[0x54];
-	unsigned long	gate_sclk0;
-	unsigned long	gate_sclk1;
+	unsigned int	gate_sclk0;
+	unsigned int	gate_sclk1;
 };
 #endif
 
diff --git a/include/asm-arm/arch-s5pc1xx/gpio.h b/include/asm-arm/arch-s5pc1xx/gpio.h
index 0010405315..afbc7ea5ae 100644
--- a/include/asm-arm/arch-s5pc1xx/gpio.h
+++ b/include/asm-arm/arch-s5pc1xx/gpio.h
@@ -23,12 +23,12 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc1xx_gpio_bank {
-	unsigned long	con;
-	unsigned long	dat;
-	unsigned long	pull;
-	unsigned long	drv;
-	unsigned long	pdn_con;
-	unsigned long	pdn_pull;
+	unsigned int	con;
+	unsigned int	dat;
+	unsigned int	pull;
+	unsigned int	drv;
+	unsigned int	pdn_con;
+	unsigned int	pdn_pull;
 	unsigned char	res1[8];
 };
 
diff --git a/include/asm-arm/arch-s5pc1xx/pwm.h b/include/asm-arm/arch-s5pc1xx/pwm.h
index 53c23cd146..e02a8d8fb3 100644
--- a/include/asm-arm/arch-s5pc1xx/pwm.h
+++ b/include/asm-arm/arch-s5pc1xx/pwm.h
@@ -35,24 +35,24 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc1xx_timer {
-	unsigned long	tcfg0;
-	unsigned long	tcfg1;
-	unsigned long	tcon;
-	unsigned long	tcntb0;
-	unsigned long	tcmpb0;
-	unsigned long	tcnto0;
-	unsigned long	tcntb1;
-	unsigned long	tcmpb1;
-	unsigned long	tcnto1;
-	unsigned long	tcntb2;
-	unsigned long	tcmpb2;
-	unsigned long	tcnto2;
-	unsigned long	tcntb3;
-	unsigned long	res1;
-	unsigned long	tcnto3;
-	unsigned long	tcntb4;
-	unsigned long	tcnto4;
-	unsigned long	tintcstat;
+	unsigned int	tcfg0;
+	unsigned int	tcfg1;
+	unsigned int	tcon;
+	unsigned int	tcntb0;
+	unsigned int	tcmpb0;
+	unsigned int	tcnto0;
+	unsigned int	tcntb1;
+	unsigned int	tcmpb1;
+	unsigned int	tcnto1;
+	unsigned int	tcntb2;
+	unsigned int	tcmpb2;
+	unsigned int	tcnto2;
+	unsigned int	tcntb3;
+	unsigned int	res1;
+	unsigned int	tcnto3;
+	unsigned int	tcntb4;
+	unsigned int	tcnto4;
+	unsigned int	tintcstat;
 };
 #endif	/* __ASSEMBLY__ */
 
diff --git a/include/asm-arm/arch-s5pc1xx/uart.h b/include/asm-arm/arch-s5pc1xx/uart.h
index bd7d6b2dda..140dbdc45f 100644
--- a/include/asm-arm/arch-s5pc1xx/uart.h
+++ b/include/asm-arm/arch-s5pc1xx/uart.h
@@ -25,19 +25,19 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc1xx_uart {
-	unsigned long	ulcon;
-	unsigned long	ucon;
-	unsigned long	ufcon;
-	unsigned long	umcon;
-	unsigned long	utrstat;
-	unsigned long	uerstat;
-	unsigned long	ufstat;
-	unsigned long	umstat;
+	unsigned int	ulcon;
+	unsigned int	ucon;
+	unsigned int	ufcon;
+	unsigned int	umcon;
+	unsigned int	utrstat;
+	unsigned int	uerstat;
+	unsigned int	ufstat;
+	unsigned int	umstat;
 	unsigned char	utxh;
 	unsigned char	res1[3];
 	unsigned char	urxh;
 	unsigned char	res2[3];
-	unsigned long	ubrdiv;
+	unsigned int	ubrdiv;
 	unsigned short	udivslot;
 	unsigned char	res3[2];
 	unsigned char	res4[0x3d0];
diff --git a/include/asm-arm/config.h b/include/asm-arm/config.h
index 049c44eaf8..b76fd8eb48 100644
--- a/include/asm-arm/config.h
+++ b/include/asm-arm/config.h
@@ -21,4 +21,7 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
+/* Relocation to SDRAM works on all ARM boards */
+#define CONFIG_RELOC_FIXUP_WORKS
+
 #endif
diff --git a/include/asm-arm/global_data.h b/include/asm-arm/global_data.h
index 5c56ce3282..8115a24b78 100644
--- a/include/asm-arm/global_data.h
+++ b/include/asm-arm/global_data.h
@@ -38,7 +38,6 @@ typedef	struct	global_data {
 	unsigned long	flags;
 	unsigned long	baudrate;
 	unsigned long	have_console;	/* serial_init() was called */
-	unsigned long	reloc_off;	/* Relocation Offset */
 	unsigned long	env_addr;	/* Address  of Environment struct */
 	unsigned long	env_valid;	/* Checksum of Environment valid? */
 	unsigned long	fb_base;	/* base address of frame buffer */