텍스트 비교

두 텍스트 파일의 차이점을 찾아보세요

실시간 편집

변경 없는 행 숨기기

줄바꿈 비활성화

레이아웃

비교 단위

구문 강조

Diffchecker Desktop 가장 안전하게 Diffchecker를 사용하는 방법. 데스크톱 앱을 사용하면 비교 데이터가 외부로 전송되지 않습니다!데스크톱 앱 받기

Untitled diff

생성일 9년 전비교 결과 만료 없음

62 삭제

행
총
삭제

글자
총
삭제

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

170 행

22 추가

행
총
추가

글자
총
추가

이 기능을 계속 사용하려면 업그레이드해 주세요 Diffchecker Pro 요금제 보기

130 행

U-Boot 2014.07-4-pine64-gf1d5b11-dirty (Dec 30 2016 - 19:01:32) Allwinner Technology

uboot commit : f1d5b11a5aa3d399543bb36dd6438c2f3fa143da

rsb: secure monitor exist

[ 0.361]pmbus: ready

[ 0.364][ARISC] :arisc initialize

[ 0.690][ARISC] :arisc_dvfs_cfg_vf_table: support only one vf_table

[ 0.689][ARISC] :arisc_dvfs_cfg_vf_table: support only one vf_table

[SCP] :sunxi-arisc driver begin startup 2

[SCP] :arisc_para size:1a8

[SCP] :arisc version: [v0.1.76]

[SCP] :sunxi-arisc driver v1.10 is starting

[ 0.816][ARISC] :sunxi-arisc driver startup succeeded

[ 0.815][ARISC] :sunxi-arisc driver startup succeeded

[ 0.849]PMU: AXP81X

[ 0.848]PMU: AXP81X

[ 0.851]PMU: AXP81X found

[ 0.850]PMU: AXP81X found

bat_vol=257, ratio=100

bat_vol=0, ratio=0

[ 0.857]PMU: dcdc2 1100

[ 0.860]PMU: cpux 1008 Mhz,AXI=336 Mhz

PLL6=600 Mhz,AHB1=200 Mhz, APB1=100Mhz AHB2=300Mhz MBus=400Mhz

device_type = 3253, onoff=1

dcdc1_vol = 3300, onoff=1

dcdc2_vol = 1100, onoff=1

dcdc6_vol = 1100, onoff=1

aldo1_vol = 2800, onoff=0

aldo2_vol = 1800, onoff=1

aldo3_vol = 3000, onoff=1

dldo1_vol = 3300, onoff=0

dldo2_vol = 3300, onoff=0

dldo3_vol = 2800, onoff=0

dldo4_vol = 3300, onoff=1

eldo1_vol = 1800, onoff=1

eldo2_vol = 1800, onoff=0

eldo3_vol = 1800, onoff=0

fldo1_vol = 1200, onoff=0

fldo2_vol = 1100, onoff=1

gpio0_vol = 3100, onoff=0

vbus not exist

no battery, limit to dc

normal dc exist, limit to dc

run key detect

no key found

no uart input

DRAM: 2 GiB

fdt addr: 0xb6ebf500

Relocation Offset is: 75f11000

In: serial

Out: serial

Err: serial

gic: sec monitor mode

[ 1.670]start

[ 1.168]start

drv_disp_init

init_clocks: finish init_clocks.

enable power vcc-hdmi-33, ret=0

drv_disp_init finish

boot_disp.output_disp=0

boot_disp.output_type=3

boot_disp.output_mode=10

fetch script data boot_disp.auto_hpd fail

disp0 device type(4) enable

attched ok, mgr0<-->device1, type=4, mode=10

plugin

[ 2.713]end

[ 2.211]end

workmode = 0,storage type = 1

[ 2.718]MMC: 0

[ 2.216]MMC: 0

[mmc]: mmc driver ver 2015-06-03 13:50:00

WARNING: Unimplemented Standard Service Call: 0x8000ff05

WARNING: Unimplemented Standard Service Call: 0x8000ff06

