commit 89c2c70c28e595ef66bad7c633eebba843fa813a Author: Justin C. Miller Date: Mon Jan 2 13:40:42 2017 -0800 Initial commit - UEFI application building diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8bcdde9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +* text=auto eol=lf +*.img -text +*.fd -text +*.iso -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3a46e06 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.lock* +build +*.bak diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..502d45f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "external/gnu-efi"] + path = external/gnu-efi + url = https://github.com/justinian/gnu-efi.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5d4ad1f --- /dev/null +++ b/Makefile @@ -0,0 +1,153 @@ +ARCH ?= x86_64 + +include src/arch/$(ARCH)/config.mk + +BUILD_D := build +ARCH_D := src/arch/$(ARCH) +VERSION ?= $(shell git describe --dirty --always) + + +EFI_DIR := external/gnu-efi +EFI_DATA := $(EFI_DIR)/gnuefi +EFI_LDS := $(EFI_DATA)/elf_$(ARCH)_efi.lds +EFI_ARCH_DIR := $(EFI_DIR)/$(ARCH) +EFI_ARCH_DATA := $(EFI_ARCH_DIR)/gnuefi +EFI_CRT_OBJ := $(EFI_ARCH_DATA)/crt0-efi-$(ARCH).o +EFI_LIB := $(EFI_ARCH_DIR)/lib/libefi.a +EFI_INCLUDES := $(EFI_DIR)/inc + +DEPENDFLAGS := -MMD + +INCLUDES := -I $(ARCH_D) +INCLUDES += -I src/modules +INCLUDES += -isystem $(EFI_INCLUDES) -isystem $(EFI_INCLUDES)/$(ARCH) -isystem $(EFI_INCLUDES)/protocol + +BASEFLAGS := -O2 -fpic -nostdlib +BASEFLAGS += -ffreestanding -nodefaultlibs +BASEFLAGS += -fno-builtin -fomit-frame-pointer + +ifdef CPU +BASEFLAGS += -mcpu=$(CPU) +endif + +WARNFLAGS := -Wall -Wextra -Wshadow -Wcast-align -Wwrite-strings +WARNFLAGS += -Winline -Wshadow +WARNFLAGS += -Wno-attributes -Wno-deprecated-declarations +WARNFLAGS += -Wno-div-by-zero -Wno-endif-labels -Wfloat-equal +WARNFLAGS += -Wformat=2 -Wno-format-extra-args -Winit-self +WARNFLAGS += -Winvalid-pch -Wmissing-format-attribute +WARNFLAGS += -Wmissing-include-dirs -Wno-multichar +WARNFLAGS += -Wno-sign-compare -Wswitch -Wundef +WARNFLAGS += -Wno-pragmas #-Wno-unused-but-set-parameter +WARNFLAGS += -Wno-unused-result #-Wno-unused-but-set-variable +WARNFLAGS += -Wwrite-strings -Wdisabled-optimization -Wpointer-arith +WARNFLAGS += -Werror + +ASFLAGS ?= + +CFLAGS ?= +CFLAGS += $(INCLUDES) $(DEPENDFLAGS) $(BASEFLAGS) $(WARNFLAGS) +CFLAGS += -DGIT_VERSION="\"$(VERSION)\"" +CFLAGS += -std=c11 -fno-stack-protector -fpic -fshort-wchar -mno-red-zone +CFLAGS += -DEFI_DEBUG=0 -DEFI_DEBUG_CLEAR_MEMORY=0 -DGNU_EFI_USE_MS_ABI -DHAVE_USE_MS_ABI #-DEFI_FUNCTION_WRAPPER + +LDFLAGS ?= +LDFLAGS += -L $(BUILD_D) -ggdb +LDFLAGS += -nostdlib -znocombreloc -shared -Bsymbolic -fPIC -nostartfiles +LDFLAGS += -L $(EFI_ARCH_DIR)/lib -L $(EFI_ARCH_DIR)/gnuefi + +AS ?= $(CROSS)as +AR ?= $(CROSS)ar +CC ?= $(CROSS)gcc +CXX ?= $(CROSS)g++ +LD ?= $(CROSS)ld +OBJC := $(CROSS)objcopy +OBJD := $(CROSS)objdump + +INIT_DEP := $(BUILD_D)/.builddir +ARCH_SRCS := $(wildcard $(ARCH_D)/*.s) +ARCH_SRCS += $(wildcard $(ARCH_D)/*.c) +KOBJS += $(patsubst $(ARCH_D)/%,$(BUILD_D)/arch/%,$(patsubst %,%.o,$(ARCH_SRCS))) +DEPS := +MOD_TARGETS := + +PARTED ?= /sbin/parted +QEMU ?= qemu-system-x86_64 +GDBPORT ?= 27006 +CPUS ?= 2 +OVMF ?= assets/ovmf/x64/OVMF.fd +QEMUOPTS := -bios $(OVMF) -hda $(BUILD_D)/fs.img -smp $(CPUS) -m 512 -nographic $(QEMUEXTRA) + + +all: $(BUILD_D)/fs.img +init: $(INIT_DEP) + +$(INIT_DEP): + mkdir -p $(BUILD_D) $(patsubst %,$(BUILD_D)/d.%,$(MODULES)) + mkdir -p $(BUILD_D)/board $(BUILD_D)/arch + touch $(INIT_DEP) + +clean: + rm -rf $(BUILD_D)/* $(BUILD_D)/.version $(BUILD_D)/.builddir + +dist-clean: clean + make -C external/gnu-efi clean + +.PHONY: all clean dist-clean init + +$(BUILD_D)/.version: + echo '$(VERSION)' | cmp -s - $@ || echo '$(VERSION)' > $@ + +-include x $(patsubst %,src/modules/%/module.mk,$(MODULES)) +-include x $(DEPS) + +$(EFI_LIB): + make -C external/gnu-efi all + +$(BUILD_D)/kernel.elf: $(KOBJS) $(MOD_TARGETS) $(EFI_LIB) + $(LD) $(LDFLAGS) -T $(EFI_LDS) -o $@ \ + $(EFI_CRT_OBJ) $(KOBJS) $(patsubst %,-l%,$(MODULES)) -lefi -lgnuefi + +$(BUILD_D)/kernel.efi: $(BUILD_D)/kernel.elf + objcopy -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc \ + --target=efi-app-$(ARCH) $^ $@ + +$(BUILD_D)/kernel.debug.efi: $(BUILD_D)/kernel.elf + objcopy -j .text -j .sdata -j .data -j .dynamic \ + -j .dynsym -j .rel -j .rela -j .reloc \ + -j .debug_info -j .debug_abbrev -j .debug_loc -j .debug_str \ + -j .debug_aranges -j .debug_line -j .debug_macinfo \ + --target=efi-app-$(ARCH) $^ $@ + +$(BUILD_D)/%.dump: $(BUILD_D)/%.efi + $(OBJD) -D -S $< > $@ + +$(BUILD_D)/arch/%.s.o: $(ARCH_D)/%.s $(INIT_DEP) + $(AS) $(ASFLAGS) -o $@ $< + +$(BUILD_D)/arch/%.c.o: $(ARCH_D)/%.c $(INIT_DEP) + $(CC) $(CFLAGS) -c -o $@ $< + +$(BUILD_D)/fs.img: $(BUILD_D)/kernel.efi + $(eval TEMPFILE := $(shell mktemp --suffix=.img)) + dd if=/dev/zero of=$@.tmp bs=512 count=93750 + $(PARTED) $@.tmp -s -a minimal mklabel gpt + $(PARTED) $@.tmp -s -a minimal mkpart EFI FAT16 2048s 93716s + $(PARTED) $@.tmp -s -a minimal toggle 1 boot + dd if=/dev/zero of=$(TEMPFILE) bs=512 count=91669 + mformat -i $(TEMPFILE) -h 32 -t 32 -n 64 -c 1 + mmd -i $(TEMPFILE) ::/EFI + mmd -i $(TEMPFILE) ::/EFI/BOOT + mcopy -i $(TEMPFILE) $^ ::/EFI/BOOT/BOOTX64.efi + dd if=$(TEMPFILE) of=$@.tmp bs=512 count=91669 seek=2048 conv=notrunc + rm $(TEMPFILE) + mv $@.tmp $@ + +qemu: $(BUILD_D)/fs.img + "$(QEMU)" $(QEMUOPTS) + +qemu-gdb: $(BUILD_D)/fs.img $(BUILD_D)/kernel.debug.efi + "$(QEMU)" $(QEMUOPTS) -S -D popcorn-qemu.log -s + +# vim: ft=make ts=4 diff --git a/assets/ovmf/License.txt b/assets/ovmf/License.txt new file mode 100644 index 0000000..5bcfc5f --- /dev/null +++ b/assets/ovmf/License.txt @@ -0,0 +1,25 @@ +Copyright (c) 2012, 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: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* 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. + +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. diff --git a/assets/ovmf/README b/assets/ovmf/README new file mode 100644 index 0000000..c772c92 --- /dev/null +++ b/assets/ovmf/README @@ -0,0 +1,311 @@ + +=== OVMF OVERVIEW === + +The Open Virtual Machine Firmware (OVMF) project aims +to support firmware for Virtual Machines using the edk2 +code base. More information can be found at: + +http://www.tianocore.org/ovmf/ + +=== STATUS === + +Current capabilities: +* IA32 and X64 architectures +* QEMU (0.10.0 or later) + - Video, keyboard, IDE, CD-ROM, serial + - Runs UEFI shell + - Optional NIC support. Requires QEMU (0.12.2 or later) +* UEFI Linux boots +* UEFI Windows 8 boots +* UEFI Windows 7 & Windows 2008 Server boot (see important notes below!) + +=== FUTURE PLANS === + +* Test/Stabilize UEFI Self-Certification Tests (SCT) results + +=== BUILDING OVMF === + +Pre-requisites: +* Build environment capable of build the edk2 MdeModulePkg. +* A properly configured ASL compiler: + - Intel ASL compiler: Available from http://www.acpica.org + - Microsoft ASL compiler: Available from http://www.acpi.info +* NASM: http://www.nasm.us/ + +Update Conf/target.txt ACTIVE_PLATFORM for OVMF: + PEI arch DXE arch UEFI interfaces +* OvmfPkg/OvmfPkgIa32.dsc IA32 IA32 IA32 +* OvmfPkg/OvmfPkgIa32X64.dsc IA32 X64 X64 +* OvmfPkg/OvmfPkgX64.dsc X64 X64 X64 + +Update Conf/target.txt TARGET_ARCH based on the .dsc file: + TARGET_ARCH +* OvmfPkg/OvmfPkgIa32.dsc IA32 +* OvmfPkg/OvmfPkgIa32X64.dsc IA32 X64 +* OvmfPkg/OvmfPkgX64.dsc X64 + +Following the edk2 build process, you will find the OVMF binaries +under the $WORKSPACE/Build/*/*/FV directory. The actual path will +depend on how your build is configured. You can expect to find +these binary outputs: +* OVMF.FD + - Please note! This filename has changed. Older releases used OVMF.Fv. +* OvmfVideo.rom + - This file is not built separately any longer, starting with svn r13520. + +More information on building OVMF can be found at: + +https://github.com/tianocore/tianocore.github.io/wiki/How%20to%20build%20OVMF + +=== RUNNING OVMF on QEMU === + +* QEMU 0.12.2 or later is required. +* Be sure to use qemu-system-x86_64, if you are using and X64 firmware. + (qemu-system-x86_64 works for the IA32 firmware as well, of course.) +* Use OVMF for QEMU firmware (3 options available) + - Option 1: QEMU 1.6 or newer; Use QEMU -pflash parameter + * QEMU/OVMF will use emulated flash, and fully support UEFI variables + * Run qemu with: -pflash path/to/OVMF.fd + * Note that this option is required for running SecureBoot-enabled builds + (-D SECURE_BOOT_ENABLE). + - Option 2: Use QEMU -bios parameter + * Note that UEFI variables will be partially emulated, and non-volatile + variables may lose their contents after a reboot + * Run qemu with: -bios path/to/OVMF.fd + - Option 3: Use QEMU -L parameter + * Note that UEFI variables will be partially emulated, and non-volatile + variables may lose their contents after a reboot + * Either copy, rename or symlink OVMF.fd => bios.bin + * Use the QEMU -L parameter to specify the directory where the bios.bin + file is located. +* The EFI shell is built into OVMF builds at this time, so it should + run automatically if a UEFI boot application is not found on the + removable media. +* On Linux, newer version of QEMU may enable KVM feature, and this might + cause OVMF to fail to boot. The QEMU '-no-kvm' may allow OVMF to boot. +* Capturing OVMF debug messages on qemu: + - The default OVMF build writes debug messages to IO port 0x402. The + following qemu command line options save them in the file called + debug.log: '-debugcon file:debug.log -global isa-debugcon.iobase=0x402'. + - It is possible to revert to the original behavior, when debug messages were + written to the emulated serial port (potentially intermixing OVMF debug + output with UEFI serial console output). For this the + '-D DEBUG_ON_SERIAL_PORT' option has to be passed to the build command (see + the next section), and in order to capture the serial output qemu needs to + be started with eg. '-serial file:serial.log'. + - Debug messages fall into several categories. Logged vs. suppressed + categories are controlled at OVMF build time by the + 'gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel' bitmask (an UINT32 + value) in the selected .dsc file. Individual bits of this bitmask are + defined in . One non-default bit (with + some performance impact) that is frequently set for debugging is 0x00400000 + (DEBUG_VERBOSE). + - The RELEASE build target ('-b RELEASE' build option, see below) disables + all debug messages. The default build target is DEBUG. + +=== Build Scripts === + +On systems with the bash shell you can use OvmfPkg/build.sh to simplify +building and running OVMF. + +So, for example, to build + run OVMF X64: +$ OvmfPkg/build.sh -a X64 +$ OvmfPkg/build.sh -a X64 qemu + +And to run a 64-bit UEFI bootable ISO image: +$ OvmfPkg/build.sh -a X64 qemu -cdrom /path/to/disk-image.iso + +To build a 32-bit OVMF without debug messages using GCC 4.5: +$ OvmfPkg/build.sh -a IA32 -b RELEASE -t GCC45 + +=== SMM support === + +Requirements: +* SMM support requires QEMU 2.5. +* The minimum required QEMU machine type is "pc-q35-2.5". +* SMM with KVM requires Linux 4.4 (host). + +OVMF is capable of utilizing SMM if the underlying QEMU or KVM hypervisor +emulates SMM. SMM is put to use in the S3 suspend and resume infrastructure, +and in the UEFI variable driver stack. The purpose is (virtual) hardware +separation between the runtime guest OS and the firmware (OVMF), with the +intent to make Secure Boot actually secure, by preventing the runtime guest OS +from tampering with the variable store and S3 areas. + +For SMM support, OVMF must be built with the "-D SMM_REQUIRE" option. The +resultant firmware binary will check if QEMU actually provides SMM emulation; +if it doesn't, then OVMF will log an error and trigger an assertion failure +during boot (even in RELEASE builds). Both the naming of the flag (SMM_REQUIRE, +instead of SMM_ENABLE), and this behavior are consistent with the goal +described above: this is supposed to be a security feature, and fallbacks are +not allowed. Similarly, a pflash-backed variable store is a requirement. + +QEMU should be started with the options listed below (in addition to any other +guest-specific flags). The command line should be gradually composed from the +hints below. '\' is used to extend the command line to multiple lines, and '^' +can be used on Windows. + +* QEMU binary and options specific to 32-bit guests: + + $ qemu-system-i386 -cpu coreduo,-nx \ + + or + + $ qemu-system-x86_64 -cpu ,-lm,-nx \ + +* QEMU binary for running 64-bit guests (no particular options): + + $ qemu-system-x86_64 \ + +* Flags common to all SMM scenarios (only the Q35 machine type is supported): + + -machine q35,smm=on,accel=(tcg|kvm) \ + -m ... \ + -smp ... \ + -global driver=cfi.pflash01,property=secure,value=on \ + -drive if=pflash,format=raw,unit=0,file=OVMF_CODE.fd,readonly=on \ + -drive if=pflash,format=raw,unit=1,file=copy_of_OVMF_VARS.fd \ + +* In order to disable S3, add: + + -global ICH9-LPC.disable_s3=1 \ + +=== Network Support === + +OVMF provides a UEFI network stack by default. Its lowest level driver is the +NIC driver, higher levels are generic. In order to make DHCP, PXE Boot, and eg. +socket test utilities from the StdLib edk2 package work, (1) qemu has to be +configured to emulate a NIC, (2) a matching UEFI NIC driver must be available +when OVMF boots. + +(If a NIC is configured for the virtual machine, and -- dependent on boot order +-- PXE booting is attempted, but no DHCP server responds to OVMF's DHCP +DISCOVER message at startup, the boot process may take approx. 3 seconds +longer.) + +* For each NIC emulated by qemu, a GPLv2 licensed UEFI driver is available from + the iPXE project. The qemu source distribution, starting with version 1.5, + contains prebuilt binaries of these drivers (and of course allows one to + rebuild them from source as well). This is the recommended set of drivers. + +* Use the qemu -netdev and -device options, or the legacy -net option, to + enable NIC support: . + +* For a qemu >= 1.5 binary running *without* any "-M machine" option where + "machine" would identify a < qemu-1.5 configuration (for example: "-M + pc-i440fx-1.4" or "-M pc-0.13"), the iPXE drivers are automatically available + to and configured for OVMF in the default qemu installation. + +* For a qemu binary in [0.13, 1.5), or a qemu >= 1.5 binary with an "-M + machine" option where "machine" selects a < qemu-1.5 configuration: + + - download a >= 1.5.0-rc1 source tarball from , + + - extract the following iPXE driver files from the tarball and install them + in a location that is accessible to qemu processes (this may depend on your + SELinux configuration, for example): + + qemu-VERSION/pc-bios/efi-e1000.rom + qemu-VERSION/pc-bios/efi-ne2k_pci.rom + qemu-VERSION/pc-bios/efi-pcnet.rom + qemu-VERSION/pc-bios/efi-rtl8139.rom + qemu-VERSION/pc-bios/efi-virtio.rom + + - extend the NIC's -device option on the qemu command line with a matching + "romfile=" optarg: + + -device e1000,...,romfile=/full/path/to/efi-e1000.rom + -device ne2k_pci,...,romfile=/full/path/to/efi-ne2k_pci.rom + -device pcnet,...,romfile=/full/path/to/efi-pcnet.rom + -device rtl8139,...,romfile=/full/path/to/efi-rtl8139.rom + -device virtio-net-pci,...,romfile=/full/path/to/efi-virtio.rom + +* Independently of the iPXE NIC drivers, the default OVMF build provides a + basic virtio-net driver, located in OvmfPkg/VirtioNetDxe. + +* Also independently of the iPXE NIC drivers, Intel's proprietary E1000 NIC + driver (PROEFI) can be embedded in the OVMF image at build time: + + - Download UEFI drivers for the e1000 NIC + - http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=17515&lang=eng + - Install the drivers into a directory called Intel3.5 in your WORKSPACE. + + - Include the driver in OVMF during the build: + - Add "-D E1000_ENABLE" to your build command, + - For example: "build -D E1000_ENABLE". + +* When a matching iPXE driver is configured for a NIC as described above, it + takes priority over other drivers that could possibly drive the card too: + + | e1000 ne2k_pci pcnet rtl8139 virtio-net-pci + -------------+------------------------------------------------ + iPXE | x x x x x + VirtioNetDxe | x + Intel PROEFI | x + +=== OVMF Flash Layout === + +Like all current IA32/X64 system designs, OVMF's firmware +device (rom/flash) appears in QEMU's physical address space +just below 4GB (0x100000000). + +The layout of the firmware device in memory looks like: + ++--------------------------------------- 4GB (0x100000000) +| VTF0 (16-bit reset code) and OVMF SEC +| (SECFV) ++--------------------------------------- varies based on flash size +| +| Compressed main firmware image +| (FVMAIN_COMPACT) +| ++--------------------------------------- base + 0x20000 +| Fault-tolerant write (FTW) +| Spare blocks (64KB/0x10000) ++--------------------------------------- base + 0x10000 +| FTW Work block (4KB/0x1000) ++--------------------------------------- base + 0x0f000 +| Event log area (4KB/0x1000) ++--------------------------------------- base + 0x0e000 +| Non-volatile variable storage +| area (56KB/0xe000) ++--------------------------------------- base address + +OVMF supports building a 1MB or a 2MB flash image. The base address for +a 1MB image in QEMU physical memory is 0xfff00000. The base address for +a 2MB image is 0xffe00000. + +The code in SECFV locates FVMAIN_COMPACT, and decompresses the +main firmware (MAINFV) into RAM memory at address 0x800000. The +remaining OVMF firmware then uses this decompressed firmware +volume image. + +=== UNIXGCC Debug === + +If you build with the UNIXGCC toolchain, then debugging will be disabled +due to larger image sizes being produced by the UNIXGCC toolchain. The +first choice recommendation is to use GCC44 or newer instead. + +If you must use UNIXGCC, then you can override the build options for +particular libraries and modules in the .dsc to re-enable debugging +selectively. For example: + [Components] + OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf { + + GCC:*_*_*_CC_FLAGS = -UMDEPKG_NDEBUG + } + MdeModulePkg/Universal/BdsDxe/BdsDxe.inf { + + GCC:*_*_*_CC_FLAGS = -UMDEPKG_NDEBUG + } + +=== UEFI Windows 7 & Windows 2008 Server === + +* One of the '-vga std' and '-vga qxl' QEMU options should be used. +* Only one video mode, 1024x768x32, is supported at OS runtime. +* The '-vga qxl' QEMU option is recommended. After booting the installed + guest OS, select the video card in Device Manager, and upgrade its driver + to the QXL XDDM one. Download location: + , Guest | Windows binaries. + This enables further resolutions at OS runtime, and provides S3 + (suspend/resume) capability. diff --git a/assets/ovmf/x64/OVMF.fd b/assets/ovmf/x64/OVMF.fd new file mode 100644 index 0000000..24140f3 Binary files /dev/null and b/assets/ovmf/x64/OVMF.fd differ diff --git a/assets/ovmf/x64/UefiShell.iso b/assets/ovmf/x64/UefiShell.iso new file mode 100644 index 0000000..8fbc3b0 Binary files /dev/null and b/assets/ovmf/x64/UefiShell.iso differ diff --git a/external/gnu-efi b/external/gnu-efi new file mode 160000 index 0000000..d031099 --- /dev/null +++ b/external/gnu-efi @@ -0,0 +1 @@ +Subproject commit d03109958fa45865b77cf1fdf92c3b145a7dc7a0 diff --git a/modules.mk b/modules.mk new file mode 100644 index 0000000..1d08aad --- /dev/null +++ b/modules.mk @@ -0,0 +1,28 @@ +ifeq "$(MOD_NAME)" "" +include "you must specify a MOD_NAME" +endif + +ifndef SOURCES + SOURCES := $(wildcard src/modules/$(MOD_NAME)/*.c) + SOURCES += $(wildcard src/modules/$(MOD_NAME)/*.S) +endif + +ifeq "$(SOURCES)" "" +include "you must specify a SOURCES list" +endif + +MOD_SRC_D := src/modules/$(MOD_NAME) +MOD_BUILD_D := $(BUILD_D)/d.$(MOD_NAME) +MOD_LIBNAME := $(BUILD_D)/lib$(MOD_NAME).a +MOD_TARGETS += $(MOD_LIBNAME) + +OBJS_$(MOD_NAME) := $(patsubst %.c,build/d.%.o,$(patsubst src/modules/%,%,$(SOURCES))) + +$(MOD_LIBNAME): $(OBJS_$(MOD_NAME)) + $(AR) cr $@ $(OBJS_$(MOD_NAME)) + +$(MOD_BUILD_D)/%.o: $(MOD_SRC_D)/%.c $(INIT_DEP) + $(CC) $(CFLAGS) -c -o $@ $< + +DEPS += $(patsubst %.o,%.d,$(OBJS_$(MOD_NAME))) + diff --git a/src/arch/x86_64/config.mk b/src/arch/x86_64/config.mk new file mode 100644 index 0000000..9456356 --- /dev/null +++ b/src/arch/x86_64/config.mk @@ -0,0 +1,6 @@ +AS := nasm +ASFLAGS := -felf +LDFLAGS := -m elf_x86_64 +CFLAGS := -march=nocona -m64 + +# vim:ft=make diff --git a/src/arch/x86_64/kernel.ld b/src/arch/x86_64/kernel.ld new file mode 100644 index 0000000..1062ad6 --- /dev/null +++ b/src/arch/x86_64/kernel.ld @@ -0,0 +1,32 @@ +ENTRY(start) +SECTIONS +{ + . = 0x100000; + + .__mbHeader : { + mboot = .; + *(.__mbHeader) + . = ALIGN(4096); + } + + .text : { + code = .; + *(.text) + . = ALIGN(4096); + } + + .data : { + data = .; + *(.data) + *(.rodata) + . = ALIGN(4096); + } + + .bss : { + bss = .; + *(.bss) + . = ALIGN(4096); + } + + end = .; +} diff --git a/src/arch/x86_64/main.c b/src/arch/x86_64/main.c new file mode 100644 index 0000000..e9a15b0 --- /dev/null +++ b/src/arch/x86_64/main.c @@ -0,0 +1,30 @@ +//#define EFIAPI __attribute__((ms_abi)) + +#include +#include + +#define check_status(s, msg) if(EFI_ERROR((s))){Print(L"EFI_ERROR: " msg L" %d\n", (s)); return (s);} + +EFI_STATUS +efi_main (EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) +{ + EFI_STATUS status; + + InitializeLib(ImageHandle, SystemTable); + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" + status = ST->ConOut->OutputString(ST->ConOut, L"Hello from UEFI\n\r"); +#pragma GCC diagnostic pop + check_status(status, L"OutputString"); + + Print(L" SystemTable: %x\n", SystemTable); + if (SystemTable) + Print(L" ConOut: %x\n", SystemTable->ConOut); + if (SystemTable->ConOut) + Print(L"OutputString: %x\n", SystemTable->ConOut->OutputString); + + while (1) __asm__("hlt"); + return status; +} +