summaryrefslogtreecommitdiff
path: root/arch/sandbox
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2018-08-08 03:54:16 -0600
committerTom Rini <trini@konsulko.com>2018-08-23 16:17:41 -0400
commit7bf07cf872c39f4998c92ec3248573ffdbe72e22 (patch)
treea35b4ddae23afc589f264c4f5ea9e1243a603d1f /arch/sandbox
parent2418734ed429058b396d2aeb6b91f875cdc8e4ce (diff)
Partially revert "efi_loader: Rename sections to allow for implicit data"
This partially reverts commit 7e21fbca26d18327cf7cabaad08df276a06a07d8. That change broke sandbox EFI support for unknown reasons. It also changes sandbox to use--gc-sections which we don't want. For now I am just reverting the sandbox portion as presumably this change is safe on other architectures. Fixes: 7e21fbca26 (efi_loader: Rename sections to allow for implicit data) Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox')
-rw-r--r--arch/sandbox/config.mk3
-rw-r--r--arch/sandbox/cpu/u-boot.lds9
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index 5e7077bfe7..2babcde881 100644
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -5,9 +5,6 @@ PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE
PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM
PLATFORM_LIBS += -lrt
-LDFLAGS_FINAL += --gc-sections
-PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
-
# Define this to avoid linking with SDL, which requires SDL libraries
# This can solve 'sdl-config: Command not found' errors
ifneq ($(NO_SDL),)
diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds
index 40c2214301..6a26c27e8e 100644
--- a/arch/sandbox/cpu/u-boot.lds
+++ b/arch/sandbox/cpu/u-boot.lds
@@ -22,9 +22,8 @@ SECTIONS
}
.efi_runtime : {
- *(.text.efi_runtime*)
- *(.rodata.efi_runtime*)
- *(.data.efi_runtime*)
+ *(efi_runtime_text)
+ *(efi_runtime_data)
}
.__efi_runtime_stop : {
@@ -37,8 +36,8 @@ SECTIONS
}
.efi_runtime_rel : {
- *(.rel*.efi_runtime)
- *(.rel*.efi_runtime.*)
+ *(.relefi_runtime_text)
+ *(.relefi_runtime_data)
}
.efi_runtime_rel_stop :