SUNXI SD/MMC: 0

[mmc]: start mmc_calibrate_delay_unit, don't access device...

[mmc]: delay chain cal done, sample: 192(ps)

[mmc]: media type 0x0

[mmc]: Wrong media type 0x0

[mmc]: ************Try SD card 0************

[mmc]: host caps: 0x27

[mmc]: MID 1b PSN 404e0438

[mmc]: PNM 00000 -- 0x30-30-30-30-30

[mmc]: PRV 1.0

[mmc]: MDT m-12 y-2015

[mmc]: speed mode : HSSDR52/SDR25

[mmc]: clock : 50000000 Hz

[mmc]: bus_width : 4 bit

[mmc]: user capacity : 61056 MB

[mmc]: ************SD/MMC 0 init OK!!!************

[mmc]: erase_grp_size : 0x1WrBlk*0x200=0x200 Byte

[mmc]: secure_feature : 0x0

[mmc]: secure_removal_type : 0x0

[ 2.941]sunxi flash init ok

[ 2.439]sunxi flash init ok

[mmc]: Has init

[ 2.974]---drivers/mmc/mmc.c 2733 mmc_init

[ 2.472]---drivers/mmc/mmc.c 2733 mmc_init

** Unable to use mmc 0:1 for loading the env **

Using default environment

--------fastboot partitions--------

mbr not exist

base bootcmd=run mmcbootcmd

bootcmd set setargs_mmc

key 0

recovery key high 12, low 10

fastboot key high 6, low 4

no misc partition is found

to be run cmd=run mmcbootcmd

update dtb dram start

update dtb dram end

WARNING: Unimplemented Standard Service Call: 0x8000ff05

serial is: ffffffffffffffffffff

get Pine64 model from DRAM size

DRAM >512M

Pine64 model: pine64-plus

no battery exist

PowerBus = 2(0: not exist 1:vBus 2:acBus 3:vBus&acBus)

sunxi_bmp_logo_display

Battery Voltage=0, Ratio=0

key trigger

battery low power and vol with dc or ac, should charge longer

[mmc]: Has init

[ 3.197]---drivers/mmc/mmc.c 2733 mmc_init

[ 2.718]---drivers/mmc/mmc.c 2733 mmc_init

** Unrecognized filesystem type **

sunxi bmp info error : unable to open logo file bootlogo.bmp

sunxi bmp info error : unable to open logo file bat\bempty.bmp

[ 3.211]inter uboot shell

set next system normal

Hit any key to stop autoboot: 0

drv_disp_exit

[mmc]: Has init

[ 6.325]---drivers/mmc/mmc.c 2733 mmc_init

26 bytes read in 17 ms (1000 Bytes/s)

Loading boot environment ...

[mmc]: Has init

[ 6.358]---drivers/mmc/mmc.c 2733 mmc_init

4696 bytes read in 11 ms (416 KiB/s)

Booting with script ...

## Executing script at 41000000

[mmc]: Has init

[ 6.396]---drivers/mmc/mmc.c 2733 mmc_init

140 bytes read in 8 ms (16.6 KiB/s)

[mmc]: Has init

[ 6.424]---drivers/mmc/mmc.c 2733 mmc_init

67970 bytes read in 17 ms (3.8 MiB/s)

[mmc]: Has init

[ 6.452]---drivers/mmc/mmc.c 2733 mmc_init

4797651 bytes read in 266 ms (17.2 MiB/s)

[mmc]: Has init

[ 6.729]---drivers/mmc/mmc.c 2733 mmc_init

11897816 bytes read in 626 ms (18.1 MiB/s)

Image lacks image_size field, assuming 16MiB

## Loading init Ramdisk from Legacy Image at 45300000 ...

Image Name: uInitrd

Image Type: ARM Linux RAMDisk Image (gzip compressed)

Data Size: 4797587 Bytes = 4.6 MiB

Load Address: 00000000

Entry Point: 00000000

Verifying Checksum ... OK

## Flattened Device Tree blob at 45000000

Booting using the fdt blob at 0x45000000

reserving fdt memory region: addr=41010000 size=10000

reserving fdt memory region: addr=41020000 size=800

reserving fdt memory region: addr=40100000 size=4000

reserving fdt memory region: addr=40104000 size=1000

reserving fdt memory region: addr=40105000 size=1000

reserving fdt memory region: addr=45000000 size=11000

Loading Ramdisk to b6a27000, end b6eba493 ... OK

Loading Device Tree to 44feb000, end 44ffefff ... OK

Starting kernel ...

[mmc]: MMC Device 2 not found

[mmc]: mmc 2 not find, so not exit

INFO: BL3-1: Next image address = 0x41080000

[ 5.742]power off

INFO: BL3-1: Next image spsr = 0x3c9

set power off vol to default

저장된 비교 결과

원본

파일 열기

U-Boot 2014.07-4-pine64-gf1d5b11-dirty (Dec 30 2016 - 19:01:32) Allwinner Technology

uboot commit : f1d5b11a5aa3d399543bb36dd6438c2f3fa143da

rsb: secure monitor exist
[      0.361]pmbus:   ready
[      0.364][ARISC] :arisc initialize
[      0.690][ARISC] :arisc_dvfs_cfg_vf_table: support only one vf_table
[SCP] :sunxi-arisc driver begin startup 2
[SCP] :arisc_para size:1a8
[SCP] :arisc version: [v0.1.76]
[SCP] :sunxi-arisc driver v1.10 is starting
[      0.816][ARISC] :sunxi-arisc driver startup succeeded
[      0.849]PMU: AXP81X
[      0.851]PMU: AXP81X found
bat_vol=257, ratio=100
[      0.857]PMU: dcdc2 1100
[      0.860]PMU: cpux 1008 Mhz,AXI=336 Mhz
PLL6=600 Mhz,AHB1=200 Mhz, APB1=100Mhz AHB2=300Mhz MBus=400Mhz
device_type = 3253, onoff=1
dcdc1_vol = 3300, onoff=1
dcdc2_vol = 1100, onoff=1
dcdc6_vol = 1100, onoff=1
aldo1_vol = 2800, onoff=0
aldo2_vol = 1800, onoff=1
aldo3_vol = 3000, onoff=1
dldo1_vol = 3300, onoff=0
dldo2_vol = 3300, onoff=0
dldo3_vol = 2800, onoff=0
dldo4_vol = 3300, onoff=1
eldo1_vol = 1800, onoff=1
eldo2_vol = 1800, onoff=0
eldo3_vol = 1800, onoff=0
fldo1_vol = 1200, onoff=0
fldo2_vol = 1100, onoff=1
gpio0_vol = 3100, onoff=0
vbus not exist
no battery, limit to dc
run key detect
no key found
no uart input
DRAM:  2 GiB
fdt addr: 0xb6ebf500
Relocation Offset is: 75f11000
In:    serial
Out:   serial
Err:   serial
gic: sec monitor mode
[      1.670]start
drv_disp_init
init_clocks: finish init_clocks.
enable power vcc-hdmi-33, ret=0
drv_disp_init finish
boot_disp.output_disp=0
boot_disp.output_type=3
boot_disp.output_mode=10
fetch script data boot_disp.auto_hpd fail
disp0 device type(4) enable
attched ok, mgr0<-->device1, type=4, mode=10
plugin
[      2.713]end
workmode = 0,storage type = 1
[      2.718]MMC:        0
[mmc]: mmc driver ver 2015-06-03 13:50:00
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff06
WARNING: Unimplemented Standard Service Call: 0x8000ff06
WARNING: Unimplemented Standard Service Call: 0x8000ff06
SUNXI SD/MMC: 0
[mmc]: start mmc_calibrate_delay_unit, don't access device...
[mmc]: delay chain cal done, sample: 192(ps)
[mmc]: media type 0x0
[mmc]: Wrong media type 0x0
[mmc]: ************Try SD card 0************
[mmc]: host caps: 0x27
[mmc]: MID 1b PSN 404e0438
[mmc]: PNM 00000 -- 0x30-30-30-30-30
[mmc]: PRV 1.0
[mmc]: MDT m-12 y-2015
[mmc]: speed mode     : HSSDR52/SDR25
[mmc]: clock          : 50000000 Hz
[mmc]: bus_width      : 4 bit
[mmc]: user capacity  : 61056 MB
[mmc]: ************SD/MMC 0 init OK!!!************
[mmc]: erase_grp_size      : 0x1WrBlk*0x200=0x200 Byte
[mmc]: secure_feature      : 0x0
[mmc]: secure_removal_type : 0x0
[      2.941]sunxi flash init ok
[mmc]: Has init
[      2.974]---drivers/mmc/mmc.c 2733 mmc_init

** Unable to use mmc 0:1 for loading the env **
Using default environment

--------fastboot partitions--------
mbr not exist
base bootcmd=run mmcbootcmd
bootcmd set setargs_mmc
key 0
recovery key high 12, low 10
fastboot key high 6, low 4
no misc partition is found
to be run cmd=run mmcbootcmd
update dtb dram start
update dtb dram  end
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
serial is: ffffffffffffffffffff
get Pine64 model from DRAM size
DRAM >512M
Pine64 model: pine64-plus
no battery exist
sunxi_bmp_logo_display
[mmc]: Has init
[      3.197]---drivers/mmc/mmc.c 2733 mmc_init
** Unrecognized filesystem type **
sunxi bmp info error : unable to open logo file bootlogo.bmp
[      3.211]inter uboot shell
Hit any key to stop autoboot:  0
[mmc]: Has init
[      6.325]---drivers/mmc/mmc.c 2733 mmc_init
26 bytes read in 17 ms (1000 Bytes/s)
Loading boot environment ...
[mmc]: Has init
[      6.358]---drivers/mmc/mmc.c 2733 mmc_init
4696 bytes read in 11 ms (416 KiB/s)
Booting with script ...
## Executing script at 41000000
[mmc]: Has init
[      6.396]---drivers/mmc/mmc.c 2733 mmc_init
140 bytes read in 8 ms (16.6 KiB/s)
[mmc]: Has init
[      6.424]---drivers/mmc/mmc.c 2733 mmc_init
67970 bytes read in 17 ms (3.8 MiB/s)
[mmc]: Has init
[      6.452]---drivers/mmc/mmc.c 2733 mmc_init
4797651 bytes read in 266 ms (17.2 MiB/s)
[mmc]: Has init
[      6.729]---drivers/mmc/mmc.c 2733 mmc_init
11897816 bytes read in 626 ms (18.1 MiB/s)
Image lacks image_size field, assuming 16MiB
## Loading init Ramdisk from Legacy Image at 45300000 ...
   Image Name:   uInitrd
   Image Type:   ARM Linux RAMDisk Image (gzip compressed)
   Data Size:    4797587 Bytes = 4.6 MiB
   Load Address: 00000000
   Entry Point:  00000000
   Verifying Checksum ... OK
## Flattened Device Tree blob at 45000000
   Booting using the fdt blob at 0x45000000
   reserving fdt memory region: addr=41010000 size=10000
   reserving fdt memory region: addr=41020000 size=800
   reserving fdt memory region: addr=40100000 size=4000
   reserving fdt memory region: addr=40104000 size=1000
   reserving fdt memory region: addr=40105000 size=1000
   reserving fdt memory region: addr=45000000 size=11000
   Loading Ramdisk to b6a27000, end b6eba493 ... OK
   Loading Device Tree to 44feb000, end 44ffefff ... OK

Starting kernel ...

[mmc]: MMC Device 2 not found
[mmc]: mmc 2 not find, so not exit
INFO:    BL3-1: Next image address = 0x41080000
INFO:    BL3-1: Next image spsr = 0x3c9

수정본

파일 열기

U-Boot 2014.07-4-pine64-gf1d5b11-dirty (Dec 30 2016 - 19:01:32) Allwinner Technology

uboot commit : f1d5b11a5aa3d399543bb36dd6438c2f3fa143da

rsb: secure monitor exist
[      0.361]pmbus:   ready
[      0.364][ARISC] :arisc initialize
[      0.689][ARISC] :arisc_dvfs_cfg_vf_table: support only one vf_table
[SCP] :sunxi-arisc driver begin startup 2
[SCP] :arisc_para size:1a8
[SCP] :arisc version: [v0.1.76]
[SCP] :sunxi-arisc driver v1.10 is starting
[      0.815][ARISC] :sunxi-arisc driver startup succeeded
[      0.848]PMU: AXP81X
[      0.850]PMU: AXP81X found
bat_vol=0, ratio=0
[      0.857]PMU: dcdc2 1100
[      0.860]PMU: cpux 1008 Mhz,AXI=336 Mhz
PLL6=600 Mhz,AHB1=200 Mhz, APB1=100Mhz AHB2=300Mhz MBus=400Mhz
device_type = 3253, onoff=1
dcdc1_vol = 3300, onoff=1
dcdc2_vol = 1100, onoff=1
dcdc6_vol = 1100, onoff=1
aldo1_vol = 2800, onoff=0
aldo2_vol = 1800, onoff=1
aldo3_vol = 3000, onoff=1
dldo1_vol = 3300, onoff=0
dldo2_vol = 3300, onoff=0
dldo3_vol = 2800, onoff=0
dldo4_vol = 3300, onoff=1
eldo1_vol = 1800, onoff=1
eldo2_vol = 1800, onoff=0
eldo3_vol = 1800, onoff=0
fldo1_vol = 1200, onoff=0
fldo2_vol = 1100, onoff=1
gpio0_vol = 3100, onoff=0
vbus not exist
normal dc exist, limit to dc
run key detect
no key found
no uart input
DRAM:  2 GiB
fdt addr: 0xb6ebf500
Relocation Offset is: 75f11000
In:    serial
Out:   serial
Err:   serial
gic: sec monitor mode
[      1.168]start
drv_disp_init
init_clocks: finish init_clocks.
enable power vcc-hdmi-33, ret=0
drv_disp_init finish
boot_disp.output_disp=0
boot_disp.output_type=3
boot_disp.output_mode=10
fetch script data boot_disp.auto_hpd fail
disp0 device type(4) enable
attched ok, mgr0<-->device1, type=4, mode=10
plugin
[      2.211]end
workmode = 0,storage type = 1
[      2.216]MMC:        0
[mmc]: mmc driver ver 2015-06-03 13:50:00
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff05
WARNING: Unimplemented Standard Service Call: 0x8000ff06
WARNING: Unimplemented Standard Service Call: 0x8000ff06
WARNING: Unimplemented Standard Service Call: 0x8000ff06
SUNXI SD/MMC: 0
[mmc]: start mmc_calibrate_delay_unit, don't access device...
[mmc]: delay chain cal done, sample: 192(ps)
[mmc]: media type 0x0
[mmc]: Wrong media type 0x0
[mmc]: ************Try SD card 0************
[mmc]: host caps: 0x27
[mmc]: MID 1b PSN 404e0438
[mmc]: PNM 00000 -- 0x30-30-30-30-30
[mmc]: PRV 1.0
[mmc]: MDT m-12 y-2015
[mmc]: speed mode     : HSSDR52/SDR25
[mmc]: clock          : 50000000 Hz
[mmc]: bus_width      : 4 bit
[mmc]: user capacity  : 61056 MB
[mmc]: ************SD/MMC 0 init OK!!!************
[mmc]: erase_grp_size      : 0x1WrBlk*0x200=0x200 Byte
[mmc]: secure_feature      : 0x0
[mmc]: secure_removal_type : 0x0
[      2.439]sunxi flash init ok
[mmc]: Has init
[      2.472]---drivers/mmc/mmc.c 2733 mmc_init

** Unable to use mmc 0:1 for loading the env **
Using default environment