From: Stephen Warren <swarren@wwwdotorg.org>
Date: Thu, 6 Feb 2014 03:49:22 +0000 (-0700)
Subject: ARM: rpi_b: load /uEnv.txt from MMC at startup
X-Git-Tag: v2014.04-rc2~72^2~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c92d4823d2d5de03ea63cb3fbfc898c39cf199c;p=u-boot

ARM: rpi_b: load /uEnv.txt from MMC at startup

The Pi has no flash to store an environment in the usual fashion. However,
the user may wish to customize the environment. We know that the SD card
must be present, since that's where the boot ROM has loaded U-Boot from.
So, load uEnv.txt from there early during boot. This allows the user to
e.g. customize boot_targets, in order to automatically select network
boot.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---

diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h
index 202c9c309f..4b5a0c2150 100644
--- a/include/configs/rpi_b.h
+++ b/include/configs/rpi_b.h
@@ -95,6 +95,11 @@
 #define CONFIG_SYS_LOAD_ADDR		0x1000000
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_PREBOOT \
+	"if load mmc 0:1 ${loadaddr} /uEnv.txt; then " \
+		"env import -t ${loadaddr} ${filesize}; " \
+	"fi"
+
 /*
  * Memory layout for where various images get loaded by boot scripts:
  *