GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.denx.de/u-boot-ubi

Browse source
This commit is contained in:
Tom Rini 2018-03-25 12:02:13 -04:00
commit 81cf7c8d45
12 changed files with 29 additions and 27 deletions

12
README
View file

@ -2482,12 +2482,6 @@ FIT uImage format:
kernel. Needed for UBI support.
- UBI support
CONFIG_UBI_SILENCE_MSG
Make the verbose messages from UBI stop printing. This leaves
warnings and errors enabled.
CONFIG_MTD_UBI_WL_THRESHOLD
This parameter defines the maximum difference between the highest
erase counter value and the lowest erase counter value of eraseblocks
@ -2549,12 +2543,6 @@ FIT uImage format:
Enable UBI fastmap debug
default: 0
- UBIFS support
CONFIG_UBIFS_SILENCE_MSG
Make the verbose messages from UBIFS stop printing. This leaves
warnings and errors enabled.
- SPL framework
CONFIG_SPL
Enable building of SPL globally.

2
configs/am335x_igep003x_defconfig
View file

@ -37,8 +37,10 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
CONFIG_CMD_UBI=y
CONFIG_UBI_SILENCE_MSG=y
# CONFIG_CMD_UBIFS is not set
CONFIG_ENV_IS_IN_UBI=y
CONFIG_UBIFS_SILENCE_MSG=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_MTD_UBI_FASTMAP=y

2
configs/igep0032_defconfig
View file

@ -27,7 +27,9 @@ CONFIG_CMD_SPI=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_UBI=y
CONFIG_UBI_SILENCE_MSG=y
# CONFIG_CMD_UBIFS is not set
CONFIG_UBIFS_SILENCE_MSG=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y

2
configs/igep00x0_defconfig
View file

@ -27,7 +27,9 @@ CONFIG_CMD_SPI=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_UBI=y
CONFIG_UBI_SILENCE_MSG=y
# CONFIG_CMD_UBIFS is not set
CONFIG_UBIFS_SILENCE_MSG=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y

7
drivers/mtd/ubi/Kconfig
View file

@ -1,5 +1,12 @@
menu "UBI support"
config CONFIG_UBI_SILENCE_MSG
bool "UBI silence verbose messages"
default ENV_IS_IN_UBI
help
Make the verbose messages from UBI stop printing. This leaves
warnings and errors enabled.
config MTD_UBI
bool "Enable UBI - Unsorted block images"
select CRC32

6
env/Kconfig vendored
View file

@ -360,12 +360,6 @@ config ENV_IS_IN_UBI
the environment in. This will enable redundant environments in UBI.
It is assumed that both volumes are in the same MTD partition.
- CONFIG_UBI_SILENCE_MSG
- CONFIG_UBIFS_SILENCE_MSG
You will probably want to define these to avoid a really noisy system
when storing the env in UBI.
config ENV_FAT_INTERFACE
string "Name of the block device for the environment"
depends on ENV_IS_IN_FAT

6
fs/ubifs/Kconfig
View file

@ -0,0 +1,6 @@
config UBIFS_SILENCE_MSG
bool "UBIFS silence verbose messages"
default ENV_IS_IN_UBI
help
Make the verbose messages from UBIFS stop printing. This leaves
warnings and errors enabled.

7
fs/ubifs/super.c
View file

@ -1334,7 +1334,10 @@ static int check_free_space(struct ubifs_info *c)
static int mount_ubifs(struct ubifs_info *c)
{
int err;
long long x, y;
long long x;
#ifndef CONFIG_UBIFS_SILENCE_MSG
long long y;
#endif
size_t sz;
c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
@ -1613,7 +1616,9 @@ static int mount_ubifs(struct ubifs_info *c)
c->vi.ubi_num, c->vi.vol_id, c->vi.name,
c->ro_mount ? ", R/O mode" : "");
x = (long long)c->main_lebs * c->leb_size;
#ifndef CONFIG_UBIFS_SILENCE_MSG
y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
#endif
ubifs_msg(c, "LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",
c->leb_size, c->leb_size >> 10, c->min_io_size,
c->max_write_size);

4
fs/ubifs/ubifs.h
View file

@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
#define UBIFS_VERSION 1
/* Normal UBIFS messages */
#ifdef CONFIG_UBIFS_SILENCE_MSG
#define ubifs_msg(c, fmt, ...)
#else
#define ubifs_msg(c, fmt, ...) \
pr_notice("UBIFS (ubi%d:%d): " fmt "\n", \
(c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
#endif
/* UBIFS error messages */
#ifndef __UBOOT__
#define ubifs_err(c, fmt, ...) \

4
include/configs/am335x_igep003x.h
View file

@ -22,10 +22,6 @@
#define CONFIG_ENV_SIZE (96 << 10) /* 96 KiB */
/* Make the verbose messages from UBI stop printing */
#define CONFIG_UBI_SILENCE_MSG
#define CONFIG_UBIFS_SILENCE_MSG
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#ifndef CONFIG_SPL_BUILD

2
include/configs/omap3_igep00x0.h
View file

@ -136,8 +136,6 @@
#define CONFIG_ENV_UBI_PART "UBI"
#define CONFIG_ENV_UBI_VOLUME "config"
#define CONFIG_ENV_UBI_VOLUME_REDUND "config_r"
#define CONFIG_UBI_SILENCE_MSG 1
#define CONFIG_UBIFS_SILENCE_MSG 1
#define CONFIG_ENV_SIZE (32*1024)
#endif /* __IGEP00X0_H */

2
scripts/config_whitelist.txt
View file

@ -4627,10 +4627,8 @@ CONFIG_T_SH7706LSR
CONFIG_UART_BR_PRELIM
CONFIG_UART_OR_PRELIM
CONFIG_UBIBLOCK
CONFIG_UBIFS_SILENCE_MSG
CONFIG_UBIFS_VOLUME
CONFIG_UBI_PART
CONFIG_UBI_SILENCE_MSG
CONFIG_UBI_SIZE
CONFIG_UBOOT1_ENV_ADDR
CONFIG_UBOOT2_ENV_ADDR