Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
81cf7c8d
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
81cf7c8d
编写于
3月 25, 2018
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://git.denx.de/u-boot-ubi
上级
2dc5165e
c0ce4cea
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
29 addition
and
27 deletion
+29
-27
README
README
+0
-12
configs/am335x_igep003x_defconfig
configs/am335x_igep003x_defconfig
+2
-0
configs/igep0032_defconfig
configs/igep0032_defconfig
+2
-0
configs/igep00x0_defconfig
configs/igep00x0_defconfig
+2
-0
drivers/mtd/ubi/Kconfig
drivers/mtd/ubi/Kconfig
+7
-0
env/Kconfig
env/Kconfig
+0
-6
fs/ubifs/Kconfig
fs/ubifs/Kconfig
+6
-0
fs/ubifs/super.c
fs/ubifs/super.c
+6
-1
fs/ubifs/ubifs.h
fs/ubifs/ubifs.h
+4
-0
include/configs/am335x_igep003x.h
include/configs/am335x_igep003x.h
+0
-4
include/configs/omap3_igep00x0.h
include/configs/omap3_igep00x0.h
+0
-2
scripts/config_whitelist.txt
scripts/config_whitelist.txt
+0
-2
未找到文件。
README
浏览文件 @
81cf7c8d
...
...
@@ -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.
...
...
configs/am335x_igep003x_defconfig
浏览文件 @
81cf7c8d
...
...
@@ -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
...
...
configs/igep0032_defconfig
浏览文件 @
81cf7c8d
...
...
@@ -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
...
...
configs/igep00x0_defconfig
浏览文件 @
81cf7c8d
...
...
@@ -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
...
...
drivers/mtd/ubi/Kconfig
浏览文件 @
81cf7c8d
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
...
...
env/Kconfig
浏览文件 @
81cf7c8d
...
...
@@ -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
...
...
fs/ubifs/Kconfig
浏览文件 @
81cf7c8d
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.
fs/ubifs/super.c
浏览文件 @
81cf7c8d
...
...
@@ -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
);
...
...
fs/ubifs/ubifs.h
浏览文件 @
81cf7c8d
...
...
@@ -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, ...) \
...
...
include/configs/am335x_igep003x.h
浏览文件 @
81cf7c8d
...
...
@@ -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
...
...
include/configs/omap3_igep00x0.h
浏览文件 @
81cf7c8d
...
...
@@ -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 */
scripts/config_whitelist.txt
浏览文件 @
81cf7c8d
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录