summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-07-16 14:45:45 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-07-18 13:54:47 +0200
commite6cc6f080561f3a9921f635f0d65dbba6c5d4fb2 (patch)
tree5dbea3c80c48a653f681b46db78d2ad7007b72e4
parenta72e3b1f3861393e5f6a4ed867be3b66188a4fc5 (diff)
downloadbarebox-e6cc6f080561f3a9921f635f0d65dbba6c5d4fb2.tar.gz
barebox-e6cc6f080561f3a9921f635f0d65dbba6c5d4fb2.tar.xz
ARM: i.MX51 babbage: configure environment from devicetree
While at it use offset 512k to allow bigger barebox binaries. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/freescale-mx51-pdk/board.c5
-rw-r--r--arch/arm/dts/imx51-babbage.dts12
2 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c
index 2e7be8508c..cafcf37590 100644
--- a/arch/arm/boards/freescale-mx51-pdk/board.c
+++ b/arch/arm/boards/freescale-mx51-pdk/board.c
@@ -178,11 +178,6 @@ static int imx51_babbage_late_init(void)
BBU_HANDLER_FLAG_DEFAULT, (void *)flash_header_imx51_babbage_start,
flash_header_imx51_babbage_end - flash_header_imx51_babbage_start, 0);
- device_detect_by_name("mmc0");
-
- devfs_add_partition("mmc0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0");
- devfs_add_partition("mmc0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
-
return 0;
}
late_initcall(imx51_babbage_late_init);
diff --git a/arch/arm/dts/imx51-babbage.dts b/arch/arm/dts/imx51-babbage.dts
index 4950eef606..4edbccb1b4 100644
--- a/arch/arm/dts/imx51-babbage.dts
+++ b/arch/arm/dts/imx51-babbage.dts
@@ -19,6 +19,11 @@
chosen {
linux,stdout-path = "/soc/aips@70000000/serial@73fbc000";
+
+ environment@0 {
+ compatible = "barebox,environment";
+ device-path = &esdhc1, "partname:barebox-environment";
+ };
};
memory {
@@ -73,6 +78,13 @@
fsl,cd-controller;
fsl,wp-controller;
status = "okay";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition@0 {
+ label = "barebox-environment";
+ reg = <0x80000 0x20000>;
+ };
};
&esdhc2 {