minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 20:52:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

ubifs: Allow ubifsmount volume reference by number

Browse Source 
UBI can mount volumes by name or number  The current code forces you
to name the volume by prepending every name with "ubi:".

>From fs/ubifs/super.c
 * There are several ways to specify UBI volumes when mounting UBIFS:
 * o ubiX_Y    - UBI device number X, volume Y;
 * o ubiY      - UBI device number 0, volume Y;
 * o ubiX:NAME - mount UBI device X, volume with name NAME;
 * o ubi:NAME  - mount UBI device 0, volume with name NAME.

Now any name passed in any of the above forms are allowed.

Also update the configs that referenced ubifsmount.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Joe Hershberger 2012-11-01 16:54:18 +00:00 committed by Tom Rini
parent e40753b207
commit 949a771097
10 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ubifs/super.c
View File

@ -1164,10 +1164,9 @@ static struct file_system_type ubifs_fs_type = {
.get_sb = ubifs_get_sb, .get_sb = ubifs_get_sb,
}; };
int ubifs_mount(char *vol_name) int ubifs_mount(char *name)
{ {
int flags; int flags;
char name[80] = "ubi:";
void *data; void *data;
struct vfsmount *mnt; struct vfsmount *mnt;
int ret; int ret;
@ -1186,7 +1185,6 @@ int ubifs_mount(char *vol_name)
* Mount in read-only mode * Mount in read-only mode
*/ */
flags = MS_RDONLY; flags = MS_RDONLY;
strcat(name, vol_name);
data = NULL; data = NULL;
mnt = NULL; mnt = NULL;
ret = ubifs_get_sb(&ubifs_fs_type, flags, name, data, mnt); ret = ubifs_get_sb(&ubifs_fs_type, flags, name, data, mnt);

2
include/configs/apx4devkit.h
View File

@ -222,7 +222,7 @@
"root=ubi0:rootfs rootfstype=ubifs ${mtdparts} rw\0" \ "root=ubi0:rootfs rootfstype=ubifs ${mtdparts} rw\0" \
"bootcmd_nand=" \ "bootcmd_nand=" \
"run bootargs_nand && ubi part root 2048 && " \ "run bootargs_nand && ubi part root 2048 && " \
"ubifsmount rootfs && ubifsload 41000000 boot/uImage && " \ "ubifsmount ubi:rootfs && ubifsload 41000000 boot/uImage && " \
"bootm 41000000\0" \ "bootm 41000000\0" \
"bootargs_mmc=" \ "bootargs_mmc=" \
"setenv bootargs ${kernelargs} " \ "setenv bootargs ${kernelargs} " \

2
include/configs/cam_enc_4xx.h
View File

@ -451,7 +451,7 @@
"bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \
"kernel_addr_r=80600000\0" \ "kernel_addr_r=80600000\0" \
"load_kernel=tftp ${kernel_addr_r} ${bootfile}\0" \ "load_kernel=tftp ${kernel_addr_r} ${bootfile}\0" \
"ubi_load_kernel=ubi part ubi 2048;ubifsmount ${img_volume};" \ "ubi_load_kernel=ubi part ubi 2048;ubifsmount ubi:${img_volume};" \
"ubifsload ${kernel_addr_r} boot/uImage\0" \ "ubifsload ${kernel_addr_r} boot/uImage\0" \
"fit_addr_r=" __stringify(CONFIG_BOARD_IMG_ADDR_R) "\0" \ "fit_addr_r=" __stringify(CONFIG_BOARD_IMG_ADDR_R) "\0" \
"img_addr_r=" __stringify(CONFIG_BOARD_IMG_ADDR_R) "\0" \ "img_addr_r=" __stringify(CONFIG_BOARD_IMG_ADDR_R) "\0" \

2
include/configs/dockstar.h
View File

@ -85,7 +85,7 @@
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
"ubi part root; " \ "ubi part root; " \
"ubifsmount root; " \ "ubifsmount ubi:root; " \
"ubifsload 0x800000 ${kernel}; " \ "ubifsload 0x800000 ${kernel}; " \
"ubifsload 0x1100000 ${initrd}; " \ "ubifsload 0x1100000 ${initrd}; " \
"bootm 0x800000 0x1100000" "bootm 0x800000 0x1100000"

6
include/configs/ea20.h
View File

@ -293,12 +293,12 @@
"bootm ${kernel_addr_r}\0" \ "bootm ${kernel_addr_r}\0" \
"net_self_load=tftp ${kernel_addr_r} ${bootfile};" \ "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \
"tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \ "tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \
"nand_nand=ubi part nand0,${as};ubifsmount rootfs;" \ "nand_nand=ubi part nand0,${as};ubifsmount ubi:rootfs;" \
"ubifsload ${kernel_addr_r} /boot/uImage;" \ "ubifsload ${kernel_addr_r} /boot/uImage;" \
"ubifsumount; run nandargs addip addtty " \ "ubifsumount; run nandargs addip addtty " \
"addmtd addmisc addmem;clrlogo;" \ "addmtd addmisc addmem;clrlogo;" \
"bootm ${kernel_addr_r}\0" \ "bootm ${kernel_addr_r}\0" \
"nand_nandrw=ubi part nand0,${as};ubifsmount rootfs;" \ "nand_nandrw=ubi part nand0,${as};ubifsmount ubi:rootfs;" \
"ubifsload ${kernel_addr_r} /boot/uImage;" \ "ubifsload ${kernel_addr_r} /boot/uImage;" \
"ubifsumount; run nandrwargs addip addtty " \ "ubifsumount; run nandrwargs addip addtty " \
"addmtd addmisc addmem;clrlogo;" \ "addmtd addmisc addmem;clrlogo;" \
@ -309,7 +309,7 @@
"u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \ "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0" \
"load_magic=if sf probe 0;then sf " \ "load_magic=if sf probe 0;then sf " \
"read c0000000 0x10000 0x60000;fi\0" \ "read c0000000 0x10000 0x60000;fi\0" \
"load_nand=ubi part nand0,${as};ubifsmount rootfs;" \ "load_nand=ubi part nand0,${as};ubifsmount ubi:rootfs;" \
"if ubifsload c0000014 /boot/u-boot.bin;" \ "if ubifsload c0000014 /boot/u-boot.bin;" \
"then mw c0000008 ${filesize};else echo Error reading" \ "then mw c0000008 ${filesize};else echo Error reading" \
" u-boot from nand!;fi\0" \ " u-boot from nand!;fi\0" \

2
include/configs/ib62x0.h
View File

@ -88,7 +88,7 @@
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
"ubi part root; " \ "ubi part root; " \
"ubifsmount root; " \ "ubifsmount ubi:root; " \
"ubifsload 0x800000 ${kernel}; " \ "ubifsload 0x800000 ${kernel}; " \
"ubifsload 0x1100000 ${initrd}; " \ "ubifsload 0x1100000 ${initrd}; " \
"bootm 0x800000 0x1100000" "bootm 0x800000 0x1100000"

2
include/configs/iconnect.h
View File

@ -87,7 +87,7 @@
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
"ubi part rootfs; " \ "ubi part rootfs; " \
"ubifsmount rootfs; " \ "ubifsmount ubi:rootfs; " \
"ubifsload 0x800000 ${kernel}; " \ "ubifsload 0x800000 ${kernel}; " \
"bootm 0x800000" "bootm 0x800000"

3
include/configs/omap3_pandora.h
View File

@ -180,7 +180,8 @@
"ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \ "ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \
"source ${loadaddr}; " \ "source ${loadaddr}; " \
"fi; " \ "fi; " \
"ubi part boot && ubifsmount boot && ubifsload ${loadaddr} uImage && bootm ${loadaddr}" "ubi part boot && ubifsmount ubi:boot && " \
"ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
#define CONFIG_AUTO_COMPLETE 1 #define CONFIG_AUTO_COMPLETE 1
/* /*

2
include/configs/tricorder.h
View File

@ -193,7 +193,7 @@
"bootm ${loadaddr}\0" \ "bootm ${loadaddr}\0" \
"loaduimage_ubi=mtd default; " \ "loaduimage_ubi=mtd default; " \
"ubi part fs; " \ "ubi part fs; " \
"ubifsmount root; " \ "ubifsmount ubi:root; " \
"ubifsload ${loadaddr} /boot/uImage\0" \ "ubifsload ${loadaddr} /boot/uImage\0" \
"nandboot=echo Booting from nand ...; " \ "nandboot=echo Booting from nand ...; " \
"run nandargs; " \ "run nandargs; " \

2
include/configs/x600.h
View File

@ -262,7 +262,7 @@
"nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip" \ "nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip" \
" addcon addmisc addmtd;" \ " addcon addmisc addmtd;" \
"bootm ${kernel_addr} - ${dtb_addr}\0" \ "bootm ${kernel_addr} - ${dtb_addr}\0" \
"ubifs_mount=ubi part ubi${boot_part};ubifsmount rootfs\0" \ "ubifs_mount=ubi part ubi${boot_part};ubifsmount ubi:rootfs\0" \
"ubifs_load=ubifsload ${kernel_addr} ${kernel_fs};" \ "ubifs_load=ubifsload ${kernel_addr} ${kernel_fs};" \
"ubifsload ${dtb_addr} ${dtb_fs};\0" \ "ubifsload ${dtb_addr} ${dtb_fs};\0" \
"nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip addcon " \ "nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip addcon " \