x86, galileo: Add UEFI support
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.
This commit is contained in:
Michael LeMay
Jesus Sanchez-Palencia
parent
b915e7d5e3
commit
f85654a82f
9 changed files with 240 additions and 16 deletions
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -71,6 +71,12 @@ You can also build a "Release" image by setting the BUILD_RELEASE variable to
|
|||
$ cd examples/hello-world/ && make TARGET=galileo BUILD_RELEASE=1
|
||||
```
|
||||
|
||||
To also generate an '<application>.galileo.efi' file which is a UEFI [4] image,
|
||||
you can run the following command prior to building applications:
|
||||
```
|
||||
$ cpu/x86/uefi/build_uefi.sh
|
||||
```
|
||||
|
||||
Running
|
||||
-------
|
||||
|
||||
|
|
@ -90,6 +96,8 @@ detailed instructions.
|
|||
|
||||
Mount the sdcard in directory /mnt/sdcard.
|
||||
|
||||
#### Approach for Multiboot-compliant ELF Image
|
||||
|
||||
Copy Contiki binary image to sdcard
|
||||
```
|
||||
$ cp examples/hello-world/hello-world.galileo /mnt/sdcard
|
||||
|
|
@ -100,6 +108,13 @@ Copy grub binary to sdcard
|
|||
$ cp platform/galileo/bsp/grub/bin/grub.efi /mnt/sdcard
|
||||
```
|
||||
|
||||
#### Approach for UEFI Image
|
||||
|
||||
Copy Contiki binary image to sdcard
|
||||
```
|
||||
$ cp examples/hello-world/hello-world.galileo.efi /mnt/sdcard
|
||||
```
|
||||
|
||||
### Connect to the console output
|
||||
|
||||
Connect the serial cable to your computer as shown in [2].
|
||||
|
|
@ -117,8 +132,11 @@ Press [Enter] to directly boot.
|
|||
Press [F7] to show boot menu options.
|
||||
```
|
||||
|
||||
Press <F7> and select the option "UEFI Internal Shell" within the menu. Once
|
||||
you have a shell, run the following commands to run grub application:
|
||||
Press <F7> and select the option "UEFI Internal Shell" within the menu.
|
||||
|
||||
#### Boot Multiboot-compliant ELF Image
|
||||
|
||||
Once you have a shell, run the following commands to run grub application:
|
||||
```
|
||||
$ fs0:
|
||||
$ grub.efi
|
||||
|
|
@ -131,6 +149,16 @@ $ multiboot /hello-world.galileo
|
|||
$ boot
|
||||
```
|
||||
|
||||
#### Boot UEFI Image
|
||||
|
||||
Once you have a shell, run the following commands to boot Contiki image:
|
||||
```
|
||||
$ fs0:
|
||||
$ hello-world.galileo.efi
|
||||
```
|
||||
|
||||
### Verify that Contiki is Running
|
||||
|
||||
This should boot the Contiki image, resulting in the following messages being
|
||||
sent to the serial console:
|
||||
```
|
||||
|
|
@ -176,3 +204,5 @@ References
|
|||
[2] http://www.intel.com/support/galileo/sb/CS-035124.htm
|
||||
|
||||
[3] https://www.gnu.org/software/grub/manual/multiboot/multiboot.html
|
||||
|
||||
[4] http://www.uefi.org/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue