diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-05-21 10:00:00 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-05-22 20:14:17 +0000 |
| commit | 44aca959440ec33f9ad0faaad9db3f3f77d4dfc1 (patch) | |
| tree | 69d9575431840eba9504c7462f5a7ea87cd76367 /meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch | |
| parent | c05762b781b5fb7b4f6139ea1a6d5a9b9d72de7a (diff) | |
meta-agl-bsp: fix up unmatched build
Changes:
- Remove U-Boot patch and associated bbappend that were required
to build with kirkstone, they are no longer required.
- Remove LAYERSERIES_COMPAT tweak that was being done to the
meta-sifive layer as it is no longer required.
Bug-AGL: SPEC-5145
Change-Id: Id729fe08d8b5e962636bbfa2db9538c40afabda5
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29907
ci-image-build: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Diffstat (limited to 'meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch')
| -rw-r--r-- | meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch b/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch deleted file mode 100644 index 7fce516f0..000000000 --- a/meta-agl-bsp/meta-sifive/recipes-bsp/u-boot/files/0001-WIP-Make-BSP-work-under-YP-kirkstone.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 57575ce80a96411bce828be6fc84ebd2ed003810 Mon Sep 17 00:00:00 2001 -From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> -Date: Tue, 12 Sep 2023 22:50:28 +0200 -Subject: [PATCH] [WIP] Make BSP work under YP kirkstone - -This fixes build issues when using the layer with YP 'kirkstone' branch. - -check-config.sh can be solved differently as well. -binman/control.py needs a little investigation - -Upstream-Status: Inappropriate -Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> ---- - scripts/check-config.sh | 2 +- - tools/binman/control.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/check-config.sh b/scripts/check-config.sh -index cc1c9a54d9..633c69eb76 100755 ---- a/scripts/check-config.sh -+++ b/scripts/check-config.sh -@@ -57,7 +57,7 @@ if [ -s ${new_adhoc} ]; then - echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig" - echo >&2 "file and add a 'config' or 'menuconfig' option." - # Don't delete the temporary files in case they are useful -- exit 1 -+ exit 0 - else - rm ${suspects} ${ok} ${new_adhoc} - fi -diff --git a/tools/binman/control.py b/tools/binman/control.py -index 47aac207b4..3d013dea17 100644 ---- a/tools/binman/control.py -+++ b/tools/binman/control.py -@@ -8,7 +8,7 @@ - from collections import OrderedDict - import glob - import os --import pkg_resources -+#import pkg_resources - import re - - import sys --- -2.35.3 - |