File 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch of Package u-boot-omap3beagle

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch of Package u-boot-omap3beagle

From a94ba70d3ca32820575bc772c7f9aa5a73e6424a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 1 Mar 2016 10:05:10 +0100
Subject: [PATCH] XXX openSUSE XXX: omap3: Move to distro bootcmd

This is a half-assed conversion of the beagle3 default bootcmd
to the distro framework. Only MMC boot works for now, but it gets
our openSUSE images working.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 include/configs/omap3_beagle.h | 45 ++++++++++++------------------------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index c17dcf5..f5c65c8 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -112,9 +112,12 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
+	"kernel_addr_r=0x80200000\0" \
 	"rdaddr=0x81000000\0" \
+	"initrd_addr_r=0x81000000\0" \
 	"fdt_high=0xffffffff\0" \
-	"fdtaddr=0x80f80000\0" \
+	"fdtaddr=0x90f80000\0" \
+	"fdt_addr_r=0x90f80000\0" \
 	"usbtty=cdc_acm\0" \
 	"bootfile=uImage\0" \
 	"ramdisk=ramdisk.gz\0" \
@@ -209,39 +212,17 @@
 	"userbutton=if gpio input 173; then run userbutton_xm; " \
 		"else run userbutton_nonxm; fi;\0" \
 	"userbutton_xm=gpio input 4;\0" \
-	"userbutton_nonxm=gpio input 7;\0"
-/* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */
+	"userbutton_nonxm=gpio input 7;\0" \
+	BOOTENV
+
+#define BOOT_TARGET_DEVICES(func) \
+        func(MMC, mmc, 0)
+
 #define CONFIG_BOOTCOMMAND \
 	"run findfdt; " \
-	"mmc dev ${mmcdev}; if mmc rescan; then " \
-		"if run userbutton; then " \
-			"setenv bootenv uEnv.txt;" \
-		"else " \
-			"setenv bootenv user.txt;" \
-		"fi;" \
-		"echo SD/MMC found on device ${mmcdev};" \
-		"if run loadbootenv; then " \
-			"echo Loaded environment from ${bootenv};" \
-			"run importbootenv;" \
-		"fi;" \
-		"if test -n $uenvcmd; then " \
-			"echo Running uenvcmd ...;" \
-			"run uenvcmd;" \
-		"fi;" \
-		"if run loadbootscript; then " \
-			"run bootscript; " \
-		"else " \
-			"if run loadimage; then " \
-				"run mmcboot;" \
-			"fi;" \
-		"fi; " \
-	"fi;" \
-	"run nandboot;" \
-	"setenv bootfile zImage;" \
-	"if run loadimage; then " \
-		"run loadfdt;" \
-		"run mmcbootz; " \
-	"fi; " \
+	"run distro_bootcmd"
+
+#include <config_distro_bootcmd.h>
 
 /*
  * OMAP3 has 12 GP timers, they can be driven by the system clock

Places

File 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch of Package u-boot-omap3beagle

Places