Merge branch 'net' into next

6 files changed, 10 insertions, 7 deletions

diff --git a/board/eukrea_cpuimx25/env/bin/init b/board/eukrea_cpuimx25/env/bin/init
index 8bcc732a40..335d7ae579 100644
--- a/board/eukrea_cpuimx25/env/bin/init
+++ b/board/eukrea_cpuimx25/env/bin/init
@@ -14,6 +14,9 @@ fi
 
 if [ -f /env/logo.bmp ]; then
 	bmp /env/logo.bmp
+elif [ -f /env/logo.bmp.lzo ]; then
+	unlzo /env/logo.bmp.lzo /logo.bmp
+	bmp /logo.bmp
 fi
 
 if [ -z $eth0.ethaddr ]; then
diff --git a/board/eukrea_cpuimx25/eukrea_cpuimx25.c b/board/eukrea_cpuimx25/eukrea_cpuimx25.c
index 8cbbc4fc57..b19efcc9d3 100644
--- a/board/eukrea_cpuimx25/eukrea_cpuimx25.c
+++ b/board/eukrea_cpuimx25/eukrea_cpuimx25.c
@@ -63,8 +63,6 @@ struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = {
 	{ .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, },
 };
 
-#define APP_DEST	0x80000000
-
 struct imx_flash_header __flash_header_0x400 eukrea_cpuimx25_header = {
 	.app_code_jump_vector	= TEXT_BASE + 0x2000,
 	.app_code_barker	= APP_CODE_BARKER,
diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
index c849022af6..e40c260320 100644
--- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c
+++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c
@@ -341,18 +341,20 @@ console_initcall(eukrea_cpuimx27_console_init);
 
 static int eukrea_cpuimx27_late_init(void)
 {
+#ifdef CONFIG_DRIVER_I2C_LP3972
 	struct i2c_client *client;
 	u8 reg[1];
-
+#endif
 	console_flush();
 	register_device(&fec_dev);
 
+#ifdef CONFIG_DRIVER_I2C_LP3972
 	client = lp3972_get_client();
 	if (!client)
 		return -ENODEV;
 	reg[0] = 0xa0;
 	i2c_write_reg(client, 0x39, reg, sizeof(reg));
-
+#endif
 	return 0;
 }
 
diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c
index 372fbc6d37..a77a02d498 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/board/freescale-mx25-3-stack/3stack.c
@@ -44,7 +44,7 @@ extern unsigned long _stext;
 
 void __naked __flash_header_start go(void)
 {
-	__asm__ __volatile__("b _start\n");
+	__asm__ __volatile__("b exception_vectors\n");
 }
 
 struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = {
diff --git a/board/freescale-mx35-3-stack/flash_header.c b/board/freescale-mx35-3-stack/flash_header.c
index 968a948a8d..171c499a6d 100644
--- a/board/freescale-mx35-3-stack/flash_header.c
+++ b/board/freescale-mx35-3-stack/flash_header.c
@@ -5,7 +5,7 @@ extern unsigned long _stext;
 
 void __naked __flash_header_start go(void)
 {
-	__asm__ __volatile__("b _start\n");
+	__asm__ __volatile__("b exception_vectors\n");
 }
 
 struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = {
diff --git a/board/pcm043/lowlevel.c b/board/pcm043/lowlevel.c
index d4059db008..9eff5a6713 100644
--- a/board/pcm043/lowlevel.c
+++ b/board/pcm043/lowlevel.c
@@ -194,7 +194,7 @@ void __bare_init __naked board_init_lowlevel(void)
 #ifdef CONFIG_NAND_IMX_BOOT
 	/* skip NAND boot if not running from NFC space */
 	r = get_pc();
-	if (r < IMX_NFC_BASE && r > IMX_NFC_BASE + 0x800)
+	if (r < IMX_NFC_BASE || r > IMX_NFC_BASE + 0x800)
 		board_init_lowlevel_return();
 
 	src = (unsigned int *)IMX_NFC_BASE;