tools/imagetool: remove linker script

Commit a93648d197df48fa46dd55f925ff70468bd81c71 introduced linker generated
lists for imagetool which is the base for some host tools (mkimage, dumpimage,
et al.).  Unfortunately some host tool chains do not support the used type of
linker scripts. Therefore this commit broke these host-tools for them, namely
FreeBSD and Darwin (OS/X).

This commit tries to fix this. In order to have a clean distinction between host
and embedded code space we need to introduce our own linker generated list
instead of re-using the available linker_lists.h provided functionality.  So we
copy the implementation used in linux kernel script/mod/file2alias.c which has
the very same problem (cause it is a host tool). This code also comes with an
abstraction for Mach-O binary format used in Darwin systems.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>

diff --git a/Makefile b/Makefile
index e0d9fb89b2ed77b6cafb2e74f4ab386e29498a73..72fedc22dd538bf72f38ee68791bd30080800ab6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -281,6 +281,11 @@ os_x_before        = $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
 HOSTCC       = $(call os_x_before, 10, 5, "cc", "gcc")
 HOSTCFLAGS  += $(call os_x_before, 10, 4, "-traditional-cpp")
 HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
 HOSTCC       = $(call os_x_before, 10, 5, "cc", "gcc")
 HOSTCFLAGS  += $(call os_x_before, 10, 4, "-traditional-cpp")
 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
+HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie")

 endif
 
 # Decide whether to build built-in, modular, or both.
 endif
 
 # Decide whether to build built-in, modular, or both.

diff --git a/tools/Makefile b/tools/Makefile
index 51c1c86e4832d9060454fe62dd5befe09462abb5..fb0033d6beb60140aa620e35d1e85f8115d9b0af 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -128,8 +128,6 @@ HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)
 HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage)
 HOSTLOADLIBES_fit_check_sign := $(HOSTLOADLIBES_mkimage)
 
 HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage)
 HOSTLOADLIBES_fit_check_sign := $(HOSTLOADLIBES_mkimage)
 

-HOSTLDFLAGS += -T $(srctree)/tools/imagetool.lds
-

 hostprogs-$(CONFIG_EXYNOS5250) += mkexynosspl
 hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl
 HOSTCFLAGS_mkexynosspl.o := -pedantic
 hostprogs-$(CONFIG_EXYNOS5250) += mkexynosspl
 hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl
 HOSTCFLAGS_mkexynosspl.o := -pedantic

diff --git a/tools/imagetool.c b/tools/imagetool.c
index 148e4662b7b366e2b2400639aa733b59e747865f..4b0b73db5277a07629bc306156b37f12ae440d82 100644 (file)
--- a/tools/imagetool.c
+++ b/tools/imagetool.c
@@ -12,16 +12,16 @@
 
 struct image_type_params *imagetool_get_type(int type)
 {
 
 struct image_type_params *imagetool_get_type(int type)
 {

-       struct image_type_params *curr;
-       struct image_type_params *start = ll_entry_start(
-                       struct image_type_params, image_type);
-       struct image_type_params *end = ll_entry_end(
-                       struct image_type_params, image_type);
+       struct image_type_params **curr;
+       INIT_SECTION(image_type);
+
+       struct image_type_params **start = __start_image_type;
+       struct image_type_params **end = __stop_image_type;

 
        for (curr = start; curr != end; curr++) {
 
        for (curr = start; curr != end; curr++) {

-               if (curr->check_image_type) {
-                       if (!curr->check_image_type(type))
-                               return curr;
+               if ((*curr)->check_image_type) {
+                       if (!(*curr)->check_image_type(type))
+                               return *curr;

                }
        }
        return NULL;
                }
        }
        return NULL;


@@ -34,16 +34,15 @@ int imagetool_verify_print_header(
        struct image_tool_params *params)
 {
        int retval = -1;
        struct image_tool_params *params)
 {
        int retval = -1;

-       struct image_type_params *curr;
+       struct image_type_params **curr;
+       INIT_SECTION(image_type);

 
 

-       struct image_type_params *start = ll_entry_start(
-                       struct image_type_params, image_type);
-       struct image_type_params *end = ll_entry_end(
-                       struct image_type_params, image_type);
+       struct image_type_params **start = __start_image_type;
+       struct image_type_params **end = __stop_image_type;

 
        for (curr = start; curr != end; curr++) {
 
        for (curr = start; curr != end; curr++) {

-               if (curr->verify_header) {
-                       retval = curr->verify_header((unsigned char *)ptr,
+               if ((*curr)->verify_header) {
+                       retval = (*curr)->verify_header((unsigned char *)ptr,

                                                     sbuf->st_size, params);
 
                        if (retval == 0) {
                                                     sbuf->st_size, params);
 
                        if (retval == 0) {


@@ -51,12 +50,12 @@ int imagetool_verify_print_header(
                                 * Print the image information  if verify is
                                 * successful
                                 */
                                 * Print the image information  if verify is
                                 * successful
                                 */

-                               if (curr->print_header) {
-                                       curr->print_header(ptr);
+                               if ((*curr)->print_header) {
+                                       (*curr)->print_header(ptr);

                                } else {
                                        fprintf(stderr,
                                                "%s: print_header undefined for %s\n",
                                } else {
                                        fprintf(stderr,
                                                "%s: print_header undefined for %s\n",

-                                               params->cmdname, curr->name);
+                                               params->cmdname, (*curr)->name);

                                }
                                break;
                        }
                                }
                                break;
                        }

diff --git a/tools/imagetool.h b/tools/imagetool.h
index f35dec71c7190a4b82e817315e998c561f5e064a..3e15b4e22b9a0086c57d3bb6c61a2abe35838a31 100644 (file)
--- a/tools/imagetool.h
+++ b/tools/imagetool.h
@@ -20,15 +20,6 @@
 #include <unistd.h>
 #include <u-boot/sha1.h>
 
 #include <unistd.h>
 #include <u-boot/sha1.h>
 

-/* define __KERNEL__ in order to get the definitions
- * required by the linker list. This is probably not
- * the best way to do this */
-#ifndef __KERNEL__
-#define __KERNEL__
-#include <linker_lists.h>
-#undef __KERNEL__
-#endif /* __KERNEL__ */
-

 #include "fdt_host.h"
 
 #define ARRAY_SIZE(x)          (sizeof(x) / sizeof((x)[0]))
 #include "fdt_host.h"
 
 #define ARRAY_SIZE(x)          (sizeof(x) / sizeof((x)[0]))


@@ -194,6 +185,46 @@ int imagetool_save_subimage(
 
 void pbl_load_uboot(int fd, struct image_tool_params *mparams);
 
 
 void pbl_load_uboot(int fd, struct image_tool_params *mparams);
 

+#define ___cat(a, b) a ## b
+#define __cat(a, b) ___cat(a, b)
+
+/* we need some special handling for this host tool running eventually on
+ * Darwin. The Mach-O section handling is a bit different than ELF section
+ * handling. The differnces in detail are:
+ *  a) we have segments which have sections
+ *  b) we need a API call to get the respective section symbols */
+#if defined(__MACH__)
+#include <mach-o/getsect.h>
+
+#define INIT_SECTION(name)  do {                                       \
+               unsigned long name ## _len;                             \
+               char *__cat(pstart_, name) = getsectdata("__TEXT",      \
+                       #name, &__cat(name, _len));                     \
+               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)))
+
+struct image_type_params **__start_image_type, **__stop_image_type;
+#else
+#define INIT_SECTION(name) /* no-op for ELF */
+#define SECTION(name)   __attribute__((section(#name)))
+
+/* We construct a table of pointers in an ELF section (pointers generally
+ * go unpadded by gcc).  ld creates boundary syms for us. */
+extern struct image_type_params *__start_image_type[], *__stop_image_type[];
+#endif /* __MACH__ */
+
+#if !defined(__used)
+# if __GNUC__ == 3 && __GNUC_MINOR__ < 3
+#  define __used                       __attribute__((__unused__))
+# else
+#  define __used                       __attribute__((__used__))
+# endif
+#endif
+

 #define U_BOOT_IMAGE_TYPE( \
                _id, \
                _name, \
 #define U_BOOT_IMAGE_TYPE( \
                _id, \
                _name, \


@@ -208,7 +239,8 @@ void pbl_load_uboot(int fd, struct image_tool_params *mparams);
                _fflag_handle, \
                _vrec_header \
        ) \
                _fflag_handle, \
                _vrec_header \
        ) \

-       ll_entry_declare(struct image_type_params, _id, image_type) = { \
+       static struct image_type_params __cat(image_type_, _id) = \
+       { \

                .name = _name, \
                .header_size = _header_size, \
                .hdr = _header, \
                .name = _name, \
                .header_size = _header_size, \
                .hdr = _header, \


@@ -220,6 +252,8 @@ void pbl_load_uboot(int fd, struct image_tool_params *mparams);
                .check_image_type = _check_image_type, \
                .fflag_handle = _fflag_handle, \
                .vrec_header = _vrec_header \
                .check_image_type = _check_image_type, \
                .fflag_handle = _fflag_handle, \
                .vrec_header = _vrec_header \

-       }
+       }; \
+       static struct image_type_params *SECTION(image_type) __used \
+               __cat(image_type_ptr_, _id) = &__cat(image_type_, _id)

 
 #endif /* _IMAGETOOL_H_ */
 
 #endif /* _IMAGETOOL_H_ */

diff --git a/tools/imagetool.lds b/tools/imagetool.lds
deleted file mode 100644 (file)
index 7e92b4a..0000000
--- a/tools/imagetool.lds
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2011-2012 The Chromium OS Authors.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-SECTIONS
-{
-
-       . = ALIGN(4);
-       .u_boot_list : {
-               KEEP(*(SORT(.u_boot_list*)));
-       }
-
-       __u_boot_sandbox_option_start = .;
-       _u_boot_sandbox_getopt : { *(.u_boot_sandbox_getopt) }
-       __u_boot_sandbox_option_end = .;
-
-       __bss_start = .;
-}
-
-INSERT BEFORE .data;