mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot
@ 2015-06-26  8:14 Teresa Remmet
  2015-06-26  8:14 ` [PATCH 2/3] ARM: dts: am33xx-strip: Keep devices we can boot from Teresa Remmet
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Teresa Remmet @ 2015-06-26  8:14 UTC (permalink / raw)
  To: barebox

Select correct instance when booting from a mmc interface.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/boards/phytec-som-am335x/board.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boards/phytec-som-am335x/board.c b/arch/arm/boards/phytec-som-am335x/board.c
index 74e39d7..7a87841 100644
--- a/arch/arm/boards/phytec-som-am335x/board.c
+++ b/arch/arm/boards/phytec-som-am335x/board.c
@@ -68,7 +68,10 @@ static int physom_devices_init(void)
 		of_device_enable_path("/chosen/environment-spi");
 		break;
 	case BOOTSOURCE_MMC:
-		omap_set_bootmmc_devname("mmc0");
+		if (bootsource_get_instance() == 0)
+			omap_set_bootmmc_devname("mmc0");
+		else
+			omap_set_bootmmc_devname("mmc1");
 		break;
 	default:
 		of_device_enable_path("/chosen/environment-nand");
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/3] ARM: dts: am33xx-strip: Keep devices we can boot from
  2015-06-26  8:14 [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Teresa Remmet
@ 2015-06-26  8:14 ` Teresa Remmet
  2015-06-26  8:14 ` [PATCH 3/3] ARM: dts: am33xx-strip: Strip more unused nodes Teresa Remmet
  2015-06-29  4:52 ` [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Teresa Remmet @ 2015-06-26  8:14 UTC (permalink / raw)
  To: barebox

As we can boot from mmc2 don't strip it.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/dts/am33xx-strip.dtsi | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi
index 3dc9a57..085200e 100644
--- a/arch/arm/dts/am33xx-strip.dtsi
+++ b/arch/arm/dts/am33xx-strip.dtsi
@@ -11,8 +11,6 @@
 	aliases {
 		/delete-property/ i2c1;
 		/delete-property/ i2c2;
-		/delete-property/ mmc0;
-		/delete-property/ mmc1;
 		/delete-property/ mmc2;
 		/delete-property/ d_can0;
 		/delete-property/ d_can1;
@@ -21,7 +19,6 @@
 
 /delete-node/ &i2c1;
 /delete-node/ &i2c2;
-/delete-node/ &mmc2;
 /delete-node/ &mmc3;
 /delete-node/ &hwspinlock;
 /delete-node/ &wdt2;
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 3/3] ARM: dts: am33xx-strip: Strip more unused nodes
  2015-06-26  8:14 [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Teresa Remmet
  2015-06-26  8:14 ` [PATCH 2/3] ARM: dts: am33xx-strip: Keep devices we can boot from Teresa Remmet
@ 2015-06-26  8:14 ` Teresa Remmet
  2015-06-29  4:52 ` [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Teresa Remmet @ 2015-06-26  8:14 UTC (permalink / raw)
  To: barebox

There are still some nodes not used in barebox. Removed them.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/dts/am33xx-strip.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-strip.dtsi
index 085200e..04cf315 100644
--- a/arch/arm/dts/am33xx-strip.dtsi
+++ b/arch/arm/dts/am33xx-strip.dtsi
@@ -43,3 +43,5 @@
 /delete-node/ &mcasp0;
 /delete-node/ &mcasp1;
 /delete-node/ &rng;
+/delete-node/ &rtc;
+/delete-node/ &wkup_m3;
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot
  2015-06-26  8:14 [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Teresa Remmet
  2015-06-26  8:14 ` [PATCH 2/3] ARM: dts: am33xx-strip: Keep devices we can boot from Teresa Remmet
  2015-06-26  8:14 ` [PATCH 3/3] ARM: dts: am33xx-strip: Strip more unused nodes Teresa Remmet
@ 2015-06-29  4:52 ` Sascha Hauer
  2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2015-06-29  4:52 UTC (permalink / raw)
  To: Teresa Remmet; +Cc: barebox

On Fri, Jun 26, 2015 at 10:14:35AM +0200, Teresa Remmet wrote:
> Select correct instance when booting from a mmc interface.
> 
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-06-29  4:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-26  8:14 [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Teresa Remmet
2015-06-26  8:14 ` [PATCH 2/3] ARM: dts: am33xx-strip: Keep devices we can boot from Teresa Remmet
2015-06-26  8:14 ` [PATCH 3/3] ARM: dts: am33xx-strip: Strip more unused nodes Teresa Remmet
2015-06-29  4:52 ` [PATCH 1/3] boards: phytec-som-am335x: Get ready for EMMC boot Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox