diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2014-02-27 14:53:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-27 20:38:48 +0100 |
| commit | 8383a659d3036b4fd98cd5f03335a6be6af732f6 (patch) | |
| tree | 3efd2f32a76dde7dcd7ca946b002865a8ad35686 | |
| parent | bf34b1177320c8b9734c88c7216fd6a59c55f298 (diff) | |
| download | barebox-8383a659d3036b4fd98cd5f03335a6be6af732f6.tar.gz barebox-8383a659d3036b4fd98cd5f03335a6be6af732f6.tar.xz | |
ARM: i.MX: edmqmx6: choose correct env when booting from SD
When booting from SD Card we don't want to load an env
from EMMC.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/datamodul-edm-qmx6/board.c | 9 | ||||
| -rw-r--r-- | arch/arm/dts/imx6q-dmo-edmqmx6.dts | 25 |
2 files changed, 32 insertions, 2 deletions
diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c index b0b4ae98d4..fd02d7a3de 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/board.c +++ b/arch/arm/boards/datamodul-edm-qmx6/board.c @@ -121,7 +121,14 @@ static int realq7_device_init(void) switch (bootsource_get()) { case BOOTSOURCE_MMC: - of_device_enable_path("/chosen/environment-emmc"); + switch (bootsource_get_instance()) { + case 2: + of_device_enable_path("/chosen/environment-sd"); + break; + case 3: + of_device_enable_path("/chosen/environment-emmc"); + break; + } break; default: case BOOTSOURCE_SPI: diff --git a/arch/arm/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts index 9fe1284106..4cd1c55ff8 100644 --- a/arch/arm/dts/imx6q-dmo-edmqmx6.dts +++ b/arch/arm/dts/imx6q-dmo-edmqmx6.dts @@ -20,6 +20,12 @@ chosen { linux,stdout-path = "/soc/aips-bus@02100000/serial@021e8000"; + environment-sd { + compatible = "barebox,environment"; + device-path = &usdhc3, "partname:barebox-environment"; + status = "disabled"; + }; + environment-emmc { compatible = "barebox,environment"; device-path = &usdhc4, "partname:barebox-environment"; @@ -386,6 +392,18 @@ pinctrl-0 = <&pinctrl_usdhc3>; vmmc-supply = <®_3p3v>; status = "okay"; + + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "barebox"; + reg = <0x0 0x80000>; + }; + partition@1 { + label = "barebox-environment"; + reg = <0x80000 0x80000>; + }; }; &usdhc4 { @@ -395,11 +413,16 @@ non-removable; bus-width = <8>; status = "okay"; + #address-cells = <1>; #size-cells = <1>; partition@0 { - label = "barebox-environment"; + label = "barebox"; reg = <0x0 0x80000>; }; + partition@1 { + label = "barebox-environment"; + reg = <0x80000 0x80000>; + }; }; |