diff options
| author | Adam Muhle <armuhle@us.ibm.com> | 2012-06-29 15:03:24 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-07-09 12:25:40 -0500 |
| commit | 552815060119a4612ed82c67d31fb38ecee2ccaf (patch) | |
| tree | e7958cb78de15c5c0cf54ccb21f3b752e75123a7 /src/build/buildpnor/makefile | |
| parent | a87cb9ce7a0322f9fd6c6e015894f12a2975e10f (diff) | |
| download | talos-hostboot-552815060119a4612ed82c67d31fb38ecee2ccaf.tar.gz talos-hostboot-552815060119a4612ed82c67d31fb38ecee2ccaf.zip | |
Unique PNOR Layout for VPO images
-Unique PNOR layout for VPO to fit within fake-pnor
-Larger image for simics configs which includes the base img.
Change-Id: I884a99da51845c2f17fcb48be4afa7d272d0ffd5
RTC: 44290
Depends-on: I7294999d3619692aaab424dca1ae608a0a84fa81
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1281
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build/buildpnor/makefile')
| -rw-r--r-- | src/build/buildpnor/makefile | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/src/build/buildpnor/makefile b/src/build/buildpnor/makefile index 04c4bf33c..2696a417a 100644 --- a/src/build/buildpnor/makefile +++ b/src/build/buildpnor/makefile @@ -31,7 +31,8 @@ ROOTPATH = ../../.. .DEFAULT_GOAL := buildpnor -PNOR_TARGETS = simics_MURANO simics_VENICE vbu TULETA +PNOR_TARGETS = simics_MURANO simics_VENICE TULETA +PNOR_VBU_TARGETS = vbu define PNOR_template $${IMGDIR}/$(1).pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting.bin @@ -40,7 +41,8 @@ $${IMGDIR}/$(1).pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting. --pnorOutBin $${IMGDIR}/$(1).pnor \ --binFile_part $${IMGDIR}/$(1)_pnor.toc \ --binFile_HBI $${IMGDIR}/hbicore_extended.bin \ - --binFile_HBD $${IMGDIR}/$(1)_targeting.bin + --binFile_HBD $${IMGDIR}/$(1)_targeting.bin \ + --binFile_HBB $${IMGDIR}/hbicore.bin endef define PNOR_test_template $${IMGDIR}/$(1)_test.pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting.bin @@ -49,17 +51,45 @@ $${IMGDIR}/$(1)_test.pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targe --pnorOutBin $${IMGDIR}/$(1)_test.pnor \ --binFile_part $${IMGDIR}/$(1)_pnor.toc \ --binFile_HBI $${IMGDIR}/hbicore_test_extended.bin \ + --binFile_HBD $${IMGDIR}/$(1)_targeting.bin \ + --binFile_HBB $${IMGDIR}/hbicore_test.bin +endef + +define PNOR_vbu_template +$${IMGDIR}/$(1).pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting.bin + ./buildpnor.pl --pnorLayout ./pnorLayoutVpo.xml \ + --genToc \ + --pnorOutBin $${IMGDIR}/$(1).pnor \ + --binFile_part $${IMGDIR}/$(1)_pnor.toc \ + --binFile_HBI $${IMGDIR}/hbicore_extended.bin \ + --binFile_HBD $${IMGDIR}/$(1)_targeting.bin +endef +define PNOR_vbu_test_template +$${IMGDIR}/$(1)_test.pnor: $${IMGDIR}/hbicore_extended.bin $${IMGDIR}/$(1)_targeting.bin + ./buildpnor.pl --pnorLayout ./pnorLayoutVpo.xml \ + --genToc \ + --pnorOutBin $${IMGDIR}/$(1)_test.pnor \ + --binFile_part $${IMGDIR}/$(1)_pnor.toc \ + --binFile_HBI $${IMGDIR}/hbicore_test_extended.bin \ --binFile_HBD $${IMGDIR}/$(1)_targeting.bin endef PNOR_IMAGES = $(addsuffix .pnor, $(addprefix $(IMGDIR)/, ${PNOR_TARGETS})) \ $(addsuffix _test.pnor, $(addprefix $(IMGDIR)/, ${PNOR_TARGETS})) -EXTRA_CLEAN = ${PNOR_IMAGES} ${PNOR_IMAGES:.pnor=_pnor.toc} +PNOR_VBU_IMAGES = $(addsuffix .pnor, $(addprefix $(IMGDIR)/, ${PNOR_VBU_TARGETS})) \ + $(addsuffix .pnor, $(addprefix $(IMGDIR)/, ${PNOR_VBU_TARGETS})) \ + +EXTRA_CLEAN = ${PNOR_IMAGES} ${PNOR_IMAGES:.pnor=_pnor.toc} ${PNOR_VBU_IMAGES} ${PNOR_VBU_IMAGES:.pnor=_pnor.toc} include ${ROOTPATH}/config.mk buildpnor: ${PNOR_IMAGES} +#Standard Images $(foreach pnor,$(PNOR_TARGETS),$(eval $(call PNOR_template,$(pnor)))) $(foreach pnor,$(PNOR_TARGETS),$(eval $(call PNOR_test_template,$(pnor)))) + +#VBU Specific images +$(foreach pnor,$(PNOR_VBU_TARGETS),$(eval $(call PNOR_vbu_template,$(pnor)))) +$(foreach pnor,$(PNOR_VBU_TARGETS),$(eval $(call PNOR_vbu_test_template,$(pnor)))) |
