From 69e21d068a6d1a38fc20a80b684873fbb7093f65 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 26 Jan 2023 10:34:57 +0100 Subject: u-boot: do not use pkg-config to avoid linking error with target libs --- .../patches/bananapi_m2_p2_zero_defconfig.patch | 28 ---------------------- package/u-boot/patches/patch-tools_Makefile | 14 +++++++++++ 2 files changed, 14 insertions(+), 28 deletions(-) delete mode 100644 package/u-boot/patches/bananapi_m2_p2_zero_defconfig.patch create mode 100644 package/u-boot/patches/patch-tools_Makefile (limited to 'package/u-boot') diff --git a/package/u-boot/patches/bananapi_m2_p2_zero_defconfig.patch b/package/u-boot/patches/bananapi_m2_p2_zero_defconfig.patch deleted file mode 100644 index 4de65441a..000000000 --- a/package/u-boot/patches/bananapi_m2_p2_zero_defconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit c14386c561d59fef8e3e47085ab494e2626f04d9 -Author: Martin Thomas -Date: Mon Oct 10 15:19:03 2022 +0200 - - added default config für the banana pi zero p2 - -diff --git a/configs/bananapi_m2_p2_zero_defconfig b/configs/bananapi_m2_p2_zero_defconfig -new file mode 100644 -index 0000000000..fcd7f636a5 ---- /dev/null -+++ b/configs/bananapi_m2_p2_zero_defconfig -@@ -0,0 +1,15 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+# CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-bananapi-m2-plus-v1.2" -+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" -+CONFIG_SPL=y -+CONFIG_MACH_SUN8I_H3=y -+CONFIG_DRAM_CLK=408 -+CONFIG_MMC0_CD_PIN="" -+CONFIG_MMC_SUNXI_SLOT_EXTRA=2 -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+CONFIG_PREBOOT="" -+# CONFIG_SYS_DEVICE_NULLDEV is not set -+CONFIG_SPL_STACK=0x8000 -+CONFIG_SYS_PBSIZE=1024 -+CONFIG_SUN8I_EMAC=y -+CONFIG_USB_EHCI_HCD=y diff --git a/package/u-boot/patches/patch-tools_Makefile b/package/u-boot/patches/patch-tools_Makefile new file mode 100644 index 000000000..505ea209a --- /dev/null +++ b/package/u-boot/patches/patch-tools_Makefile @@ -0,0 +1,14 @@ +--- u-boot-2022.10.orig/tools/Makefile 2022-10-03 21:25:32.000000000 +0200 ++++ u-boot-2022.10/tools/Makefile 2023-01-26 10:01:05.399923828 +0100 +@@ -174,9 +174,9 @@ endif + # MXSImage needs LibSSL + ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_TOOLS_LIBCRYPTO),) + HOSTCFLAGS_kwbimage.o += \ +- $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") ++ $(shell echo "-lssl -lcrypto") + HOSTLDLIBS_mkimage += \ +- $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") ++ $(shell echo "-lssl -lcrypto") + + # OS X deprecate openssl in favour of CommonCrypto, supress deprecation + # warnings on those systems -- cgit v1.2.3