From b742fd9b5b3c07129abfa3c099655346f6b1e6a6 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Thu, 17 Dec 2015 10:10:47 -0600 Subject: Hostboot Bootloader Infrastructure New and changed code to provide bootloader infrastructure. Changes to build bootloader and create the image file. Change-Id: Ie400f0ca6954b86e275fd68c9462f8d18eeec98a RTC:127211 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22856 Tested-by: Jenkins Server Reviewed-by: Daniel M. Crowell --- src/makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index 285f453b2..d271d0432 100644 --- a/src/makefile +++ b/src/makefile @@ -26,6 +26,7 @@ ROOTPATH = .. +SUBDIRS += bootloader.d SUBDIRS += kernel.d SUBDIRS += lib.d SUBDIRS += libc++.d @@ -36,6 +37,7 @@ SUBDIRS += runtime.d # Reducing HB extended img size for VPO by disabling certain libs using # CONFIG_VPO_COMPILE option +IMGS += bootloader IMGS += hbicore IMGS += hbicore_test IMGS += hbirt @@ -57,6 +59,13 @@ BASE_OBJECTS += tls.o ifdef HOSTBOOT_PROFILE BASE_OBJECTS += gcov.o endif + +BL_BASE_OBJECTS += bl_builtins.o + +BOOTLDR_OBJECTS += bl_start.o +BOOTLDR_OBJECTS += bootloader.o +BOOTLDR_OBJECTS += bl_pnor_ecc.o + DIRECT_BOOT_OBJECTS += start.o DIRECT_BOOT_OBJECTS += kernel.o DIRECT_BOOT_OBJECTS += taskmgr.o @@ -270,10 +279,15 @@ RUNTIME_TESTCASE_MODULES += testpnor_rt RELOCATABLE_IMAGE_LDFLAGS = -pie --export-dynamic +bootloader_OBJECTS += ${BL_BASE_OBJECTS} +bootloader_OBJECTS += ${BOOTLDR_OBJECTS} +bootloader_LDFILE = bootloader.ld + hbicore_OBJECTS += ${BASE_OBJECTS} hbicore_OBJECTS += ${DIRECT_BOOT_OBJECTS} hbicore_MODULES += ${BASE_MODULES} hbicore_EXTENDED_MODULES += ${EXTENDED_MODULES} +hbicore_LDFILE = kernel.ld # for PRDR_RULE_TABLE_TARGETS include ${ROOTPATH}/src/usr/diag/prdf/common/framework/rule/prdf_rule.mk @@ -286,6 +300,7 @@ hbicore_test_DATA_MODULES += testdata ifndef SKIP_BINARY_FILES hbicore_test_DATA_MODULES += test_signed_container endif +hbicore_test_LDFILE = kernel.ld hbirt_OBJECTS += ${RUNTIME_OBJECTS} hbirt_OBJECTS += ${BASE_OBJECTS} @@ -293,12 +308,14 @@ hbirt_MODULES += ${RUNTIME_MODULES} hbirt_DATA_MODULES += ${RUNTIME_DATA_MODULES} hbirt_DATA_MODULES += $(if $(CONFIG_HBRT_PRD),$(prd_rule_prf_targets)) hbirt_LDFLAGS = ${RELOCATABLE_IMAGE_LDFLAGS} +hbirt_LDFILE = kernel.ld hbirt_test_OBJECTS += ${hbirt_OBJECTS} hbirt_test_MODULES += ${hbirt_MODULES} hbirt_test_MODULES += ${RUNTIME_TESTCASE_MODULES} hbirt_test_DATA_MODULES += ${hbirt_DATA_MODULES} hbirt_test_LDFLAGS = ${RELOCATABLE_IMAGE_LDFLAGS} +hbirt_test_LDFILE = kernel.ld IMAGE_PASS_POST += buildpnor IMAGE_PASS_POST += imgsizecheck -- cgit v1.2.1