-
Bug
-
Resolution: Fixed
-
Major
-
None
-
Flounder
-
None
ERROR: arm-trusted-firmware-v1.4+renesas+gitAUTOINC+3f4912a319-r0 do_patch: Command Error: 'quilt --quiltrc /w/workspace/sandbox-snapshot-master/MACHINE/m3ulcb-nogfx/label/agl-test-slave/repo-aglbuild/build-m3ulcb-nogfx/tmp/work/m3ulcb-agl-linux/arm-trusted-firmware/v1.4+renesas+gitAUTOINC+3f4912a319-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
Applying patch 0003-plat-renesas-rcar-V3M-support.patch
patching file plat/renesas/rcar/aarch64/rcar_helpers.S
Hunk #1 FAILED at 295.
1 out of 1 hunk FAILED – rejects in file plat/renesas/rcar/aarch64/rcar_helpers.S
patching file plat/renesas/rcar/bl2_cpg_init.c
Hunk #1 succeeded at 301 with fuzz 2 (offset 253 lines).
Hunk #2 succeeded at 368 with fuzz 2 (offset 55 lines).
Hunk #3 succeeded at 450 (offset 55 lines).
Hunk #4 FAILED at 408.
Hunk #5 succeeded at 487 (offset 57 lines).
Hunk #6 FAILED at 443.
2 out of 6 hunks FAILED – rejects in file plat/renesas/rcar/bl2_cpg_init.c
patching file plat/renesas/rcar/bl2_rcar_setup.c
Hunk #1 FAILED at 138.
Hunk #2 FAILED at 388.
Hunk #3 succeeded at 468 with fuzz 2 (offset 6 lines).
Hunk #4 succeeded at 529 (offset 20 lines).
Hunk #5 succeeded at 563 (offset 20 lines).
2 out of 5 hunks FAILED – rejects in file plat/renesas/rcar/bl2_rcar_setup.c
patching file plat/renesas/rcar/ddr/V3M/boot_init_dram_regdef_v3m.h
patching file plat/renesas/rcar/ddr/V3M/boot_init_dram_v3m.h
patching file plat/renesas/rcar/ddr/V3M/ddr_init_v3m.c
can't find file to patch at input line 967
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
| diff --git a/plat/renesas/rcar/ddr/boot_init_dram.c b/plat/renesas/rcar/ddr/boot_init_dram.c |
| index 7c55a04..87360a6 100644 |
| — a/plat/renesas/rcar/ddr/boot_init_dram.c |
| +++ b/plat/renesas/rcar/ddr/boot_init_dram.c -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored can't find file to patch at input line 996 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |
| diff --git a/plat/renesas/rcar/ddr/boot_init_dram_regdef.h b/plat/renesas/rcar/ddr/boot_init_dram_regdef.h |
| index 5ae7c3f..c5ebf8e 100644 |
| — a/plat/renesas/rcar/ddr/boot_init_dram_regdef.h |
| +++ b/plat/renesas/rcar/ddr/boot_init_dram_regdef.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file plat/renesas/rcar/ddr/ddr.mk Hunk #1 succeeded at 11 with fuzz 2 (offset -20 lines). patching file plat/renesas/rcar/drivers/board/board.c Hunk #1 FAILED at 37. 1 out of 1 hunk FAILED – rejects in file plat/renesas/rcar/drivers/board/board.c patching file plat/renesas/rcar/drivers/rom/rom_api.c Hunk #1 succeeded at 27 (offset -25 lines). Hunk #2 succeeded at 42 (offset -25 lines). Hunk #3 succeeded at 63 (offset -25 lines). Hunk #4 succeeded at 113 (offset -25 lines). patching file plat/renesas/rcar/drivers/scif/scif.S Hunk #1 succeeded at 17 (offset -23 lines). Hunk #2 succeeded at 157 (offset -19 lines). Hunk #3 succeeded at 262 (offset -4 lines). Hunk #4 succeeded at 320 (offset 13 lines). patching file plat/renesas/rcar/include/bl2_dma_register.h Hunk #1 succeeded at 7 (offset -25 lines). patching file plat/renesas/rcar/pfc/V3M/pfc_init_v3m.c patching file plat/renesas/rcar/pfc/V3M/pfc_init_v3m.h patching file plat/renesas/rcar/pfc/pfc.mk Hunk #1 succeeded at 9 (offset -25 lines). Hunk #2 succeeded at 25 with fuzz 2 (offset -22 lines). Hunk #3 succeeded at 48 with fuzz 2 (offset -20 lines). patching file plat/renesas/rcar/pfc/pfc_init.c Hunk #1 succeeded at 14 (offset -25 lines). Hunk #2 succeeded at 29 with fuzz 2 (offset -22 lines). Hunk #3 succeeded at 39 with fuzz 2 (offset -22 lines). Hunk #4 succeeded at 84 (offset -24 lines). Hunk #5 succeeded at 132 with fuzz 1 (offset -20 lines). Hunk #6 FAILED at 200. 1 out of 6 hunks FAILED – rejects in file plat/renesas/rcar/pfc/pfc_init.c patching file plat/renesas/rcar/platform.mk Hunk #1 FAILED at 112. Hunk #2 succeeded at 178 (offset 1 line). 1 out of 2 hunks FAILED – rejects in file plat/renesas/rcar/platform.mk patching file plat/renesas/rcar/qos/V3M/qos_init_v3m.c patching file plat/renesas/rcar/qos/V3M/qos_init_v3m.h patching file plat/renesas/rcar/qos/qos.mk Hunk #1 succeeded at 12 (offset -24 lines). Hunk #2 succeeded at 29 with fuzz 2 (offset -21 lines). Hunk #3 succeeded at 71 with fuzz 1 (offset -13 lines). patching file plat/renesas/rcar/qos/qos_init.c Hunk #1 succeeded at 16 (offset -25 lines). Hunk #2 succeeded at 33 with fuzz 2 (offset -22 lines). Hunk #3 succeeded at 43 with fuzz 2 (offset -22 lines). Hunk #4 succeeded at 125 (offset -9 lines). Hunk #5 FAILED at 198. 1 out of 5 hunks FAILED – rejects in file plat/renesas/rcar/qos/qos_init.c patching file plat/renesas/rcar/rcar_def.h Hunk #1 succeeded at 205 with fuzz 2 (offset -50 lines). Patch 0003-plat-renesas-rcar-V3M-support.patch does not apply (enforce with -f) ERROR: arm-trusted-firmware-v1.4+renesas+gitAUTOINC+3f4912a319-r0 do_patch: Function failed: patch_do_patch |