Introduce stage-specific architecture for coreboot
Make all three coreboot stages (bootblock, romstage and ramstage) aware of the architecture specific to that stage i.e. we will have CONFIG_ARCH variables for each of the three stages. This allows us to have an SOC with any combination of architectures and thus every stage can be made to run on a completely different architecture independent of others. Thus, bootblock can have an x86 arch whereas romstage and ramstage can have arm32 and arm64 arch respectively. These stage specific CONFIG_ARCH_ variables enable us to select the proper set of toolchain and compiler flags for every stage. These options can be considered as either arch or modes eg: x86 running in different modes or ARM having different arch types (v4, v7, v8). We have got rid of the original CONFIG_ARCH option completely as every stage can have any architecture of its own. Thus, almost all the components of coreboot are identified as being part of one of the three stages (bootblock, romstage or ramstage). The components which cannot be classified as such e.g. smm, rmodules can have their own compiler toolset which is for now set to *_i386. Hence, all special classes are treated in a similar way and the compiler toolset is defined using create_class_compiler defined in Makefile. In order to meet these requirements, changes have been made to CC, LD, OBJCOPY and family to add CC_bootblock, CC_romstage, CC_ramstage and similarly others. Additionally, CC_x86_32 and CC_armv7 handle all the special classes. All the toolsets are defined using create_class_compiler. Few additional macros have been introduced to identify the class to be used at various points, e.g.: CC_$(class) derives the $(class) part from the name of the stage being compiled. We have also got rid of COREBOOT_COMPILER, COREBOOT_ASSEMBLER and COREBOOT_LINKER as they do not make any sense for coreboot as a whole. All these attributes are associated with each of the stages. Change-Id: I923f3d4fb097d21071030b104c372cc138c68c7b Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: http://review.coreboot.org/5577 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@gmail.com>
This commit is contained in:
Furquan Shaikh
@@ -1,18 +1,17 @@
|
||||
menu "Architecture (armv7)"
|
||||
|
||||
|
||||
config ARM_ARCH_OPTIONS
|
||||
config ARCH_BOOTBLOCK_ARMV7
|
||||
bool
|
||||
default y
|
||||
select HAVE_ARCH_MEMSET
|
||||
select HAVE_ARCH_MEMCPY
|
||||
select HAVE_ARCH_MEMMOVE
|
||||
default n
|
||||
select ARCH_ARMV7
|
||||
|
||||
# Maximum reboot count
|
||||
# TODO: Improve description.
|
||||
config MAX_REBOOT_CNT
|
||||
int
|
||||
default 3
|
||||
config ARCH_ROMSTAGE_ARMV7
|
||||
bool
|
||||
default n
|
||||
|
||||
config ARCH_RAMSTAGE_ARMV7
|
||||
bool
|
||||
default n
|
||||
|
||||
choice
|
||||
prompt "Bootblock behaviour"
|
||||
|
||||
@@ -30,28 +30,27 @@ subdirs-y += lib/
|
||||
# ARM specific options
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV7),y)
|
||||
CBFSTOOL_PRE1_OPTS = -m armv7 -b $(CONFIG_BOOTBLOCK_ROM_OFFSET) -H $(CONFIG_CBFS_HEADER_ROM_OFFSET) -o $(CONFIG_CBFS_ROM_OFFSET)
|
||||
CBFSTOOL_PRE_OPTS = -b 0
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ARMV7),y)
|
||||
stages_c = $(src)/arch/armv7/stages.c
|
||||
stages_o = $(obj)/arch/armv7/stages.o
|
||||
|
||||
$(stages_o): $(stages_c) $(obj)/config.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) -I. $(INCLUDES) -c -o $@ $< -marm
|
||||
$(CC_armv7) -I. $(INCLUDES) $(INCLUDES_armv7) -c -o $@ $< -marm
|
||||
|
||||
CFLAGS += \
|
||||
-ffixed-r8\
|
||||
-march=armv7-a\
|
||||
-marm\
|
||||
-mno-unaligned-access\
|
||||
-mthumb\
|
||||
-mthumb-interwork
|
||||
endif # CONFIG_ARCH_ARMV7
|
||||
|
||||
###############################################################################
|
||||
# bootblock
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV7),y)
|
||||
|
||||
bootblock-y += cache.c
|
||||
bootblock-y += eabi_compat.c
|
||||
bootblock-y += memset.S
|
||||
@@ -79,31 +78,35 @@ $(objgenerated)/bootblock_inc.S: $$(bootblock_inc)
|
||||
|
||||
$(objgenerated)/bootblock.o: $(objgenerated)/bootblock.s
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) $(bootblock-S-ccopts) -Wa,-acdlns -c -o $@ $< > $(basename $@).disasm
|
||||
$(CC_bootblock) $(bootblock-S-ccopts) -Wa,-acdlns -c -o $@ $< > $(basename $@).disasm
|
||||
|
||||
$(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(obj)/build.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) $(bootblock-S-ccopts) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/armv7/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@
|
||||
$(CC_bootblock) $(bootblock-S-ccopts) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/armv7/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@
|
||||
|
||||
$(objgenerated)/bootblock.inc: $(src)/arch/armv7/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(bootblock_custom) $(OPTION_TABLE_H) $(obj)/config.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) $(bootblock-c-ccopts) $(INCLUDES) -MM \
|
||||
$(CC_bootblock) $(bootblock-c-ccopts) $(INCLUDES) $(INCLUDES_bootblock) -MM \
|
||||
-MT$(objgenerated)/bootblock.inc \
|
||||
$< > $(objgenerated)/bootblock.inc.d
|
||||
$(CC) $(bootblock-c-ccopts) -c -S $(CFLAGS) -I. $(INCLUDES) $< -o $@
|
||||
$(CC_bootblock) $(bootblock-c-ccopts) -c -S $(CFLAGS_bootblock) -I. $(INCLUDES) $(INCLUDES_bootblock) $< -o $@
|
||||
|
||||
$(objcbfs)/bootblock.debug: $(objgenerated)/bootblock.o $(objgenerated)/bootblock.ld $$(bootblock-objs) $(stages) $(obj)/config.h
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -m armelf_linux_eabi -include $(obj)/config.h -static -o $@.tmp -L$(obj) $< -T $(objgenerated)/bootblock.ld
|
||||
$(LD_bootblock) -m armelf_linux_eabi -include $(obj)/config.h -static -o $@.tmp -L$(obj) $< -T $(objgenerated)/bootblock.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -include $(obj)/config.h -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld -Wl,--start-group $(objgenerated)/bootblock.o $(bootblock-objs) $(stages) $(LIBGCC_FILE_NAME) -Wl,--end-group
|
||||
$(CC_bootblock) -nostdlib -nostartfiles -include $(obj)/config.h -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld -Wl,--start-group $(objgenerated)/bootblock.o $(bootblock-objs) $(stages) $(LIBGCC_FILE_NAME_bootblock) -Wl,--end-group
|
||||
endif
|
||||
|
||||
endif # CONFIG_ARCH_BOOTBLOCK_ARMV7
|
||||
|
||||
###############################################################################
|
||||
# romstage
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_ARMV7),y)
|
||||
|
||||
romstage-y += cache.c
|
||||
romstage-y += div0.c
|
||||
romstage-y += eabi_compat.c
|
||||
@@ -127,9 +130,9 @@ crt0s += $(cpu_incs-y)
|
||||
$(objcbfs)/romstage.debug: $$(romstage-objs) $(stages_o) $(objgenerated)/romstage.ld
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -nostdlib -nostartfiles -static -o $@ -L$(obj) $(romstage-objs) -T $(objgenerated)/romstage.ld
|
||||
$(LD_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) $(romstage-objs) -T $(objgenerated)/romstage.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage.ld -Wl,--start-group $(romstage-objs) $(stages_o) $(LIBGCC_FILE_NAME) -Wl,--end-group
|
||||
$(CC_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage.ld -Wl,--start-group $(romstage-objs) $(stages_o) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group
|
||||
endif
|
||||
|
||||
$(objgenerated)/romstage.ld: $$(ldscripts) $(obj)/ldoptions
|
||||
@@ -144,20 +147,24 @@ $(objgenerated)/crt0.romstage.S: $$(crt0s)
|
||||
|
||||
$(objgenerated)/crt0.romstage.o: $(objgenerated)/crt0.s
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) -Wa,-acdlns -c -o $@ $< > $(basename $@).disasm
|
||||
$(CC_romstage) -Wa,-acdlns -c -o $@ $< > $(basename $@).disasm
|
||||
|
||||
$(objgenerated)/crt0.s: $(objgenerated)/crt0.romstage.S $(obj)/config.h $(obj)/build.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/armv7/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@
|
||||
$(CC_romstage) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/armv7/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
|
||||
@printf " CC romstage.inc\n"
|
||||
$(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@
|
||||
$(CC_romstage) -MMD $(CFLAGS_romstage) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@
|
||||
|
||||
endif # CONFIG_ARCH_ROMSTAGE_ARMV7
|
||||
|
||||
###############################################################################
|
||||
# ramstage
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_RAMSTAGE_ARMV7),y)
|
||||
|
||||
ramstage-y += exception.c
|
||||
ramstage-y += exception_asm.S
|
||||
ramstage-y += div0.c
|
||||
@@ -175,17 +182,17 @@ ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c)
|
||||
$(objcbfs)/ramstage.debug: $(objgenerated)/ramstage.o $(src)/arch/armv7/ramstage.ld
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -m armelf_linux_eabi -o $@ -L$(obj) $< -T $(src)/arch/armv7/ramstage.ld
|
||||
$(LD_ramstage) -m armelf_linux_eabi -o $@ -L$(obj) $< -T $(src)/arch/armv7/ramstage.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/armv7/ramstage.ld $<
|
||||
$(CC_ramstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/armv7/ramstage.ld $<
|
||||
endif
|
||||
|
||||
$(objgenerated)/ramstage.o: $(stages_o) $$(ramstage-objs) $(LIBGCC_FILE_NAME)
|
||||
$(objgenerated)/ramstage.o: $(stages_o) $$(ramstage-objs) $(LIBGCC_FILE_NAME_ramstage)
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -m -m armelf_linux_eabi -r -o $@ --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --wrap __uidiv --start-group $(ramstage-objs) $(LIBGCC_FILE_NAME) --end-group
|
||||
$(LD_ramstage) -m -m armelf_linux_eabi -r -o $@ --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --wrap __uidiv --start-group $(ramstage-objs) $(LIBGCC_FILE_NAME_ramstage) --end-group
|
||||
else
|
||||
$(CC) $(CFLAGS) -nostdlib -r -o $@ -Wl,--start-group $(stages_o) $(ramstage-objs) $(LIBGCC_FILE_NAME) -Wl,--end-group
|
||||
$(CC_ramstage) $(CFLAGS_ramstage) -nostdlib -r -o $@ -Wl,--start-group $(stages_o) $(ramstage-objs) $(LIBGCC_FILE_NAME_ramstage) -Wl,--end-group
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y)
|
||||
@@ -211,3 +218,5 @@ endif
|
||||
ifeq ($(CONFIG_HAVE_BUS_CONFIG),y)
|
||||
ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c
|
||||
endif
|
||||
|
||||
endif # CONFIG_ARCH_RAMSTAGE_ARMV7
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
menu "Architecture (x86)"
|
||||
|
||||
config X86_ARCH_OPTIONS
|
||||
config ARCH_BOOTBLOCK_X86_32
|
||||
bool
|
||||
default y
|
||||
select HAVE_ARCH_MEMSET
|
||||
select HAVE_ARCH_MEMCPY
|
||||
select HAVE_ARCH_MEMMOVE
|
||||
default n
|
||||
select ARCH_X86
|
||||
|
||||
config ARCH_ROMSTAGE_X86_32
|
||||
bool
|
||||
default n
|
||||
|
||||
config ARCH_RAMSTAGE_X86_32
|
||||
bool
|
||||
default n
|
||||
|
||||
# This is an SMP option. It relates to starting up APs.
|
||||
# It is usually set in mainboard/*/Kconfig.
|
||||
@@ -34,12 +40,6 @@ config STACK_SIZE
|
||||
hex
|
||||
default 0x1000
|
||||
|
||||
# Maximum reboot count
|
||||
# TODO: Improve description.
|
||||
config MAX_REBOOT_CNT
|
||||
int
|
||||
default 3
|
||||
|
||||
# This is something you almost certainly don't want to mess with.
|
||||
# How many SIPIs do we send when starting up APs and cores?
|
||||
# The answer in 2000 or so was '2'. Nowadays, on many systems,
|
||||
@@ -84,7 +84,7 @@ config ROMCC
|
||||
|
||||
config PC80_SYSTEM
|
||||
bool
|
||||
default y
|
||||
default y if ARCH_X86
|
||||
|
||||
config BOOTBLOCK_MAINBOARD_INIT
|
||||
string
|
||||
|
||||
@@ -51,8 +51,10 @@ cbfs-files-$(CONFIG_INTEL_MBI) += mbi.bin
|
||||
mbi.bin-file := $(call strip_quotes,$(CONFIG_MBI_FILE))
|
||||
mbi.bin-type := mbi
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
|
||||
CBFSTOOL_PRE1_OPTS = -m x86 -o $$(( $(CONFIG_ROM_SIZE) - $(CONFIG_CBFS_SIZE) ))
|
||||
CBFSTOOL_PRE_OPTS = -b $(shell cat $(objcbfs)/base_xip.txt)
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
# i386 specific tools
|
||||
@@ -71,6 +73,8 @@ $(obj)/cmos_layout.bin: $(NVRAMTOOL) $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.l
|
||||
# bootblock
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_BOOTBLOCK_X86_32),y)
|
||||
|
||||
bootblock_lds = $(src)/arch/x86/init/ldscript_failover.lb
|
||||
bootblock_lds += $(src)/cpu/x86/16bit/entry16.lds
|
||||
bootblock_lds += $(src)/cpu/x86/16bit/reset16.lds
|
||||
@@ -110,31 +114,36 @@ $(objgenerated)/bootblock_inc.S: $$(bootblock_inc)
|
||||
printf '$(foreach crt0,$(bootblock_inc),#include "$(crt0)"\n)' > $@
|
||||
|
||||
$(objgenerated)/bootblock.o: $(objgenerated)/bootblock.s
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) $(DISASSEMBLY) -c -o $@ $< > $(basename $@).disasm
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC_bootblock) $(DISASSEMBLY) -c -o $@ $< > $(basename $@).disasm
|
||||
|
||||
$(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(obj)/build.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@
|
||||
$(CC_bootblock) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/build.h -include $(obj)/config.h -I. -I$(src) $< -o $@
|
||||
|
||||
$(objgenerated)/bootblock.inc: $(src)/arch/x86/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H)
|
||||
@printf " ROMCC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) $(INCLUDES) -MM -MT$(objgenerated)/bootblock.inc \
|
||||
$(CC_bootblock) $(INCLUDES) $(INCLUDES_bootblock) -MM -MT$(objgenerated)/bootblock.inc \
|
||||
$< > $(objgenerated)/bootblock.inc.d
|
||||
$(ROMCC) -c -S $(bootblock_romccflags) -I. $(INCLUDES) $< -o $@
|
||||
$(ROMCC) -c -S $(bootblock_romccflags) -I. $(INCLUDES) $(INCLUDES_bootblock) $< -o $@
|
||||
|
||||
$(objcbfs)/bootblock.debug: $(objgenerated)/bootblock.o $(objgenerated)/bootblock.ld
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -m elf_i386 -static -o $@ -L$(obj) $< -T $(objgenerated)/bootblock.ld
|
||||
$(LD_bootblock) -m elf_i386 -static -o $@ -L$(obj) $< -T $(objgenerated)/bootblock.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld $<
|
||||
$(CC_bootblock) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld $<
|
||||
endif
|
||||
|
||||
|
||||
endif # CONFIG_ARCH_BOOTBLOCK_X86_32
|
||||
|
||||
###############################################################################
|
||||
# romstage
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
|
||||
|
||||
crt0s = $(src)/arch/x86/init/prologue.inc
|
||||
ldscripts =
|
||||
ldscripts += $(src)/arch/x86/init/romstage.ld
|
||||
@@ -166,14 +175,25 @@ else
|
||||
ROMCCFLAGS := -mcpu=i386 -O2 # !MMX, !SSE
|
||||
endif
|
||||
|
||||
$(objcbfs)/romstage_%.bin: $(objcbfs)/romstage_%.elf
|
||||
@printf " OBJCOPY $(subst $(obj)/,,$(@))\n"
|
||||
$(OBJCOPY_romstage) -O binary $< $@
|
||||
|
||||
$(objcbfs)/romstage_%.elf: $(objcbfs)/romstage_%.debug
|
||||
@printf " OBJCOPY $(subst $(obj)/,,$(@))\n"
|
||||
cp $< $@.tmp
|
||||
$(OBJCOPY_romstage) --strip-debug $@.tmp
|
||||
$(OBJCOPY_romstage) --add-gnu-debuglink=$< $@.tmp
|
||||
mv $@.tmp $@
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(objutil)/romcc/romcc $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
|
||||
printf " ROMCC romstage.inc\n"
|
||||
$(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@
|
||||
$(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $(INCLUDES_romstage) $< -o $@
|
||||
else
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h
|
||||
@printf " CC romstage.inc\n"
|
||||
$(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@
|
||||
$(CC_romstage) -MMD $(CFLAGS_romstage) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc
|
||||
@printf " POST romstage.inc\n"
|
||||
@@ -189,21 +209,21 @@ romstage-libs ?=
|
||||
$(objcbfs)/romstage_null.debug: $$(romstage-objs) $(objgenerated)/romstage_null.ld $$(romstage-libs)
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -nostdlib -nostartfiles -static -o $@ -L$(obj) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME) --end-group -T $(objgenerated)/romstage_null.ld
|
||||
$(LD_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) --end-group -T $(objgenerated)/romstage_null.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_null.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME) -Wl,--end-group
|
||||
$(CC_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_null.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group
|
||||
endif
|
||||
$(NM) $@ | grep -q " [DdBb] "; if [ $$? -eq 0 ]; then \
|
||||
$(NM_romstage) $@ | grep -q " [DdBb] "; if [ $$? -eq 0 ]; then \
|
||||
echo "Forbidden global variables in romstage:"; \
|
||||
$(NM) $@ | grep " [DdBb] "; test "$(CONFIG_CPU_AMD_AGESA)" = y; \
|
||||
$(NM_romstage) $@ | grep " [DdBb] "; test "$(CONFIG_CPU_AMD_AGESA)" = y; \
|
||||
else true; fi
|
||||
|
||||
$(objcbfs)/romstage_xip.debug: $$(romstage-objs) $(objgenerated)/romstage_xip.ld $$(romstage-libs)
|
||||
@printf " LINK $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -nostdlib -nostartfiles -static -o $@ -L$(obj) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME) --end-group -T $(objgenerated)/romstage_xip.ld
|
||||
$(LD_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) --end-group -T $(objgenerated)/romstage_xip.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_xip.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME) -Wl,--end-group
|
||||
$(CC_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_xip.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group
|
||||
endif
|
||||
|
||||
$(objgenerated)/romstage_null.ld: $$(ldscripts) $(obj)/ldoptions
|
||||
@@ -232,16 +252,20 @@ $(objgenerated)/crt0.romstage.S: $$(crt0s)
|
||||
|
||||
$(objgenerated)/crt0.romstage.o: $(objgenerated)/crt0.s
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) $(DISASSEMBLY) -c -o $@ $< > $(basename $@).disasm
|
||||
$(CC_romstage) $(DISASSEMBLY) -c -o $@ $< > $(basename $@).disasm
|
||||
|
||||
$(objgenerated)/crt0.s: $(objgenerated)/crt0.romstage.S $(obj)/config.h $(obj)/build.h
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
$(CC) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@
|
||||
$(CC_romstage) $(INCLUDES) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@
|
||||
|
||||
endif # CONFIG_ARCH_ROMSTAGE_X86_32
|
||||
|
||||
###############################################################################
|
||||
# ramstage
|
||||
###############################################################################
|
||||
|
||||
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
|
||||
|
||||
ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c)
|
||||
ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
|
||||
ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mptable.c),)
|
||||
@@ -284,6 +308,7 @@ endif
|
||||
|
||||
ramstage-libs ?=
|
||||
|
||||
$(eval $(call create_class_compiler,rmodules,x86_32))
|
||||
ifeq ($(CONFIG_RELOCATABLE_RAMSTAGE),y)
|
||||
|
||||
$(eval $(call rmodule_link,$(objcbfs)/ramstage.debug, $(objgenerated)/ramstage.o, $(CONFIG_HEAP_SIZE)))
|
||||
@@ -297,30 +322,31 @@ else
|
||||
$(objcbfs)/ramstage.debug: $(objgenerated)/ramstage.o $(src)/arch/x86/ramstage.ld
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -m elf_i386 -o $@ -L$(obj) $< -T $(src)/arch/x86/ramstage.ld
|
||||
$(LD_ramstage) -m elf_i386 -o $@ -L$(obj) $< -T $(src)/arch/x86/ramstage.ld
|
||||
else
|
||||
$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/ramstage.ld $<
|
||||
$(CC_ramstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/ramstage.ld $<
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
$(objgenerated)/ramstage.o: $$(ramstage-objs) $(LIBGCC_FILE_NAME) $$(ramstage-libs)
|
||||
$(objgenerated)/ramstage.o: $$(ramstage-objs) $(LIBGCC_FILE_NAME_ramstage) $$(ramstage-libs)
|
||||
@printf " CC $(subst $(obj)/,,$(@))\n"
|
||||
ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y)
|
||||
$(LD) -m elf_i386 -r -o $@ --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(ramstage-objs) $(ramstage-libs) $(LIBGCC_FILE_NAME) --end-group
|
||||
$(LD_ramstage) -m elf_i386 -r -o $@ --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(ramstage-objs) $(ramstage-libs) $(LIBGCC_FILE_NAME_ramstage) --end-group
|
||||
else
|
||||
$(CC) $(CFLAGS) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(ramstage-objs) $(ramstage-libs) $(LIBGCC_FILE_NAME) -Wl,--end-group
|
||||
$(CC_ramstage) $(CFLAGS_ramstage) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(ramstage-objs) $(ramstage-libs) $(LIBGCC_FILE_NAME_ramstage) -Wl,--end-group
|
||||
endif
|
||||
|
||||
endif # CONFIG_ARCH_RAMSTAGE_X86_32
|
||||
|
||||
################################################################################
|
||||
|
||||
seabios:
|
||||
$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
|
||||
OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
|
||||
AS="$(AS)" CPP="$(CPP)" \
|
||||
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
|
||||
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
|
||||
AS="$(AS_x86_32)" CPP="$(CPP)" \
|
||||
CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
|
||||
CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
|
||||
CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \
|
||||
@@ -329,8 +355,8 @@ seabios:
|
||||
filo:
|
||||
$(MAKE) -C payloads/external/FILO -f Makefile.inc \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
|
||||
OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
|
||||
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
|
||||
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
|
||||
CONFIG_FILO_MASTER=$(CONFIG_FILO_MASTER) \
|
||||
CONFIG_FILO_STABLE=$(CONFIG_FILO_STABLE)
|
||||
|
||||
@@ -338,6 +364,6 @@ filo:
|
||||
grub2:
|
||||
$(MAKE) -C payloads/external/GRUB2 -f Makefile.inc \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
|
||||
OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
|
||||
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
|
||||
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
|
||||
CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER)
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
|
||||
|
||||
romstage-$(CONFIG_EARLY_CBMEM_INIT) += cbmem.c
|
||||
romstage-$(CONFIG_BROKEN_CAR_MIGRATE) += cbmem.c
|
||||
|
||||
endif # CONFIG_ARCH_ROMSTAGE_X86_32
|
||||
|
||||
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
|
||||
|
||||
ramstage-y += boot.c
|
||||
ramstage-y += gdt.c
|
||||
ramstage-y += tables.c
|
||||
@@ -14,3 +21,4 @@ ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S
|
||||
|
||||
$(obj)/arch/x86/boot/smbios.ramstage.o: $(obj)/build.h
|
||||
|
||||
endif # CONFIG_ARCH_RAMSTAGE_X86_32
|
||||
@@ -1,3 +1,16 @@
|
||||
|
||||
ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y)
|
||||
|
||||
romstage-y += cbfs_and_run.c
|
||||
romstage-y += memset.c
|
||||
romstage-y += memcpy.c
|
||||
romstage-y += memmove.c
|
||||
romstage-y += rom_media.c
|
||||
|
||||
endif # CONFIG_ARCH_ROMSTAGE_X86_32
|
||||
|
||||
ifeq ($(CONFIG_ARCH_RAMSTAGE_X86_32),y)
|
||||
|
||||
ramstage-y += c_start.S
|
||||
ramstage-y += cpu.c
|
||||
ramstage-y += pci_ops_conf1.c
|
||||
@@ -12,12 +25,6 @@ ramstage-y += rom_media.c
|
||||
ramstage-$(CONFIG_COOP_MULTITASKING) += thread.c
|
||||
ramstage-$(CONFIG_COOP_MULTITASKING) += thread_switch.S
|
||||
|
||||
romstage-y += cbfs_and_run.c
|
||||
romstage-y += memset.c
|
||||
romstage-y += memcpy.c
|
||||
romstage-y += memmove.c
|
||||
romstage-y += rom_media.c
|
||||
|
||||
smm-y += memset.c
|
||||
smm-y += memcpy.c
|
||||
smm-y += memmove.c
|
||||
@@ -26,3 +33,5 @@ smm-y += rom_media.c
|
||||
rmodules-y += memset.c
|
||||
rmodules-y += memcpy.c
|
||||
rmodules-y += memmove.c
|
||||
|
||||
endif # CONFIG_ARCH_RAMSTAGE_X86_32
|
||||
Reference in New Issue
Block a user