core: install core-<kernel>.o at bin/
By installing the core object to bin/, we follow the same convention as for regular binaries. This, in turn, enables us to ship core in a regular binary archive. The patch also adjusts the run tool to pick up the core object from bin/ for the final linking stage.
This commit is contained in:
parent
60cda87b5c
commit
8c4a2a48ca
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-fiasco
|
LIBS := core-fiasco
|
||||||
|
CORE_OBJ := core-fiasco.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-foc
|
LIBS := core-foc
|
||||||
|
CORE_OBJ := core-foc.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-hw
|
LIBS := core-hw
|
||||||
|
CORE_OBJ := core-hw.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-nova
|
LIBS := core-nova
|
||||||
|
CORE_OBJ := core-nova.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-okl4
|
LIBS := core-okl4
|
||||||
|
CORE_OBJ := core-okl4.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-pistachio
|
LIBS := core-pistachio
|
||||||
|
CORE_OBJ := core-pistachio.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
LIBS = core-sel4
|
LIBS := core-sel4
|
||||||
|
CORE_OBJ := core-sel4.o
|
||||||
|
|
||||||
include $(BASE_DIR)/src/core/target.inc
|
include $(BASE_DIR)/src/core/target.inc
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
TARGET = core
|
TARGET = core
|
||||||
CORE_OBJ = core.o
|
CORE_OBJ ?= core.o
|
||||||
|
|
||||||
$(TARGET): $(CORE_OBJ)
|
$(TARGET): $(CORE_OBJ)
|
||||||
$(VERBOSE)true
|
$(VERBOSE)ln -sf $(CURDIR)/$(CORE_OBJ) $(INSTALL_DIR)/$(CORE_OBJ)
|
||||||
|
|
||||||
.PHONY: $(CORE_OBJ)
|
.PHONY: $(CORE_OBJ)
|
||||||
$(CORE_OBJ):
|
$(CORE_OBJ):
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" }
|
||||||
proc binary_name_core_o { } { return "fiasco/core.o" }
|
proc binary_name_core_o { } { return "core-fiasco.o" }
|
||||||
proc binary_name_timer { } { return "fiasco_timer_drv" }
|
proc binary_name_timer { } { return "fiasco_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" }
|
||||||
proc binary_name_core_o { } { return "foc/core.o" }
|
proc binary_name_core_o { } { return "core-foc.o" }
|
||||||
proc binary_name_timer { } { return "foc_timer_drv" }
|
proc binary_name_timer { } { return "foc_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" }
|
||||||
proc binary_name_core_o { } { return "hw/core.o" }
|
proc binary_name_core_o { } { return "core-hw.o" }
|
||||||
proc binary_name_timer { } { return "hw_timer_drv" }
|
proc binary_name_timer { } { return "hw_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ proc run_boot_dir {binaries} {
|
||||||
|
|
||||||
puts "core link address is [core_link_address]"
|
puts "core link address is [core_link_address]"
|
||||||
|
|
||||||
set core_obj core/hw/core.o
|
set core_obj core/hw/core-hw.o
|
||||||
set bootstrap_obj bootstrap/hw/bootstrap.o
|
set bootstrap_obj bootstrap/hw/bootstrap.o
|
||||||
|
|
||||||
# create core and bootstrap binary without modules for debugging
|
# create core and bootstrap binary without modules for debugging
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" }
|
||||||
proc binary_name_core_o { } { return "nova/core.o" }
|
proc binary_name_core_o { } { return "core-nova.o" }
|
||||||
proc binary_name_timer { } { return "nova_timer_drv" }
|
proc binary_name_timer { } { return "nova_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" }
|
||||||
proc binary_name_core_o { } { return "okl4/core.o" }
|
proc binary_name_core_o { } { return "core-okl4.o" }
|
||||||
proc binary_name_timer { } { return "pit_timer_drv" }
|
proc binary_name_timer { } { return "pit_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" }
|
||||||
proc binary_name_core_o { } { return "pistachio/core.o" }
|
proc binary_name_core_o { } { return "core-pistachio.o" }
|
||||||
proc binary_name_timer { } { return "pit_timer_drv" }
|
proc binary_name_timer { } { return "pit_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" }
|
proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" }
|
||||||
proc binary_name_core_o { } { return "sel4/core.o" }
|
proc binary_name_core_o { } { return "core-sel4.o" }
|
||||||
proc binary_name_timer { } { return "pit_timer_drv" }
|
proc binary_name_timer { } { return "pit_timer_drv" }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -776,7 +776,7 @@ proc build_core_image {binaries} {
|
||||||
copy_and_strip_genode_binaries_to_run_dir $modules
|
copy_and_strip_genode_binaries_to_run_dir $modules
|
||||||
lappend modules "config"
|
lappend modules "config"
|
||||||
|
|
||||||
set core_obj core/[kernel_specific_binary core.o]
|
set core_obj bin/[kernel_specific_binary core.o]
|
||||||
|
|
||||||
# create core binary without modules for debugging
|
# create core binary without modules for debugging
|
||||||
build_core $core_obj {} [run_dir].core [core_link_address]
|
build_core $core_obj {} [run_dir].core [core_link_address]
|
||||||
|
|
Loading…
Reference in New Issue