Print this page
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
loader: pxe receive cleanup
9475 libefi: Do not return only if ReceiveFilter
installboot: should support efi system partition
8931 boot1.efi: scan all display modes rather than
loader: spinconsole updates
loader: gfx experiment to try GOP Blt() function.
sha1 build test
loader: add sha1 hash calculation
common/sha1: update for loader build
loader: biosdisk rework
uts: 32-bit kernel FB needs mapping in low memory
uts: add diag-device
uts: boot console mirror with diag-device
uts: enable very early console on ttya
kmdb: add diag-device as input/output device
uts: test VGA memory exclusion from mapping
uts: clear boot mapping and protect boot pages test
uts: add dboot map debug printf
uts: need to release FB pages in release_bootstrap()
uts: add screenmap ioctl
uts: update sys/queue.h
loader: add illumos uts/common to include path
loader: tem/gfx font cleanup
loader: vbe checks
uts: gfx_private set KD_TEXT when KD_RESETTEXT is
uts: gfx 8-bit update
loader: gfx 8-bit fix
loader: always set media size from partition.
uts: MB2 support for 32-bit kernel
loader: x86 should have tem 80x25
uts: x86 should have tem 80x25
uts: font update
loader: font update
uts: tem attributes
loader: tem.c comment added
uts: use font module
loader: add font module
loader: build rules for new font setup
uts: gfx_private update for new font structure
uts: early boot update for new font structure
uts: font update
uts: font build rules update for new fonts
uts: tem update to new font structure
loader: module.c needs to include tem_impl.h
uts: gfx_private 8x16 font rework
uts: make font_lookup public
loader: font rework
uts: font rework
9259 libefi: efi_alloc_and_read should check for PMBR
uts: tem utf-8 support
loader: implement tem utf-8 support
loader: tem should be able to display UTF-8
7784 uts: console input should support utf-8
7796 uts: ldterm default to utf-8
uts: do not reset serial console
uts: set up colors even if tem is not console
uts: add type for early boot properties
uts: gfx_private experiment with drm and vga
uts: gfx_private should use setmode drm callback.
uts: identify FB types and set up gfx_private based
loader: replace gop and vesa with framebuffer
uts: boot needs simple tem to support mdb
uts: boot_keyboard should emit esc sequences for
uts: gfx_private FB showuld be written by line
kmdb: set terminal window size
uts: gfx_private needs to keep track of early boot FB
pnglite: move pnglite to usr/src/common
loader: gfx_fb
ficl-sys: add gfx primitives
loader: add illumos.png logo
ficl: add fb-putimage
loader: add png support
loader: add alpha blending for gfx_fb
loader: use term-drawrect for menu frame
ficl: add simple gfx words
uts: provide fb_info via fbgattr dev_specific array.
uts: gfx_private add alpha blending
uts: update sys/ascii.h
uts: tem OSC support (incomplete)
uts: implement env module support and use data from
uts: tem get colors from early boot data
loader: use crc32 from libstand (libz)
loader: optimize for size
loader: pass tem info to the environment
loader: import tem for loader console
loader: UEFI loader needs to set ISADIR based on
loader: need UEFI32 support
8918 loader.efi: add vesa edid support
uts: tem_safe_pix_clear_prom_output() should only
uts: tem_safe_pix_clear_entire_screen() should use
uts: tem_safe_check_first_time() should query cursor
uts: tem implement cls callback & visual_io v4
uts: gfx_vgatext use block cursor for vgatext
uts: gfx_private implement cls callback & visual_io
uts: gfx_private bitmap framebuffer implementation
uts: early start frame buffer console support
uts: font functions should check the input char
uts: font rendering should support 16/24/32bit depths
uts: use smallest font as fallback default.
uts: update terminal dimensions based on selected
7834 uts: vgatext should use gfx_private
uts: add spacing property to 8859-1.bdf
terminfo: add underline for sun-color
terminfo: sun-color has 16 colors
uts: add font load callback type
loader: do not repeat int13 calls with error 0x20 and
8905 loader: add skein/edonr support
8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Revert "NEX-16819 loader UEFI support"
This reverts commit ec06b9fc617b99234e538bf2e7e4d02a24993e0c.
Reverting due to failures in the zfs-tests and the sharefs-tests
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
loader: pxe receive cleanup
9475 libefi: Do not return only if ReceiveFilter
installboot: should support efi system partition
8931 boot1.efi: scan all display modes rather than
loader: spinconsole updates
loader: gfx experiment to try GOP Blt() function.
sha1 build test
loader: add sha1 hash calculation
common/sha1: update for loader build
loader: biosdisk rework
uts: 32-bit kernel FB needs mapping in low memory
uts: add diag-device
uts: boot console mirror with diag-device
uts: enable very early console on ttya
kmdb: add diag-device as input/output device
uts: test VGA memory exclusion from mapping
uts: clear boot mapping and protect boot pages test
uts: add dboot map debug printf
uts: need to release FB pages in release_bootstrap()
uts: add screenmap ioctl
uts: update sys/queue.h
loader: add illumos uts/common to include path
loader: tem/gfx font cleanup
loader: vbe checks
uts: gfx_private set KD_TEXT when KD_RESETTEXT is
uts: gfx 8-bit update
loader: gfx 8-bit fix
loader: always set media size from partition.
uts: MB2 support for 32-bit kernel
loader: x86 should have tem 80x25
uts: x86 should have tem 80x25
uts: font update
loader: font update
uts: tem attributes
loader: tem.c comment added
uts: use font module
loader: add font module
loader: build rules for new font setup
uts: gfx_private update for new font structure
uts: early boot update for new font structure
uts: font update
uts: font build rules update for new fonts
uts: tem update to new font structure
loader: module.c needs to include tem_impl.h
uts: gfx_private 8x16 font rework
uts: make font_lookup public
loader: font rework
uts: font rework
libefi: efi_alloc_and_read should check for PMBR
uts: tem utf-8 support
loader: implement tem utf-8 support
loader: tem should be able to display UTF-8
7784 uts: console input should support utf-8
7796 uts: ldterm default to utf-8
uts: do not reset serial console
uts: set up colors even if tem is not console
uts: add type for early boot properties
uts: gfx_private experiment with drm and vga
uts: gfx_private should use setmode drm callback.
uts: identify FB types and set up gfx_private based
loader: replace gop and vesa with framebuffer
uts: boot needs simple tem to support mdb
uts: boot_keyboard should emit esc sequences for
uts: gfx_private FB showuld be written by line
kmdb: set terminal window size
uts: gfx_private needs to keep track of early boot FB
pnglite: move pnglite to usr/src/common
loader: gfx_fb
ficl-sys: add gfx primitives
loader: add illumos.png logo
ficl: add fb-putimage
loader: add png support
loader: add alpha blending for gfx_fb
loader: use term-drawrect for menu frame
ficl: add simple gfx words
uts: provide fb_info via fbgattr dev_specific array.
uts: gfx_private add alpha blending
uts: update sys/ascii.h
uts: tem OSC support (incomplete)
uts: implement env module support and use data from
uts: tem get colors from early boot data
loader: use crc32 from libstand (libz)
loader: optimize for size
loader: pass tem info to the environment
loader: import tem for loader console
loader: UEFI loader needs to set ISADIR based on
loader: need UEFI32 support
8918 loader.efi: add vesa edid support
uts: tem_safe_pix_clear_prom_output() should only
uts: tem_safe_pix_clear_entire_screen() should use
uts: tem_safe_check_first_time() should query cursor
uts: tem implement cls callback & visual_io v4
uts: gfx_vgatext use block cursor for vgatext
uts: gfx_private implement cls callback & visual_io
uts: gfx_private bitmap framebuffer implementation
uts: early start frame buffer console support
uts: font functions should check the input char
uts: font rendering should support 16/24/32bit depths
uts: use smallest font as fallback default.
uts: update terminal dimensions based on selected
7834 uts: vgatext should use gfx_private
uts: add spacing property to 8859-1.bdf
terminfo: add underline for sun-color
terminfo: sun-color has 16 colors
uts: add font load callback type
loader: do not repeat int13 calls with error 0x20 and
8905 loader: add skein/edonr support
8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/boot/sys/boot/efi/loader/Makefile
+++ new/usr/src/boot/sys/boot/efi/loader/Makefile
1 1 #
2 2 # This file and its contents are supplied under the terms of the
3 3 # Common Development and Distribution License ("CDDL"), version 1.0.
|
↓ open down ↓ |
3 lines elided |
↑ open up ↑ |
4 4 # You may only use this file in accordance with the terms of version
5 5 # 1.0 of the CDDL.
6 6 #
7 7 # A full copy of the text of the CDDL should have accompanied this
8 8 # source. A copy of the CDDL is also available via the Internet at
9 9 # http://www.illumos.org/license/CDDL.
10 10 #
11 11
12 12 #
13 13 # Copyright 2016 Toomas Soome <tsoome@me.com>
14 -# Copyright 2016 RackTop Systems.
15 14 #
16 15
16 +.KEEP_STATE:
17 +
17 18 include $(SRC)/Makefile.master
18 -include $(SRC)/boot/Makefile.version
19 19
20 -CC= $(GCC_ROOT)/bin/gcc
21 -LD= $(GNU_ROOT)/bin/gld
22 -OBJCOPY= $(GNU_ROOT)/bin/gobjcopy
23 -OBJDUMP= $(GNU_ROOT)/bin/gobjdump
20 +SUBDIRS = $(MACH) $(MACH64)
24 21
25 -PROG= loader.sym
26 -MACHINE= $(MACH64)
22 +all := TARGET = all
23 +clean := TARGET = clean
24 +clobber := TARGET = clobber
25 +install := TARGET = install
27 26
28 -# architecture-specific loader code
29 -SRCS= autoload.c bootinfo.c conf.c copy.c efi_main.c main.c \
30 - self_reloc.c smbios.c acpi.c vers.c memmap.c multiboot2.c
31 -OBJS= autoload.o bootinfo.o conf.o copy.o efi_main.o main.o \
32 - self_reloc.o smbios.o acpi.o vers.o memmap.o multiboot2.o
27 +all clean clobber install: $(SUBDIRS)
33 28
34 -ASFLAGS=-m64 -fPIC
35 -CFLAGS= -O2
36 -CPPFLAGS= -nostdinc -I../../../../include -I../../..
37 -CPPFLAGS += -I../../../../lib/libstand
29 +$(SUBDIRS): FRC
30 + @cd $@; pwd; $(MAKE) $(MFLAGS) $(TARGET)
38 31
39 -include ../Makefile.inc
40 -
41 -include arch/${MACHINE}/Makefile.inc
42 -
43 -CPPFLAGS += -I.
44 -CPPFLAGS += -I./arch/${MACHINE}
45 -CPPFLAGS += -I./../include
46 -CPPFLAGS += -I./../include/${MACHINE}
47 -CPPFLAGS += -I$(SRC)/uts/intel/sys/acpi
48 -CPPFLAGS += -I./../../..
49 -CPPFLAGS += -I./../../i386/libi386
50 -CPPFLAGS += -I./../../zfs
51 -CPPFLAGS += -I./../../../cddl/boot/zfs
52 -CPPFLAGS += -DNO_PCI -DEFI -DTERM_EMU
53 -
54 -# Export serial numbers, UUID, and asset tag from loader.
55 -CPPFLAGS += -DSMBIOS_SERIAL_NUMBERS
56 -# Use little-endian UUID format as defined in SMBIOS 2.6.
57 -CPPFLAGS += -DSMBIOS_LITTLE_ENDIAN_UUID
58 -# Use network-endian UUID format for backward compatibility.
59 -#CPPFLAGS += -DSMBIOS_NETWORK_ENDIAN_UUID
60 -
61 -LIBSTAND= ../../libstand/${MACHINE}/libstand.a
62 -
63 -BOOT_FORTH= yes
64 -CPPFLAGS += -DBOOT_FORTH -D_STANDALONE
65 -CPPFLAGS += -I$(SRC)/common/ficl
66 -CPPFLAGS += -I../../ficl
67 -LIBFICL= ../../ficl/${MACHINE}/libficl.a
68 -
69 -CPPFLAGS += -I../../zfs
70 -LIBZFSBOOT= ../../zfs/${MACHINE}/libzfsboot.a
71 -
72 -#LOADER_FDT_SUPPORT?= no
73 -#.if ${MK_FDT} != "no" && ${LOADER_FDT_SUPPORT} != "no"
74 -#CFLAGS+= -I${.CURDIR}/../../fdt
75 -#CFLAGS+= -I${.OBJDIR}/../../fdt
76 -#CFLAGS+= -DLOADER_FDT_SUPPORT
77 -#LIBEFI_FDT= ${.OBJDIR}/../../efi/fdt/libefi_fdt.a
78 -#LIBFDT= ${.OBJDIR}/../../fdt/libfdt.a
79 -#.endif
80 -
81 -# Always add MI sources
82 -include ./Makefile.common
83 -CPPFLAGS += -I../../common
84 -
85 -# For multiboot2.h, must be last, to avoid conflicts
86 -CPPFLAGS += -I$(SRC)/uts/common
87 -
88 -FILES= loader.efi
89 -FILEMODE= 0555
90 -ROOT_BOOT= $(ROOT)/boot
91 -ROOTBOOTFILES=$(FILES:%=$(ROOT_BOOT)/%)
92 -
93 -LDSCRIPT= ./arch/${MACHINE}/ldscript.${MACHINE}
94 -LDFLAGS = -nostdlib --eh-frame-hdr -znocombreloc
95 -LDFLAGS += -shared --hash-style=both --enable-new-dtags
96 -LDFLAGS += -T${LDSCRIPT} -Bsymbolic
97 -
98 -CLEANFILES= vers.c loader.efi
99 -
100 -NEWVERSWHAT= "EFI loader" ${MACHINE}
101 -
102 -all: loader.efi
103 -
104 -install: all $(ROOTBOOTFILES)
105 -
106 -vers.c: ../../common/newvers.sh $(SRC)/boot/Makefile.version
107 - $(SH) ../../common/newvers.sh ${LOADER_VERSION} ${NEWVERSWHAT}
108 -
109 -EFI_TARGET= pei-x86-64
110 -
111 -loader.efi: loader.sym
112 - if [ `${OBJDUMP} -t loader.sym | fgrep '*UND*' | wc -l` != 0 ]; then \
113 - ${OBJDUMP} -t loader.sym | fgrep '*UND*'; \
114 - exit 1; \
115 - fi
116 - ${OBJCOPY} --readonly-text -j .peheader -j .text -j .sdata -j .data \
117 - -j .dynamic -j .dynsym -j .rel.dyn \
118 - -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \
119 - -j set_Xficl_compile_set \
120 - --output-target=${EFI_TARGET} --subsystem efi-app loader.sym $@
121 -
122 -LIBEFI= ../libefi/libefi.a
123 -
124 -DPADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} \
125 - ${LIBSTAND} ${LDSCRIPT}
126 -LDADD= ${LIBFICL} ${LIBZFSBOOT} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} \
127 - ${LIBSTAND}
128 -
129 -
130 -loader.sym: $(OBJS) $(DPADD)
131 - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LDADD)
132 -
133 -CLEANFILES += machine x86
134 -
135 -machine:
136 - $(RM) machine
137 - $(SYMLINK) ../../../${MACHINE}/include machine
138 -
139 -x86:
140 - $(RM) x86
141 - $(SYMLINK) ../../../x86/include x86
142 -
143 -$(OBJS): machine x86
144 -
145 -clean clobber:
146 - $(RM) $(CLEANFILES) $(OBJS) loader.sym loader.efi
147 -
148 -%.o: %.c
149 - $(COMPILE.c) $<
150 -
151 -%.o: ./arch/${MACHINE}/%.c
152 - $(COMPILE.c) $<
153 -
154 -%.o: ./arch/${MACHINE}/%.S
155 - $(COMPILE.S) $<
156 -
157 -%.o: ../../common/%.c
158 - $(COMPILE.c) $<
159 -
160 -%.o: ../../common/linenoise/%.c
161 - $(COMPILE.c) $<
162 -
163 -%.o: ../../i386/libi386/%.c
164 - $(COMPILE.c) $<
165 -
166 -$(ROOT_BOOT)/%: %
167 - $(INS.file)
32 +FRC:
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX