diff options
| author | Huangbin Zhan <zhanhb88@gmail.com> | 2021-11-26 08:38:31 +0800 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2021-12-27 13:51:41 +0100 |
| commit | b6385a36680b6924239cbc6766a253cab45db8d9 (patch) | |
| tree | 2f7d0b90461ed2478538bd89a6357ff6e8ad0b8c /tools/mkimage/patches/090-macos-arm64-builing-fix.patch | |
| parent | a0ad1f36f0afe5c29dde6a66bd5d89fa4842874f (diff) | |
| download | upstream-b6385a36680b6924239cbc6766a253cab45db8d9.tar.gz upstream-b6385a36680b6924239cbc6766a253cab45db8d9.tar.bz2 upstream-b6385a36680b6924239cbc6766a253cab45db8d9.zip | |
tools/mkimage: update to 2021.10
Changelog:
- upstream now needs OpenSSL in order to be able to sign FITs. See:
commit cb9faa6f98ae ("tools: Use a single target-independent config to enable OpenSSL")
- removes upstream patches.
Link: https://github.com/u-boot/u-boot/commit/cb9faa6f98ae56d70d59505dad290dd3d381cb7b
Tested-by: Sergey V. Lobanov <sergey@lobanov.in>
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'tools/mkimage/patches/090-macos-arm64-builing-fix.patch')
| -rw-r--r-- | tools/mkimage/patches/090-macos-arm64-builing-fix.patch | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/tools/mkimage/patches/090-macos-arm64-builing-fix.patch b/tools/mkimage/patches/090-macos-arm64-builing-fix.patch index 216a8abd35..9f842146f7 100644 --- a/tools/mkimage/patches/090-macos-arm64-builing-fix.patch +++ b/tools/mkimage/patches/090-macos-arm64-builing-fix.patch @@ -2,27 +2,9 @@ This patch fixes compilation issues on MacOS arm64. Based on discussion https://github.com/u-boot/u-boot/commit/3b142045e8a7f0ab17b6099e9226296af45967d0 -diff --git a/Makefile b/Makefile -index b4f1cbc..551041f 100644 ---- a/Makefile -+++ b/Makefile -@@ -324,11 +324,6 @@ HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") - KBUILD_HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") - KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") - --# since Lion (10.7) ASLR is on by default, but we use linker generated lists --# in some host tools which is a problem then ... so disable ASLR for these --# tools --KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie") -- - # macOS Mojave (10.14.X) - # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" - KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") -diff --git a/tools/imagetool.h b/tools/imagetool.h -index 8726792..d1b72ef 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h -@@ -270,17 +270,20 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); +@@ -272,11 +272,14 @@ int rockchip_copy_image(int fd, struct i * b) we need a API call to get the respective section symbols */ #if defined(__MACH__) #include <mach-o/getsect.h> @@ -30,18 +12,10 @@ index 8726792..d1b72ef 100644 #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ -- char *__cat(pstart_, name) = getsectdata("__TEXT", \ -+ char *__cat(pstart_, name) = getsectdata("__DATA", \ + char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ + __cat(pstart_, name) += \ + _dyld_get_image_vmaddr_slide(0); \ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ - __cat(__stop_, name) = (void *)__cat(pstop_, name); \ - } while (0) --#define SECTION(name) __attribute__((section("__TEXT, " #name))) -+#define SECTION(name) __attribute__((section("__DATA, " #name))) - - struct image_type_params **__start_image_type, **__stop_image_type; - #else |