Skip to content

Commit

Permalink
[WIP] bsp: u-boot-ti-staging: drop failing patches
Browse files Browse the repository at this point in the history
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
  • Loading branch information
quaresmajose committed Jul 16, 2024
1 parent 6ffc7a5 commit b31d5de
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 283 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ include recipes-bsp/u-boot/u-boot-lmp-common.inc

SRC_URI:append = " \
${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', 'file://0003-HACK-lib-lmb-Allow-re-reserving-post-relocation-U-Bo.patch', '', d)} \
file://lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch \
file://k3-accept-filesystem-path-to-the-RoT-key.patch \
file://k3-set-env-variable-device_type.patch \
"

SRC_URI:append:am64xx-evm = " \
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit b31d5de

Please sign in to comment.