SolidRun / lx2160a_build

Scripts to build basic images for LX2160A COM express type 7 modules
58 stars 47 forks source link

error: patch failed: drivers/usb/dwc3/core.h:249 #51

Closed outbackdingo closed 3 years ago

outbackdingo commented 3 years ago

Processing triggers for libgdk-pixbuf2.0-0:amd64 (2.38.1+dfsg-1) ... Removing intermediate container c5bac0ae16a2 ---> c5168fba4d4c Step 4/6 : WORKDIR /work ---> Running in 1ebea26140e4 Removing intermediate container 1ebea26140e4 ---> e5355a71d615 Step 5/6 : COPY entry.sh / ---> 5da82cb046b0 Step 6/6 : ENTRYPOINT ["/bin/sh", "/entry.sh"] ---> Running in e11c105d0157 Removing intermediate container e11c105d0157 ---> 911979673ce0 Successfully built 911979673ce0 Successfully tagged lx2160a_build:latest dingo@gitlab:~/lx2160a_build$ docker run -i -t -v "$PWD":/work lx2160a_build $(id -u) $(id -g) Adding user build' to groupsudo' ... Adding user build to group sudo Done. Checking all required tools are installed Building boot loader Cloing https://source.codeaurora.org/external/qoriq/qoriq-components/atf release LSDK-20.04 Cloning into 'atf'... remote: Enumerating objects: 792, done. remote: Counting objects: 100% (792/792), done. remote: Compressing objects: 100% (630/630), done. remote: Total 82055 (delta 418), reused 340 (delta 148), pack-reused 81263 Receiving objects: 100% (82055/82055), 17.55 MiB | 1.25 MiB/s, done. Resolving deltas: 100% (54407/54407), done. Note: checking out '7d748e6f0ec652ba7c43733dc67a3d0b0217390a'.

You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

Checking out files: 100% (1449/1449), done. Cloning into 'ddr-phy-binary'... remote: Enumerating objects: 30, done. remote: Counting objects: 100% (30/30), done. remote: Compressing objects: 100% (21/21), done. remote: Total 60 (delta 20), reused 17 (delta 9), pack-reused 30 Unpacking objects: 100% (60/60), done. CC fiptool.c CC tbbr_config.c LD fiptool

Built fiptool successfully

Applying: plat/nxp: Add lx2160acex7 module support .git/rebase-apply/patch:165: trailing whitespace.

define DDRC_NUM_DIMM 1

.git/rebase-apply/patch:309: trailing whitespace.

endif

