Merge branch 'pu'

6 files changed, 23 insertions, 25 deletions

diff --git a/board/freescale-mx25-3-stack/3stack.c b/board/freescale-mx25-3-stack/3stack.c
index 3a528fa365..5590e55901 100644
--- a/board/freescale-mx25-3-stack/3stack.c
+++ b/board/freescale-mx25-3-stack/3stack.c
@@ -34,7 +34,7 @@
 #include <mach/imx-nand.h>
 #include <fec.h>
 #include <nand.h>
-#include <mach/imx25-flash-header.h>
+#include <mach/imx-flash-header.h>
 #include <mach/iomux-mx25.h>
 
 extern unsigned long _stext;
@@ -44,43 +44,41 @@ void __naked __flash_header_start go(void)
 	__asm__ __volatile__("b _start\n");
 }
 
-struct mx25_dcd_entry __dcd_entry dcd_entry[] = {
+struct imx_dcd_entry __dcd_entry_0x400 dcd_entry[] = {
 	{ .ptr_type = 4, .addr = 0xb8002050, .val = 0x0000d843, },
 	{ .ptr_type = 4, .addr = 0xb8002054, .val = 0x22252521, },
 	{ .ptr_type = 4, .addr = 0xb8002058, .val = 0x22220a00, },
 	{ .ptr_type = 4, .addr = 0xb8001010, .val = 0x00000004, },
 	{ .ptr_type = 4, .addr = 0xb8001000, .val = 0x92100000, },
-	{ .ptr_type = 1, .addr = 0x80000400, .val = 0x12344321, },
+	{ .ptr_type = 1, .addr = 0x80000400, .val = 0x21, },
 	{ .ptr_type = 4, .addr = 0xb8001000, .val = 0xa2100000, },
 	{ .ptr_type = 4, .addr = 0x80000000, .val = 0x12344321, },
 	{ .ptr_type = 4, .addr = 0x80000000, .val = 0x12344321, },
 	{ .ptr_type = 4, .addr = 0xb8001000, .val = 0xb2100000, },
-	{ .ptr_type = 1, .addr = 0x80000033, .val = 0x000000da, },
-	{ .ptr_type = 1, .addr = 0x81000000, .val = 0x000000ff, },
+	{ .ptr_type = 1, .addr = 0x80000033, .val = 0xda, },
+	{ .ptr_type = 1, .addr = 0x81000000, .val = 0xff, },
 	{ .ptr_type = 4, .addr = 0xb8001000, .val = 0x82216880, },
 	{ .ptr_type = 4, .addr = 0xb8001004, .val = 0x00295729, },
 	{ .ptr_type = 4, .addr = 0x53f80008, .val = 0x20034000, },
 };
 
-struct mx25_nand_flash_header __flash_header mx25_3ds_header = {
-	.flash_header = {
-		.app_code_jump_vector	= &_stext,
-		.app_code_barker	= APP_CODE_BARKER,
-		.app_code_csf		= NULL,
-		.dcd_ptr_ptr		= &mx25_3ds_header.flash_header.dcd,
-		.super_root_key		= NULL,
-		.dcd			= &mx25_3ds_header.dcd_header,
-		.app_dest		= (void *)TEXT_BASE,
-	},
-	.dcd_header = {
-		.barker			= DCD_BARKER,
-		.block_len		= sizeof (dcd_entry),
-	},
+#define APP_DEST	0x80000000
+
+struct imx_flash_header __flash_header_0x400 mx25_3ds_header = {
+	.app_code_jump_vector	= APP_DEST + 0x1000,
+	.app_code_barker	= APP_CODE_BARKER,
+	.app_code_csf		= 0,
+	.dcd_ptr_ptr		= APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd),
+	.super_root_key		= 0,
+	.dcd			= APP_DEST + 0x400 + offsetof(struct imx_flash_header, dcd_barker),
+	.app_dest		= APP_DEST,
+	.dcd_barker		= DCD_BARKER,
+	.dcd_block_len		= sizeof (dcd_entry),
 };
 
 extern unsigned long __bss_start;
 
-unsigned long __image_len barebox_len = 0x40000;
+unsigned long __image_len_0x400 barebox_len = 0x40000;
 
 static struct fec_platform_data fec_info = {
 	.xcv_type	= RMII,
diff --git a/board/ipe337/ipe337.c b/board/ipe337/ipe337.c
index c9416fec15..269e7743fc 100644
--- a/board/ipe337/ipe337.c
+++ b/board/ipe337/ipe337.c
@@ -3,6 +3,7 @@
 #include <driver.h>
 #include <asm/cpu/cdefBF561.h>
 #include <partition.h>
+#include <fs.h>
 
 static struct device_d cfi_dev = {
 	.name     = "cfi_flash",
diff --git a/board/netx/netx.c b/board/netx/netx.c
index 5276d59753..f187820ecd 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -71,7 +71,7 @@ static int netx_devices_init(void) {
 	register_device(&cfi_dev);
 	register_device(&sdram_dev);
 	register_device(&netx_eth_dev0);
-//	register_device(&netx_eth_dev1);
+	register_device(&netx_eth_dev1);
 
 	devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0");
 
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index 8a15da47f7..aee40c6c2b 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <init.h>
 #include <driver.h>
+#include <fs.h>
 #include <environment.h>
 #include <usb/isp1504.h>
 #include <mach/imx-regs.h>
diff --git a/board/pcm043/pcm043.c b/board/pcm043/pcm043.c
index d93ef80c95..0e7f6d3bf3 100644
--- a/board/pcm043/pcm043.c
+++ b/board/pcm043/pcm043.c
@@ -113,7 +113,7 @@ static const struct fb_videomode pcm043_fb_mode = {
 	.flag		= 0,
 };
 #else
-static struct fb_videomode pcm043_fb_mode = {
+static const struct fb_videomode pcm043_fb_mode = {
 	/* 240x320 @ 60 Hz */
 	.name		= "TX090",
 	.refresh	= 60,
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 6b86352e6a..356c4b8bcd 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -67,9 +67,7 @@ static struct device_d dm9000_dev = {
 
 static int scb9328_devices_init(void) {
 
-	/* adjust chipselects */
-	GPR(0) = 0x00800000;
-	GIUS(0) = 0x0043fffe;
+	imx_gpio_mode(PA23_PF_CS5);
 
 /* CS3 becomes CS3 by clearing reset default bit 1 in FMCR */
 	FMCR = 0x1;