diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:54 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:54 +0100 |
| commit | ea0f831cd0c749194a0103ec4814fe91c3955084 (patch) | |
| tree | 9a69ef4476e29cf61e53058c1452cc3afd27be6c /arch/arm/boards/crystalfontz-cfa10036 | |
| parent | 62ee96bd3b5e02173c0d9956c4f1e1a4de8f940d (diff) | |
| parent | 439eefcfe40d7ca821985d969312c4e90f7a1a7b (diff) | |
| download | barebox-ea0f831cd0c749194a0103ec4814fe91c3955084.tar.gz barebox-ea0f831cd0c749194a0103ec4814fe91c3955084.tar.xz | |
Merge branch 'for-next/mxs'
Diffstat (limited to 'arch/arm/boards/crystalfontz-cfa10036')
| -rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 8 | ||||
| -rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 | 4 | ||||
| -rw-r--r-- | arch/arm/boards/crystalfontz-cfa10036/env/init/automount | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index b59dbab4a6..1bc20cf21c 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -17,6 +17,7 @@ #include <common.h> #include <environment.h> +#include <envfs.h> #include <errno.h> #include <fec.h> #include <gpio.h> @@ -99,7 +100,7 @@ mem_initcall(cfa10036_mem_init); static int cfa10036_devices_init(void) { - int i; + int i, ret; /* initizalize muxing */ for (i = 0; i < ARRAY_SIZE(cfa10036_pads); i++) @@ -124,6 +125,11 @@ static int cfa10036_devices_init(void) cfa10036_detect_hw(); + ret = envfs_register_partition("disk0", 1); + if (ret != 0) + printf("Cannot create the 'env0' persistent " + "environment storage (%d)\n", ret); + return 0; } device_initcall(cfa10036_devices_init); diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 b/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 index 5e508f95f6..4d830edc69 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 +++ b/arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 @@ -5,6 +5,6 @@ if [ "$1" = menu ]; then exit fi -global.bootm.image="/mnt/disk0.1/zImage-${global.hostname}" -global.bootm.oftree="/mnt/disk0.1/oftree-${global.board.variant}" +global.bootm.image="/mnt/disk0.2/boot/zImage-${global.hostname}" +global.bootm.oftree="/mnt/disk0.2/boot/oftree-${global.board.variant}" global.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rootfstype=ext3 rootwait" diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/init/automount b/arch/arm/boards/crystalfontz-cfa10036/env/init/automount index 668775d89b..8fdca7cd47 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/env/init/automount +++ b/arch/arm/boards/crystalfontz-cfa10036/env/init/automount @@ -5,5 +5,5 @@ if [ "$1" = menu ]; then exit fi -mkdir -p /mnt/disk0.1 -automount -d /mnt/disk0.1 '[ -e /dev/disk0.1 ] && mount /dev/disk0.1 /mnt/disk0.1' +mkdir -p /mnt/disk0.2 +automount -d /mnt/disk0.2 '[ -e /dev/disk0.2 ] && mount /dev/disk0.2 /mnt/disk0.2' |