diff options
author | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
commit | e573bdb324c78fac56655a493bea843842c9d9f8 (patch) | |
tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /include/config_distro_bootcmd.h | |
parent | a69fdc7787bfa2f27eed74c2ee58c28ce932d502 (diff) | |
parent | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (diff) | |
download | u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.zip u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.tar.gz u-boot-imx-e573bdb324c78fac56655a493bea843842c9d9f8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'include/config_distro_bootcmd.h')
-rw-r--r-- | include/config_distro_bootcmd.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d2f49a1..66264ce 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -72,6 +72,24 @@ BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC #endif +#ifdef CONFIG_CMD_UBIFS +#define BOOTENV_SHARED_UBIFS \ + "ubifs_boot=" \ + "if ubi part UBI && ubifsmount ubi${devnum}:boot; then " \ + "setenv devtype ubi; " \ + "setenv bootpart 0; " \ + "run scan_dev_for_boot; " \ + "fi\0" +#define BOOTENV_DEV_UBIFS BOOTENV_DEV_BLKDEV +#define BOOTENV_DEV_NAME_UBIFS BOOTENV_DEV_NAME_BLKDEV +#else +#define BOOTENV_SHARED_UBIFS +#define BOOTENV_DEV_UBIFS \ + BOOT_TARGET_DEVICES_references_UBIFS_without_CONFIG_CMD_UBIFS +#define BOOTENV_DEV_NAME_UBIFS \ + BOOT_TARGET_DEVICES_references_UBIFS_without_CONFIG_CMD_UBIFS +#endif + #ifdef CONFIG_CMD_SATA #define BOOTENV_SHARED_SATA BOOTENV_SHARED_BLKDEV(sata) #define BOOTENV_DEV_SATA BOOTENV_DEV_BLKDEV @@ -185,6 +203,7 @@ BOOTENV_SHARED_SATA \ BOOTENV_SHARED_SCSI \ BOOTENV_SHARED_IDE \ + BOOTENV_SHARED_UBIFS \ "boot_prefixes=/ /boot/\0" \ "boot_scripts=boot.scr.uimg boot.scr\0" \ "boot_script_dhcp=boot.scr.uimg\0" \ |