.git/rebase-apply/patch:346: trailing whitespace. /* .git/rebase-apply/patch:116: new blank line at EOF. + warning: 4 lines add whitespace errors. Applying: plat/nxp: lx2160a auto boot Applying: lx2160acex7: assert SUS_S5# GPIO to poweroff the COM Cloing https://source.codeaurora.org/external/qoriq/qoriq-components/rcw release LSDK-20.04 Cloning into 'rcw'... remote: Enumerating objects: 566, done. remote: Counting objects: 100% (566/566), done. remote: Compressing objects: 100% (255/255), done. remote: Total 7656 (delta 367), reused 458 (delta 299), pack-reused 7090 Receiving objects: 100% (7656/7656), 1000.17 KiB | 1.23 MiB/s, done. Resolving deltas: 100% (4946/4946), done. Note: checking out 'e0fab6d9b61003caef577f7474c2fac61e6ba2ff'.

You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

Checking out files: 100% (736/736), done. Applying: lx2160acex7 misc RCW files .git/rebase-apply/patch:83: new blank line at EOF. + .git/rebase-apply/patch:342: new blank line at EOF. + .git/rebase-apply/patch:550: new blank line at EOF. + .git/rebase-apply/patch:576: new blank line at EOF. + .git/rebase-apply/patch:602: new blank line at EOF. + warning: 5 lines add whitespace errors. Applying: Set io pads as GPIO Applying: S2 - enable gen3, xspi increase divisor to 28 Applying: refactor a009531, a008851 and a011270 .git/rebase-apply/patch:59: trailing whitespace. jumpc 0x00000034,0x00000000 .git/rebase-apply/patch:67: trailing whitespace. jumpc 0x00000034,0x00000000 .git/rebase-apply/patch:75: trailing whitespace. jumpc 0x00000044,0x00000000 .git/rebase-apply/patch:85: trailing whitespace. jumpc 0x00000034,0x00000000 .git/rebase-apply/patch:93: trailing whitespace. jumpc 0x00000044,0x00000000 warning: squelched 1 whitespace error warning: 6 lines add whitespace errors. Applying: lx2160a: add SVR check for a050234 to apply only on rev1 Applying: lx2160acex7 - pcie workarounds and fan full speed Applying: lx2160a: add generic bootloc section .git/rebase-apply/patch:94: new blank line at EOF. + warning: 1 line adds whitespace errors. Applying: lx2160acex7: remove all predefined RCW files Applying: lx2160acex7: remove flexspi divisor optimization Cloing https://source.codeaurora.org/external/qoriq/qoriq-components/restool release LSDK-20.04 Cloning into 'restool'... remote: Enumerating objects: 27, done. remote: Counting objects: 100% (27/27), done. remote: Compressing objects: 100% (27/27), done. remote: Total 3031 (delta 14), reused 0 (delta 0), pack-reused 3004 Receiving objects: 100% (3031/3031), 1.62 MiB | 862.00 KiB/s, done. Resolving deltas: 100% (2371/2371), done. Note: checking out 'f0cec094e4c6d1c975b377203a3bf994ba9325a9'.

You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

Cloing https://source.codeaurora.org/external/qoriq/qoriq-components/mc-utils release LSDK-20.04 Cloning into 'mc-utils'... remote: Enumerating objects: 11, done. remote: Counting objects: 100% (11/11), done. remote: Compressing objects: 100% (11/11), done. remote: Total 1346 (delta 2), reused 0 (delta 0), pack-reused 1335 Receiving objects: 100% (1346/1346), 778.16 KiB | 982.00 KiB/s, done. Resolving deltas: 100% (938/938), done. Note: checking out '8672a5f5abcd3a354dcab07e03f2a8a69b2e962d'.

You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

Applying: lx2160acex7: add 8x10G, dual 40G and dual 100G DPL/DPC files .git/rebase-apply/patch:844: new blank line at EOF. + .git/rebase-apply/patch:1361: new blank line at EOF. + .git/rebase-apply/patch:1901: new blank line at EOF. + warning: 3 lines add whitespace errors. Applying: Add CEX7 4x25Gbps support .git/rebase-apply/patch:626: new blank line at EOF. + warning: 1 line adds whitespace errors. Cloing https://source.codeaurora.org/external/qoriq/qoriq-components/linux release LSDK-20.04 Cloning into 'linux'... remote: Enumerating objects: 2328, done. remote: Counting objects: 100% (2328/2328), done. remote: Compressing objects: 100% (1033/1033), done. remote: Total 9064857 (delta 1730), reused 1514 (delta 1294), pack-reused 9062529 Receiving objects: 100% (9064857/9064857), 3.36 GiB | 3.44 MiB/s, done. Resolving deltas: 100% (7255479/7255479), done. Note: checking out '134788b16485dd9fa81988681d2365ee38633fa2'.

You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:

git checkout -b

Checking out files: 100% (67039/67039), done. Applying: arm64: dts: lx2160a: add lx2160acex7 device tree build Applying: arm64: dts: lx2160a: add lx2160acex7 device tree Applying: arm64: dts: lx2160a-cex7: add ltc3882 support Applying: arm64: dts: lx2160a-cex7: add on-module eeproms Applying: pci: hotplug: declare IDT bridge as hotpluggabl bridge Applying: pci: spr2803: quirk to fix class ID Applying: commit 7ba6b09fda5e0cb741ee56f3264665e0edc64822 error: patch failed: drivers/usb/dwc3/core.h:249 error: drivers/usb/dwc3/core.h: patch does not apply Patch failed at 0007 commit 7ba6b09fda5e0cb741ee56f3264665e0edc64822 hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". dingo@gitlab:~/lx2160a_build$ git am --show-current-patch fatal: Resolve operation not in progress, we are not resuming.

rabeeh commented 3 years ago

Just backported that patch; please pull and rebuild