Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
10年前
差异永不过期
清除
导出
分享
解释
11 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
69 行
全部复制
128 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
186 行
全部复制
复制
已复制
复制
已复制
U-Boot SPL 2016.11-rc1-g4dc34be-dirty (Nov 04 2016 -
08:59:48
)
U-Boot SPL 2016.11-rc1-g4dc34be-dirty (Nov 04 2016 -
09:15:24
)
DRAM:
1024
MiB
DRAM:
256
MiB
CPU:
912
000000Hz, AXI/AHB/APB: 3/2/2
CPU:
1008
000000Hz, AXI/AHB/APB: 3/2/2
Trying to boot from MMC1
Trying to boot from MMC1
init mmc 0 resource
init mmc 0 resource
init mmc 0 clock and io
init mmc 0 clock and io
mmc 0 set mod-clk req 24000000 parent 24000000 n 1 m 1 rate 24000000
mmc 0 set mod-clk req 24000000 parent 24000000 n 1 m 1 rate 24000000
set ios: bus_width: 1, clock: 0
set ios: bus_width: 1, clock: 0
set ios: bus_width: 1, clock: 400000
set ios: bus_width: 1, clock: 400000
mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000
mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc resp 0x00000000
mmc resp 0x00000000
mmc 0, cmd 8(0x80000148), arg 0x000001aa
mmc 0, cmd 8(0x80000148), arg 0x000001aa
cmd timeout 100
cmd timeout 100
mmc 0, cmd 55(0x80000177), arg 0x00000000
mmc 0, cmd 55(0x80000177), arg 0x00000000
cmd timeout 100
cmd timeout 100
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc resp 0x00000000
mmc resp 0x00000000
mmc 0, cmd 1(0x80000041), arg 0x00000000
mmc 0, cmd 1(0x80000041), arg 0x00000000
mmc resp 0x40ff8080
mmc resp 0x40ff8080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc resp 0x40ff8080
mmc resp 0x40ff8080
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc resp 0x40ff8080
mmc resp 0x40ff8080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc resp 0x40ff8080
mmc resp 0x40ff8080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc resp 0xc0ff8080
mmc resp 0xc0ff8080
mmc 0, cmd 2(0x800001c2), arg 0x00000000
mmc 0, cmd 2(0x800001c2), arg 0x00000000
mmc resp 0x6a22c0c1 0x42035a1a 0x34473146 0x1501004d
mmc resp 0x6a22c0c1 0x42035a1a 0x34473146 0x1501004d
mmc 0, cmd 3(0x80000143), arg 0x00010000
mmc 0, cmd 3(0x80000143), arg 0x00010000
mmc resp 0x00000500
mmc resp 0x00000500
mmc 0, cmd 9(0x800001c9), arg 0x00010000
mmc 0, cmd 9(0x800001c9), arg 0x00010000
mmc resp 0x8a404057 0xf6dbffe7 0x0f5903ff 0xd0270132
mmc resp 0x8a404057 0xf6dbffe7 0x0f5903ff 0xd0270132
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc resp 0x00000700
mmc resp 0x00000700
mmc 0, cmd 7(0x80000147), arg 0x00010000
mmc 0, cmd 7(0x80000147), arg 0x00010000
mmc resp 0x00000700
mmc resp 0x00000700
mmc 0, cmd 8(0x80002348), arg 0x00000000
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
trans data 512 bytes
cacl timeout 78 msec
cacl timeout 78 msec
mmc resp 0x00000900
mmc resp 0x00000900
mmc 0, cmd 8(0x80002348), arg 0x00000000
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
trans data 512 bytes
cacl timeout 78 msec
cacl timeout 78 msec
mmc resp 0x00000900
mmc resp 0x00000900
mmc cmd 6 check rsp busy
mmc cmd 6 check rsp busy
mmc 0, cmd 6(0x80000146), arg 0x03b90100
mmc 0, cmd 6(0x80000146), arg 0x03b90100
mmc resp 0x00000900
mmc resp 0x00000900
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc resp 0x00000900
mmc resp 0x00000900
mmc 0, cmd 8(0x80002348), arg 0x00000000
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
trans data 512 bytes
cacl timeout 78 msec
cacl timeout 78 msec
mmc resp 0x00000900
mmc resp 0x00000900
mmc cmd 6 check rsp busy
mmc cmd 6 check rsp busy
mmc 0, cmd 6(0x80000146), arg 0x03b70100
mmc 0, cmd 6(0x80000146), arg 0x03b70100
复制
已复制
复制
已复制
cmd
timeout
42
mmc resp 0x00000900
set ios: bus_width:
1
, clock: 52000000
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc resp 0x00000900
set ios: bus_width: 4, clock: 400000
mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
cacl
timeout
78 msec
mmc resp 0x00000900
set ios: bus_width:
4
, clock: 52000000
mmc 0 set mod-clk req 52000000 parent 600000000 n 1 m 12 rate 50000000
mmc 0 set mod-clk req 52000000 parent 600000000 n 1 m 12 rate 50000000
mmc 0, cmd 16(0x80000150), arg 0x00000200
mmc 0, cmd 16(0x80000150), arg 0x00000200
mmc resp 0x00000900
mmc resp 0x00000900
mmc 0, cmd 17(0x80002351), arg 0x00000050
mmc 0, cmd 17(0x80002351), arg 0x00000050
trans data 512 bytes
trans data 512 bytes
复制
已复制
复制
已复制
cmd timeout 80
cacl timeout 78 msec
mmc_load_image_raw_sector: mmc block read error
mmc resp 0x00000900
SPL: failed to boot from all boot devices
mmc 0, cmd 16(0x80000150), arg 0x00000200
### ERROR ### Please RESET the board ###
mmc resp 0x00000900
.
mmc 0, cmd 18(0x80003352), arg 0x00000050
trans data 406528 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc cmd 12 check rsp busy
U-Boot 2016.11-rc1-g4dc34be-dirty (Nov 04 2016 - 09:15:24 +0600) Allwinner Technology
CPU: Allwinner A13 (SUN5I)
Model: Olimex A13-Olinuxino Micro
I2C: ready
DRAM: 256 MiB
id_pfr1: 0x00000011
MMC: init mmc 0 resource
init mmc 0 clock and io
mmc 0 set mod-clk req 24000000 parent 24000000 n 1 m 1 rate 24000000
SUNXI SD/MMC: 0
set ios: bus_width: 1, clock: 0
set ios: bus_width: 1, clock: 400000
mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc resp 0x00000900
mmc 0, cmd 8(0x80000148), arg 0x000001aa
cmd timeout 100
mmc 0, cmd 55(0x80000177), arg 0x00000000
cmd timeout 100
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc resp 0x00000900
mmc 0, cmd 1(0x80000041), arg 0x00000000
mmc resp 0x40ff8080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc resp 0x40ff8080
mmc 0, cmd 0(0x80008000), arg 0x00000000
mmc resp 0x40ff8080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc resp 0x40ff8080
mmc 0, cmd 1(0x80000041), arg 0x40300080
mmc resp 0xc0ff8080
mmc 0, cmd 2(0x800001c2), arg 0x00000000
mmc resp 0x6a22c0c1 0x42035a1a 0x34473146 0x1501004d
mmc 0, cmd 3(0x80000143), arg 0x00010000
mmc resp 0x00000500
mmc 0, cmd 9(0x800001c9), arg 0x00010000
mmc resp 0x8a404057 0xf6dbffe7 0x0f5903ff 0xd0270132
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc resp 0x00000700
mmc 0, cmd 7(0x80000147), arg 0x00010000
mmc resp 0x00000700
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc cmd 6 check rsp busy
mmc 0, cmd 6(0x80000146), arg 0x03b90100
mmc resp 0x00000900
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc resp 0x00000900
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc cmd 6 check rsp busy
mmc 0, cmd 6(0x80000146), arg 0x03b70100
mmc resp 0x00000900
mmc 0, cmd 13(0x8000014d), arg 0x00010000
mmc resp 0x00000900
set ios: bus_width: 4, clock: 400000
mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000
mmc 0, cmd 8(0x80002348), arg 0x00000000
trans data 512 bytes
cacl timeout 78 msec
mmc resp 0x00000900
set ios: bus_width: 4, clock: 52000000
mmc 0 set mod-clk req 52000000 parent 600000000 n 1 m 12 rate 50000000
mmc 0, cmd 16(0x80000150), arg 0x00000200
mmc resp 0x00000900
mmc 0, cmd 17(0x80002351), arg 0x00000000
trans data 512 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc 0, cmd 16(0x80000150), arg 0x00000200
mmc resp 0x00000900
mmc 0, cmd 17(0x80002351), arg 0x00000000
trans data 512 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc 0, cmd 16(0x80000150), arg 0x00000200
mmc resp 0x00000900
mmc 0, cmd 18(0x80003352), arg 0x00000440
trans data 131072 bytes
cacl timeout 78 msec
mmc resp 0x00000900
mmc cmd 12 check rsp busy
*** Warning - bad CRC, using default environment
Setting up a 1024x768 vga console (overscan 0x0)
In: serial
Out: vga
Err: vga
Net: No ethernet found.
starting USB...
USB0: USB EHCI 1.00
USB1: USB OHCI 1.0
scanning bus 0 for devices... 1 USB Device(s) found
Hit any key to stop autoboot: 2
已保存差异
原始文本
打开文件
U-Boot SPL 2016.11-rc1-g4dc34be-dirty (Nov 04 2016 - 08:59:48) DRAM: 1024 MiB CPU: 912000000Hz, AXI/AHB/APB: 3/2/2 Trying to boot from MMC1 init mmc 0 resource init mmc 0 clock and io mmc 0 set mod-clk req 24000000 parent 24000000 n 1 m 1 rate 24000000 set ios: bus_width: 1, clock: 0 set ios: bus_width: 1, clock: 400000 mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x00000000 mmc 0, cmd 8(0x80000148), arg 0x000001aa cmd timeout 100 mmc 0, cmd 55(0x80000177), arg 0x00000000 cmd timeout 100 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x00000000 mmc 0, cmd 1(0x80000041), arg 0x00000000 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0x40ff8080 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0xc0ff8080 mmc 0, cmd 2(0x800001c2), arg 0x00000000 mmc resp 0x6a22c0c1 0x42035a1a 0x34473146 0x1501004d mmc 0, cmd 3(0x80000143), arg 0x00010000 mmc resp 0x00000500 mmc 0, cmd 9(0x800001c9), arg 0x00010000 mmc resp 0x8a404057 0xf6dbffe7 0x0f5903ff 0xd0270132 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000700 mmc 0, cmd 7(0x80000147), arg 0x00010000 mmc resp 0x00000700 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 6 check rsp busy mmc 0, cmd 6(0x80000146), arg 0x03b90100 mmc resp 0x00000900 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000900 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 6 check rsp busy mmc 0, cmd 6(0x80000146), arg 0x03b70100 cmd timeout 42 set ios: bus_width: 1, clock: 52000000 mmc 0 set mod-clk req 52000000 parent 600000000 n 1 m 12 rate 50000000 mmc 0, cmd 16(0x80000150), arg 0x00000200 mmc resp 0x00000900 mmc 0, cmd 17(0x80002351), arg 0x00000050 trans data 512 bytes cmd timeout 80 mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### .
更改后文本
打开文件
U-Boot SPL 2016.11-rc1-g4dc34be-dirty (Nov 04 2016 - 09:15:24) DRAM: 256 MiB CPU: 1008000000Hz, AXI/AHB/APB: 3/2/2 Trying to boot from MMC1 init mmc 0 resource init mmc 0 clock and io mmc 0 set mod-clk req 24000000 parent 24000000 n 1 m 1 rate 24000000 set ios: bus_width: 1, clock: 0 set ios: bus_width: 1, clock: 400000 mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x00000000 mmc 0, cmd 8(0x80000148), arg 0x000001aa cmd timeout 100 mmc 0, cmd 55(0x80000177), arg 0x00000000 cmd timeout 100 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x00000000 mmc 0, cmd 1(0x80000041), arg 0x00000000 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0x40ff8080 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0xc0ff8080 mmc 0, cmd 2(0x800001c2), arg 0x00000000 mmc resp 0x6a22c0c1 0x42035a1a 0x34473146 0x1501004d mmc 0, cmd 3(0x80000143), arg 0x00010000 mmc resp 0x00000500 mmc 0, cmd 9(0x800001c9), arg 0x00010000 mmc resp 0x8a404057 0xf6dbffe7 0x0f5903ff 0xd0270132 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000700 mmc 0, cmd 7(0x80000147), arg 0x00010000 mmc resp 0x00000700 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 6 check rsp busy mmc 0, cmd 6(0x80000146), arg 0x03b90100 mmc resp 0x00000900 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000900 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 6 check rsp busy mmc 0, cmd 6(0x80000146), arg 0x03b70100 mmc resp 0x00000900 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000900 set ios: bus_width: 4, clock: 400000 mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 set ios: bus_width: 4, clock: 52000000 mmc 0 set mod-clk req 52000000 parent 600000000 n 1 m 12 rate 50000000 mmc 0, cmd 16(0x80000150), arg 0x00000200 mmc resp 0x00000900 mmc 0, cmd 17(0x80002351), arg 0x00000050 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc 0, cmd 16(0x80000150), arg 0x00000200 mmc resp 0x00000900 mmc 0, cmd 18(0x80003352), arg 0x00000050 trans data 406528 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 12 check rsp busy U-Boot 2016.11-rc1-g4dc34be-dirty (Nov 04 2016 - 09:15:24 +0600) Allwinner Technology CPU: Allwinner A13 (SUN5I) Model: Olimex A13-Olinuxino Micro I2C: ready DRAM: 256 MiB id_pfr1: 0x00000011 MMC: init mmc 0 resource init mmc 0 clock and io mmc 0 set mod-clk req 24000000 parent 24000000 n 1 m 1 rate 24000000 SUNXI SD/MMC: 0 set ios: bus_width: 1, clock: 0 set ios: bus_width: 1, clock: 400000 mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x00000900 mmc 0, cmd 8(0x80000148), arg 0x000001aa cmd timeout 100 mmc 0, cmd 55(0x80000177), arg 0x00000000 cmd timeout 100 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x00000900 mmc 0, cmd 1(0x80000041), arg 0x00000000 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0x40ff8080 mmc 0, cmd 0(0x80008000), arg 0x00000000 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0x40ff8080 mmc 0, cmd 1(0x80000041), arg 0x40300080 mmc resp 0xc0ff8080 mmc 0, cmd 2(0x800001c2), arg 0x00000000 mmc resp 0x6a22c0c1 0x42035a1a 0x34473146 0x1501004d mmc 0, cmd 3(0x80000143), arg 0x00010000 mmc resp 0x00000500 mmc 0, cmd 9(0x800001c9), arg 0x00010000 mmc resp 0x8a404057 0xf6dbffe7 0x0f5903ff 0xd0270132 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000700 mmc 0, cmd 7(0x80000147), arg 0x00010000 mmc resp 0x00000700 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 6 check rsp busy mmc 0, cmd 6(0x80000146), arg 0x03b90100 mmc resp 0x00000900 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000900 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 6 check rsp busy mmc 0, cmd 6(0x80000146), arg 0x03b70100 mmc resp 0x00000900 mmc 0, cmd 13(0x8000014d), arg 0x00010000 mmc resp 0x00000900 set ios: bus_width: 4, clock: 400000 mmc 0 set mod-clk req 400000 parent 24000000 n 4 m 15 rate 400000 mmc 0, cmd 8(0x80002348), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 set ios: bus_width: 4, clock: 52000000 mmc 0 set mod-clk req 52000000 parent 600000000 n 1 m 12 rate 50000000 mmc 0, cmd 16(0x80000150), arg 0x00000200 mmc resp 0x00000900 mmc 0, cmd 17(0x80002351), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc 0, cmd 16(0x80000150), arg 0x00000200 mmc resp 0x00000900 mmc 0, cmd 17(0x80002351), arg 0x00000000 trans data 512 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc 0, cmd 16(0x80000150), arg 0x00000200 mmc resp 0x00000900 mmc 0, cmd 18(0x80003352), arg 0x00000440 trans data 131072 bytes cacl timeout 78 msec mmc resp 0x00000900 mmc cmd 12 check rsp busy *** Warning - bad CRC, using default environment Setting up a 1024x768 vga console (overscan 0x0) In: serial Out: vga Err: vga Net: No ethernet found. starting USB... USB0: USB EHCI 1.00 USB1: USB OHCI 1.0 scanning bus 0 for devices... 1 USB Device(s) found Hit any key to stop autoboot: 2
查找差异