Merge pull request #952 from tlaurion/xx30-flash_remove_12mb_image

xx30-flash boards: produce top.rom and remove 12mb rom for clarity
This commit is contained in:
tlaurion 2021-01-05 10:47:10 -05:00 committed by GitHub
commit 5f0a0ac3cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions

View File

@ -6,8 +6,13 @@ export CONFIG_COREBOOT_VERSION=4.8.1
export CONFIG_LINUX_VERSION=4.14.62 export CONFIG_LINUX_VERSION=4.14.62
CONFIG_FLASHROM=y CONFIG_FLASHROM=y
#CONFIG_GPG=y
CONFIG_FLASHTOOLS=y CONFIG_FLASHTOOLS=y
CONFIG_PCIUTILS=y CONFIG_PCIUTILS=y
#CONFIG_MBEDTLS=y
#CONFIG_QRENCODE=y
#CONFIG_TPMTOTP=y
#CONFIG_DROPBEAR=y
CONFIG_LINUX_CONFIG=config/linux-x230-flash.config CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
CONFIG_LINUX_USB=y CONFIG_LINUX_USB=y
@ -20,7 +25,9 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
# for flashing into SPI flash 1 on the mainboard. This is enough to # for flashing into SPI flash 1 on the mainboard. This is enough to
# allow the board to boot into a minimal Heads and read the full # allow the board to boot into a minimal Heads and read the full
# ROM from an external USB media. # ROM from an external USB media.
all: $(build)/$(BOARD)/$(BOARD).rom all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
$(build)/$(BOARD)/$(BOARD).rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE) $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
dd of=$@ if=$< bs=65536 count=64 skip=128 $(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
sha256sum $@ @sha256sum $@
#We remove the original ROM, leaving only the 4mb top one
rm $(build)/$(BOARD)/$(CB_OUTPUT_FILE)

View File

@ -25,7 +25,9 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
# for flashing into SPI flash 1 on the mainboard. This is enough to # for flashing into SPI flash 1 on the mainboard. This is enough to
# allow the board to boot into a minimal Heads and read the full # allow the board to boot into a minimal Heads and read the full
# ROM from an external USB media. # ROM from an external USB media.
all: $(build)/$(BOARD)/$(BOARD).rom all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
$(build)/$(BOARD)/$(BOARD).rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE) $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
dd of=$@ if=$< bs=65536 count=64 skip=128 $(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
sha256sum $@ @sha256sum $@
#We remove the original ROM, leaving only the 4mb top one
rm $(build)/$(BOARD)/$(CB_OUTPUT_FILE)