From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VW2Cz-0003v2-Ht for barebox@lists.infradead.org; Tue, 15 Oct 2013 10:50:37 +0000 From: Sascha Hauer Date: Tue, 15 Oct 2013 12:50:14 +0200 Message-Id: <1381834214-12603-1-git-send-email-s.hauer@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] ARM: rpi: add SD card environment support To: barebox@lists.infradead.org Similar to the OMAP boards mount the SD card to /boot and expect the environment as /boot/barebox.env Signed-off-by: Sascha Hauer --- arch/arm/boards/raspberry-pi/rpi.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/arch/arm/boards/raspberry-pi/rpi.c b/arch/arm/boards/raspberry-pi/rpi.c index d4912cc..971a603 100644 --- a/arch/arm/boards/raspberry-pi/rpi.c +++ b/arch/arm/boards/raspberry-pi/rpi.c @@ -15,6 +15,9 @@ #include #include +#include +#include +#include #include #include @@ -37,11 +40,37 @@ static int rpi_console_init(void) } console_initcall(rpi_console_init); +static int rpi_env_init(void) +{ + struct stat s; + const char *diskdev = "/dev/disk0.0"; + int ret; + + device_detect_by_name("mci0"); + + ret = stat(diskdev, &s); + if (ret) { + printf("no %s. using default env\n", diskdev); + return 0; + } + + mkdir("/boot", 0666); + ret = mount(diskdev, "fat", "/boot"); + if (ret) { + printf("failed to mount %s\n", diskdev); + return 0; + } + + default_environment_path = "/boot/barebox.env"; + + return 0; +} + static int rpi_devices_init(void) { armlinux_set_architecture(MACH_TYPE_BCM2708); armlinux_set_bootparams((void *)(0x00000100)); + rpi_env_init(); return 0; } - -device_initcall(rpi_devices_init); +late_initcall(rpi_devices_init); -- 1.8.4.rc3 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox