git rebase FETCH_HEAD 出错

liangfeng · June 21, 2021, 7:19am

你好，在更新SDK代码时，到最后一步时，运行命令 git rebase FETCH_HEAD 产生如下错误，请帮分析一下。谢谢了！

注：操作过程按照wiki说明一步步操作，没有修改过代码。
.bundle文件夹的内容是从百度网盘拷贝，然后解压，再同步的。

jpchen · June 21, 2021, 8:01am

git status 命令查看一下

liangfeng · June 21, 2021, 9:20am

你好，请查看附件。

是运行 git reset --hard 后的 status 。由于文件太大，只取了一小部分。
status.rar (75.8 KB)

liangfeng · June 21, 2021, 9:24am

你好，运行命令后，如附件图片所示。

jpchen · June 21, 2021, 9:54am

liangfeng 发表于 2021-6-21 17:24
你好，运行命令后，如附件图片所示。

查看工程是否干净，干净了，在进行git rebase FETCH_HEAD操作

liangfeng · June 21, 2021, 10:08am

好的。
另外，再请教一个问题。core-3399-jd4 这个核心板，是否是加密的？我们烧录 AIO-3399J 的系统固件进去，是不能进入到系统界面的，且串口打印有乱码。

liangfeng · June 21, 2021, 12:49pm

另，我们手上的这块核心板是不带NPU的。

liangfeng · June 22, 2021, 12:23am

同时，我们也没有使用与core-3399-jd4 这个核心板配套的底板，而是使用我们自己的底板。

liangfeng · June 22, 2021, 12:43am

但是，使用core-3399-jd4 这个核心板及其自带的系统固件，再使用我们自己的底板，是可以正常启动进入到系统界面的，同时，串口打印也是正常的。

jpchen · June 22, 2021, 2:03am

liangfeng 发表于 2021-6-22 08:43
但是，使用core-3399-jd4 这个核心板及其自带的系统固件，再使用我们自己的底板，是可以正常启动进入到系 …

首先，使用自制底板要根据底板的相关接口软件进行配置，目前可以跑起来，说明软件基本是是通的，但是相关底板接口需要你们自己调试

liangfeng · June 22, 2021, 2:23am

好的，但是，如果是这个核心板使用我们自己的系统固件，那就有问题了，刚启动不久串口就出现乱码了。我们就想知道，这个核心板是否什么特殊的处理，例如加密什么的，要使用你们自己的系统固件才能跑起来。现在，我们的系统固件的DTS是根据 rk3399-firefly-aioc 这个产品来配置的。（因为现在还不能同步更新代码，所以看不到rk3399_firefly_aiojd4的配置）

jpchen · June 23, 2021, 1:09am

liangfeng 发表于 2021-6-22 10:23
好的，但是，如果是这个核心板使用我们自己的系统固件，那就有问题了，刚启动不久串口就出现乱码了。我们就 …

同步代码最新后再验证，不同的dts是适配不同的机器，所以要选择对的dts进行编译

liangfeng · June 23, 2021, 7:16am

当前，已经同步更新了代码。我们把rk3399-firefly-aio.dtsi文件修改成与rk3399-firefly-aiojd4.dtsi 文件基本一样的配置，然后烧录到 core-3399-jd4这个核心板上后，发现串口打印依然有乱码（基本与没有修改前的情况一样。），同时，不能进入系统界面。不知道这两个机器根本的不同之处在哪里。

liangfeng · June 23, 2021, 7:22am

1.792884] hub 4-0:1.0: USB hub found
[ 1.793054] hub 4-0:1.0: 1 port detected
[ 1.796094] usbcore: registered new interface driver cdc_acm
[ 1.796113] cdc_acm: USB Abstract Control Model driver for USB modems and ISDN adapters
[ 1.796279] usbcore: registered new interface driver usblp
[ 1.796398] usbcore: registered new interface driver cdc_wdm
[ 1.796528] usbcore: registered new interface driver uas
[ 1.796811] usbcore: registered new interface driver usb-storage
[ 1.796916] usbcore: registered new interface driver ums-alauda
[ 1.797029] usbcore: registered new interface driver ums-cypress
[ 1.797181] usbcore: registered new interface driver ums-datafab
[ 1.797294] usbcore: registered new interface driver ums_eneub6250
[ 1.797406] usbcore: registered new interface driver ums-freecom
[ 1.797519] usbcore: registered new interface driver ums-isd200
[ 1.797630] usbcore: registered new interface driver ums-jumpshot
[ 1.797752] usbcore: registered new interface driver ums-karma
[ 1.797865] usbcore: registered new interface driver ums-onetouch
[ 1.797977] usbcore: registered new interface driver ums-sddr09
[ 1.798090] usbcore: registered new interface driver ums-sddr55
[ 1.798203] usbcore: registered new interface driver ums-usbat
[ 1.798425] usbcore: registered new interface driver usbserial
[ 1.798524] usbcore: registered new interface driver usbserial_generic
[ 1.798607] usbserial: USB Serial support registered for generic
[ 1.798725] usbcore: registered new interface driver option
[ 1.798795] usbserial: USB Serial support registered for GSM modem (1-port)
[ 1.799312] usbcore: registered new interface driver trancevibrator
[ 1.799344] usb20_otg: version 3.10a 21-DEC-2012
[ 1.799858] usb20_host: version 3.10a 21-DEC-2012
[ 1.801558] usbcore: registered new interface driver xpad
[ 1.801834] usbcore: registered new interface driver usb_acecad
[ 1.802071] usbcore: registered new interface driver aiptek
[ 1.802314] usbcore: registered new interface driver gtco
[ 1.802556] usbcore: registered new interface driver hanwang
[ 1.802777] usbcore: registered new interface driver kbtab
[ 1.803293] [FTS_TS]fts_ts_init: Enter
[ 1.803480] [FTS_TS]fts_ts_init: Exit(1690)
[ 1.805764] .. rk pwm remotectl v1.1 init
[ 1.806846] input: ff420030.pwm as /devices/platform/ff420030.pwm/input/input0
[ 1.808436] sensor_register_slave:mma8452,id=17
[ 1.808778] sensor_register_slave:lis3dh,id=7
[ 1.809015] sensor_register_slave:mma7660,id=18
[ 1.809241] sensor_register_slave:lsm303d,id=22
[ 1.809486] sensor_register_slave:gs_mc3230,id=23
[ 1.809707] [Gsensor] gsensor_init
[ 1.809961] sensor_register_slave:mpu6880_acc,id=24
[ 1.810197] sensor_register_slave:mpu6500_acc,id=25
[ 1.810423] sensor_register_slave:lsm330_acc,id=26
[ 1.810674] sensor_register_slave:bma2xx_acc,id=27
[ 1.810912] sensor_register_slave:akm8975,id=30
[ 1.811148] sensor_register_slave:akm8963,id=31
[ 1.811385] sensor_register_slave:l3g4200d,id=45
[ 1.811621] sensor_register_slave:l3g20d,id=46
[ 1.811860] sensor_register_slave:ewtsa,id=47
[ 1.812097] sensor_register_slave:lsm330_gyro,id=51
[ 1.812334] sensor_register_slave:cm3217,id=53
[ 1.812571] sensor_register_slave:cm3218,id=54
[ 1.812808] sensor_register_slave:ls_stk3410,id=62
[ 1.813044] sensor_register_slave:ps_stk3410,id=67
[ 1.816034] i2c /dev entries driver
[ 1.820362] fan53555-regulator 0-0040: FAN53555 Option[8] Rev[1] Detected!
[ 1.820699] fan53555-reg: supplied by vcc5v0_sys
[ 1.825302] fan53555-regulator 0-0041: FAN53555 Option[8] Rev[1] Detected!
[ 1.825461] fan53555-reg: supplied by vcc5v0_sys
[ 1.828709] rockchip-pinctrl pinctrl: pin gpio1-18 already requested by 0-0040; cannot claim for 0-001b
[ 1.828757] rockchip-pinctrl pinctrl: pin-50 (0-001b) status -22
[ 1.828817] rockchip-pinctrl pinctrl: could not request pin 50 (gpio1-18) from group pmic-dvs2 on device rockchip-pinctrl
[ 1.828851] rk808 0-001b: Error applying setting, reverse things back
[ 1.829510] rk808 0-001b: Pmic Chip id: 0x0
[ 1.834581] rk808-regulator rk808-regulator: there is no dvs0 gpio
[ 1.834767] rk808-regulator rk808-regulator: there is no dvs1 gpio
[ 1.834985] DCDC_REG1: supplied by vcc3v3_sys
[ 1.836425] DCDC_REG2: supplied by vcc3v3_sys
[ 1.837583] DCDC_REG3: supplied by vcc3v3_sys
[ 1.838345] DCDC_REG4: supplied by vcc3v3_sys
[ 1.839320] LDO_REG1: supplied by vcc3v3_sys
[ 1.841073] LDO_REG2: supplied by vcc3v3_sys
[ 1.842553] LDO_REG3: supplied by vcc3v3_sys
[ 1.844161] LDO_REG4: supplied by vcc3v3_sys
[ 1.845357] vcc_sd: Failed to create debugfs directory
[ 1.845586] LDO_REG5: supplied by vcc3v3_sys
[ 1.847162] LDO_REG6: supplied by vcc3v3_sys
[ 1.848693] LDO_REG7: supplied by vcc3v3_sys
[ 1.850256] LDO_REG8: supplied by vcc3v3_sys
[ 1.851839] SWITCH_REG1: supplied by vcc3v3_sys
[ 1.852558] SWITCH_REG2: supplied by vcc3v3_sys
[ 1.853733] firefly_hwversion_in_range 愹?

liangfeng · June 23, 2021, 7:25am

[ 1.858017] rk808-rtc rk808-rtc: rtc core: registered rk808-rtc as rtc0
[ 1.859038] rk3x-i2c ff3c0000.i2c: Initialized RK3xxx I2C bus at ffffff8009ad6000
[ 1.860647] rk3x-i2c ff110000.i2c: Initialized RK3xxx I2C bus at ffffff8009ad8000
[ 1.861918] rk3x-i2c ff3d0000.i2c: Initialized RK3xxx I2C bus at ffffff8009ada000
[ 1.864429] IR NEC protocol handler initialized
[ 1.864487] IR RC5(x/sz) protocol handler initialized
[ 1.864510] IR RC6 protocol handler initialized
[ 1.864560] IR JVC protocol handler initialized
[ 1.864594] IR Sony protocol handler initialized
[ 1.864616] IR SANYO protocol handler initialized
[ 1.864636] IR Sharp protocol handler initialized
[ 1.864658] IR MCE Keyboard/mouse protocol handler initialized
[ 1.864679] IR XMP protocol handler initialized
[ 1.865273] usbcore: registered new interface driver uvcvideo
[ 1.865312] USB Video Class driver (1.1.1)
[ 1.865338] CamSys driver version: v0.48.2, CamSys head file version: v1.0.0
[ 1.876074] __power_supply_register: Expected proper parent device for ‘test_ac’
[ 1.876482] __power_supply_register: Expected proper parent device for ‘test_battery’
[ 1.877206] thermal thermal_zone2: power_allocator: sustainable_power will be estimated
[ 1.877502] __power_supply_register: Expected proper parent device for ‘test_usb’
\0\0\0\0 00 \0Bb@@Bd @HNBN@@0\0\0Ld@H@@\0@H\0 & 0"$ &\0\0b@\0@H\0N\08 \0R\0\0\0\0 00$ 0\0@@d@B@H@``@0\0@d@L0\0d@b@NL\0 "\0\0\0\0\0 00$0 0\0@@d@B@H@``@0\0@NBH0\0 " @NBH\0\0 0\0\0@L@@@H@b@@0\0@H@@d@H\0@@@@BNH\0\0\0\0\0 00& 0\0\0H@NN@0\0\0\0\0\0\0\0\0\0@@d@\0d@\0 "\0\0\0\0\0 00& 0\0\0H@NN@0\0\0\0\0\0\0\0\0\0N`NBNH\0\0 \0`@F@b`@`@@\0\0\0\0\0 00& "0\0\0H`@`NN`@0\0\0\0\0\0\0\0\0\0NNBNH\0\0@F@b@@@\0\0\0\0\0 00& $ \0B@b@0\0\0\0\0\0\0\0\0\0\0\0\00\0 & 0\0\0\0\0\0\0$p\0\0\0\0\0 00& 0"\0B@b@0\0AHDB\0\0H@NN@\0@\0\0@@d@\0HN@H@\0@L@\0d@b@NL\0 \0\0\0\0\0 00&" \0B@b@0\0\0@F@b@\0b@\0B@@\0@@d@B@\0@L@D@B@\0DN\0\0\0\0@@d@\0\0\0\0\0 00&0 \0b@BN@0\0@F@b@@@\0L@f\0@L@D@B@\0@@d@\0B@b@\0\0\0\0\0 0000 \0B\0B 0\0@@L8 \0\0\0\0\0 000 \0B\0B 0\0H@@B@F@8 \0\0\0\0\0 0 $$\0B\0B 0\0@H8 &&&\0dH8 " $\0\0 " 0 \0\0$$\0\0\0\0\0\0 0 " “\0B\0B 0\0dHdNH`b@H8 \0\0 \0\0 0 " \0B\0B 0\0@@LbB@H@8” \0\0\0\0\0 0 "&'0\0B\0B 0\0@HL8 R\0\0\0\0 0 “0 &\0B\0B 0\0H@@B@F@8” \0

liangfeng · June 23, 2021, 7:27am

每次都是启动到这个地方出现乱码（不论是修改前还是修改后）。

jpchen · June 23, 2021, 8:24am

liangfeng 发表于 2021-6-23 15:27
每次都是启动到这个地方出现乱码（不论是修改前还是修改后）。

SDK里面已经包含jd4 的dtsi 不需要再修改了，直接编译后就可以使用，按照官方wiki编译

liangfeng · June 23, 2021, 12:44pm

我们是要找出为什么对应rk3399-firefly-aio.dtsi 文件的机器的系统固件烧录到对应rk3399-firefly-aiojd4.dtsi 文件的机器的核心板上后，会出现以上串口打印乱码的情况。
如果你知道，请告诉我们，谢谢了！
我们最终的目的是要把自己的系统固件烧录到 core-3399-jd4核心板上。目前，我们的系统固件烧录到core-3399-jd4核心板上也出现以上串口打印乱码的情况。因此想通过对比以上两个机器的DTS及其相关的文件来找到出现串口打印乱码的原因，从而来修改我们自己的代码。

user4280 · December 7, 2021, 10:02am

是什么问题导致的

user4280 · December 7, 2021, 12:03pm

请问你这个git rebase FETCH_HEAD 出错是怎么解决的呢，我现在用rk3568的sdk也是一直提示这个，用git status提示一堆修改的文件