ARM: cfa10036: Store the barebox environment on the MMC
v2 cover ARM: cfa10036: Store the barebox environment on the MMC
Hi,
The cfa-10036 comes only with a SD slot, so there was previously no way to store in a persistent way the environment we could have modified other than by modifying the code source itself.
These two patches register a new partition on the SD card to store that environment, and update the default environment to reflect these changes.
Thanks,
Maxime
Changes from v1:
- Make use of the new common envfs_register_partition function
Maxime Ripard (2):
cfa-10036: Use the second MMC partition to store the environment
cfa10036: Update the environment
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 8 +++++++- arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 | 6 +++--- arch/arm/boards/crystalfontz-cfa10036/env/init/automount | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-)
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 1/2 cfa-10036: Use the second MMC partition to store the environment
Since the only storage medium on the cfa-10036 is the MMC card, we need to have a registered environment partition on it if we want to be able to modify at runtime.
--- arch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +7 -1
@@ -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);
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 2/2 cfa10036: Update the environment
In reply to Maxime RipardSince we added a new partition in the board, the partitions number of the boot and rootfs partition have changed as well.
--- arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 | 6 +++--- arch/arm/boards/crystalfontz-cfa10036/env/init/automount | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 +3 -3
@@ -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.linux.bootargs.dyn.root="root=/dev/mmcblk0p3 rootfstype=ext3 rootwait" +global.bootm.image="/mnt/disk0.2/zImage-${global.hostname}" +global.bootm.oftree="/mnt/disk0.2/oftree-${global.board.variant}" +global.linux.bootargs.dyn.root="root=/dev/mmcblk0p4 rootfstype=ext3 rootwait"
arch/arm/boards/crystalfontz-cfa10036/env/init/automount +2 -2
@@ -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'
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedQuoted 11 lines · Maxime Ripard
Hi,
The cfa-10036 comes only with a SD slot, so there was previously no way to store in a persistent way the environment we could have modified other than by modifying the code source itself.
These two patches register a new partition on the SD card to store that environment, and update the default environment to reflect these changes.
Thanks,
Maxime
Applied, thanks
Sascha
Quoted 22 lines
Changes from v1:
- Make use of the new commonenvfs_register_partitionfunctionMaxime Ripard (2):
cfa-10036: Use the second MMC partition to store the environment
cfa10036: Update the environmentarch/arm/boards/crystalfontz-cfa10036/cfa10036.c | 8 +++++++- arch/arm/boards/crystalfontz-cfa10036/env/boot/mmc-ext3 | 6 +++--- arch/arm/boards/crystalfontz-cfa10036/env/init/automount | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-)Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox