forked from contiki-os/contiki
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This patch adds support for optionally building EFI binaries in addition to Multiboot ELF binaries. It includes a script, build_uefi.sh, that downloads tool and library sources from the EDK II project, builds the GenFw tool that is used to create UEFI binaries, and creates a makefile that is included from the main x86 common makefile and enables UEFI support in the Contiki build system. If the script is not run prior to building Contiki, then an informational message will be displayed with instructions for running build_uefi.sh if UEFI support is desired. This patch also adds the path to the auto-generated makefile to .gitignore. This patch modifies the linker script for the Intel Quark X1000 to account for the output file section offsets and alignment expectations of the EDK II GenFw project. This patch also adds a newlib patch to remove the weak symbol attribute from floating point stdio support routines. See <newlib>/newlib/README for an explanation of how the newlib developers intended for _printf_float and _scanf_float to be linked. Newlib declares them as weak symbols with the intention that developers would force them to be linked only when needed using a linker command line option. However, some but not all Contiki programs require them, so we cannot simply always include or exclude them. Instead, we remove the weak symbol attributes and rely on the linker to automatically determine whether or not they should be linked. This avoids an issue in which weak symbols were undefined in the intermediate DLL generated as part of the UEFI build process. That resulted in the GenFw program emitting "ERROR 3000" messages when it encountered relocations referencing such an undefined symbol. Finally, this patch updates README.md to both make some revisions to account for the UART support introduced in previous patches as well as to provide instructions for using the UEFI support.
- Loading branch information
Showing
9 changed files
with
239 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Copyright (C) 2015, Intel Corporation. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * 3. Neither the name of the copyright holder nor the names of its | ||
| * contributors may be used to endorse or promote products derived | ||
| * from this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | ||
| * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
| * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include <Uefi.h> | ||
| #include <Protocol/LoadedImage.h> | ||
|
|
||
| #define MAX_MEM_DESC 128 | ||
|
|
||
| void start(void); | ||
|
|
||
| EFI_STATUS EFIAPI | ||
| uefi_start(IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable) | ||
| { | ||
| EFI_MEMORY_DESCRIPTOR mem_map[MAX_MEM_DESC]; | ||
| UINTN mem_map_len = sizeof(mem_map); | ||
| UINTN mem_map_key; | ||
| UINTN mem_map_desc_sz; | ||
| UINT32 mem_map_rev; | ||
|
|
||
| EFI_STATUS res; | ||
|
|
||
| res = SystemTable->BootServices->GetMemoryMap(&mem_map_len, | ||
| mem_map, | ||
| &mem_map_key, | ||
| &mem_map_desc_sz, | ||
| &mem_map_rev); | ||
| if(res != EFI_SUCCESS) { | ||
| return EFI_ABORTED; | ||
| } | ||
|
|
||
| res = SystemTable->BootServices->ExitBootServices(ImageHandle, mem_map_key); | ||
| if(res != EFI_SUCCESS) { | ||
| return EFI_ABORTED; | ||
| } | ||
|
|
||
| start(); | ||
|
|
||
| /* Should not be reachable: */ | ||
| return EFI_SUCCESS; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| #!/bin/bash | ||
|
|
||
| SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) | ||
|
|
||
| # This script will always run on its own basepath, no matter where you call it from. | ||
| pushd ${SCRIPT_DIR} | ||
|
|
||
| # Download the UEFI tool and library sources: | ||
| git clone --depth=1 https://github.com/tianocore/edk2 || exit | ||
| # This script only supports building the tools on 64-bit hosts: | ||
| export ARCH=X64 | ||
| # Build common sources required by the GenFw tool: | ||
| make -C edk2/BaseTools/Source/C/Common || exit | ||
| # Build the GenFw tool that is used to generate UEFI binaries: | ||
| make -C edk2/BaseTools/Source/C/GenFw || exit | ||
| # Create a makefile that indicates to the Contiki build system that UEFI support | ||
| # should be built: | ||
| echo "EN_UEFI = 1" > Makefile.uefi | ||
|
|
||
| popd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,48 @@ | ||
| GDB ?= gdb | ||
| OPENOCD_SCRIPTS = $(CONTIKI)/platform/galileo/bsp/openocd-scripts | ||
|
|
||
| .PHONY: debug | ||
| .PHONY: debug $(CONTIKI_PROJECT) | ||
|
|
||
| debug: $(CONTIKI_PROJECT).$(TARGET) | ||
| # Multiboot ELF binary | ||
| MULTIBOOT_SFX = $(TARGET) | ||
| MULTIBOOT = $(CONTIKI_PROJECT).$(MULTIBOOT_SFX) | ||
| # UEFI binary | ||
| UEFI_DLL_SFX = $(TARGET).dll | ||
| UEFI_DLL = $(CONTIKI_PROJECT).$(UEFI_SFX) | ||
| UEFI_LDFLAGS += -Xlinker --emit-relocs -Xlinker --entry=uefi_start | ||
| UEFI_SFX = $(TARGET).efi | ||
| UEFI = $(CONTIKI_PROJECT).$(UEFI_SFX) | ||
|
|
||
| # Suffixes for final (non-intermediate) files to be built | ||
| FINAL_SFXS = $(MULTIBOOT_SFX) | ||
| ifeq ($(EN_UEFI),1) | ||
| FINAL_SFXS += $(UEFI_SFX) | ||
| endif | ||
|
|
||
| debug: $(MULTIBOOT) | ||
| @openocd -s $(OPENOCD_SCRIPTS) -f debug.cfg &> $(shell pwd)/LOG_OPENOCD & | ||
| @$(GDB) $< -ex "target remote :3333" | ||
|
|
||
| CUSTOM_RULE_LINK=1 | ||
| %.$(TARGET): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a | ||
| $(TRACE_LD) | ||
| $(Q)$(LD) $(LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} \ | ||
| ${filter %.a,$^} $(TARGET_LIBFILES) -o $@ | ||
| @$(SIZE) $@ | ||
| define LINK_template = | ||
| %.$(1): %.co $$(PROJECT_OBJECTFILES) $$(PROJECT_LIBRARIES) contiki-$$(TARGET).a | ||
| $$(TRACE_LD) | ||
| $$(Q)$$(LD) $$(LDFLAGS) $(2) $$(TARGET_STARTFILES) $${filter-out %.a,$$^} \ | ||
| $${filter %.a,$$^} $$(TARGET_LIBFILES) -o $$@ | ||
| endef | ||
|
|
||
| $(eval $(call LINK_template,$(MULTIBOOT_SFX),$(MULTIBOOT_LDFLAGS))) | ||
| $(eval $(call LINK_template,$(UEFI_DLL_SFX),$(UEFI_LDFLAGS))) | ||
|
|
||
| %.$(UEFI_SFX): %.$(UEFI_DLL_SFX) | ||
| $(Q)$(GEN_FW) -o $@ -e UEFI_APPLICATION $^ | ||
| # The Intel Galileo firmware has been observed to not relocate the image | ||
| # if its base is set to the 1M boundary. This makes debugging easier, | ||
| # since the symbols in the intermediate DLL then correspond to the load | ||
| # addresses. | ||
| $(Q)$(GEN_FW) -o $@ --rebase 0x100000 $@ | ||
|
|
||
| $(CONTIKI_PROJECT): $(addprefix $(CONTIKI_PROJECT).,$(FINAL_SFXS)) | ||
| @$(SIZE) $^ | ||
|
|
||
| CLEAN += $(addprefix $(CONTIKI_PROJECT).,$(FINAL_SFXS)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
platform/galileo/bsp/libc/patches/stdio_strengthen_syms.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| --- newlib/libc/stdio/nano-vfprintf_local.h 2014-07-04 10:21:43.000000000 -0700 | ||
| +++ newlib/libc/stdio/nano-vfprintf_local.h 2015-07-17 12:51:12.974269921 -0700 | ||
| @@ -230,5 +230,5 @@ _printf_float (struct _reent *data, | ||
| FILE *fp, | ||
| int (*pfunc)(struct _reent *, FILE *, | ||
| _CONST char *, size_t len), | ||
| - va_list *ap) _ATTRIBUTE((__weak__)); | ||
| + va_list *ap); | ||
| #endif | ||
| --- newlib/libc/stdio/nano-vfscanf_local.h 2014-07-04 10:21:44.000000000 -0700 | ||
| +++ newlib/libc/stdio/nano-vfscanf_local.h 2015-07-17 12:51:33.967362409 -0700 | ||
| @@ -173,6 +173,6 @@ _scanf_i (struct _reent *rptr, | ||
| extern int | ||
| _scanf_float (struct _reent *rptr, | ||
| struct _scan_data_t *pdata, | ||
| - FILE *fp, va_list *ap) _ATTRIBUTE((__weak__)); | ||
| + FILE *fp, va_list *ap); | ||
|
|
||
| #endif |