summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/pcm043/pcm043.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 12:03:20 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-04-04 12:03:20 +0200
commitda718ca89d2a062bcb6047071c335eb19d028d78 (patch)
tree7e735083ab07fe73e7d0f2306a7dd388478725dc /arch/arm/boards/pcm043/pcm043.c
parent71e001324bbcc5cd27666cf82e8ce043bf7d342e (diff)
parentbb289922763b9b46ab617fcd1be4ad6a6856d4a4 (diff)
downloadbarebox-da718ca89d2a062bcb6047071c335eb19d028d78.tar.gz
barebox-da718ca89d2a062bcb6047071c335eb19d028d78.tar.xz
Merge branch 'for-next/imx-external-nand-boot'
Diffstat (limited to 'arch/arm/boards/pcm043/pcm043.c')
-rw-r--r--arch/arm/boards/pcm043/pcm043.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boards/pcm043/pcm043.c b/arch/arm/boards/pcm043/pcm043.c
index d4c3f5c9b8..b2726dffc8 100644
--- a/arch/arm/boards/pcm043/pcm043.c
+++ b/arch/arm/boards/pcm043/pcm043.c
@@ -45,6 +45,7 @@
#include <mach/iomux-mx35.h>
#include <mach/devices-imx35.h>
#include <mach/generic.h>
+#include <mach/bbu.h>
static struct fec_platform_data fec_info = {
.xcv_type = PHY_INTERFACE_MODE_MII,
@@ -116,6 +117,7 @@ static int imx35_devices_init(void)
{
uint32_t reg;
char *envstr;
+ unsigned long bbu_nand_flags = 0;
/* CS0: Nor Flash */
imx35_setup_weimcs(5, 0x22C0CF00, 0x75000D01, 0x00000900);
@@ -147,6 +149,7 @@ static int imx35_devices_init(void)
devfs_add_partition("nand0", SZ_512K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw");
dev_add_bb_dev("env_raw", "env0");
envstr = "NAND";
+ bbu_nand_flags = BBU_HANDLER_FLAG_DEFAULT;
break;
case BOOTSOURCE_NOR:
default:
@@ -164,6 +167,9 @@ static int imx35_devices_init(void)
armlinux_set_bootparams((void *)0x80000100);
armlinux_set_architecture(MACH_TYPE_PCM043);
+ imx_bbu_external_nand_register_handler("nand", "/dev/nand0.barebox",
+ bbu_nand_flags);
+
return 0;
}