From 8ce9c9d438edabde15670bf37d5b58a8e16a9203 Mon Sep 17 00:00:00 2001 From: Jonathon Hall Date: Mon, 18 Dec 2023 16:44:59 -0500 Subject: [PATCH] *-legacy-flash: Deduplicate generation of "top" ROM Move Makefile target for the "top" ROM to targets/legacy_flash.mk. Signed-off-by: Jonathon Hall --- .../UNTESTED_t430-legacy-flash.config | 17 +---------------- .../x230-legacy-flash/x230-legacy-flash.config | 17 +---------------- targets/legacy_flash.mk | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 32 deletions(-) create mode 100644 targets/legacy_flash.mk diff --git a/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config b/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config index b09fd7ef..3a7312a5 100644 --- a/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config +++ b/boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config @@ -32,19 +32,4 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image CONFIG_LEGACY_FLASH=y -# This board is "special" in that we need a 4MB top SPI flashable ROM. -# This is enough to allow the board to boot into a minimal Heads and read the full Legacy -# ROM from an external USB media. -# -# No tools outside of flashrom are provided here as you can see per activated modules above. -# Everything Heads is now delegated to the Legacy ROM to be flashed -# from xx30-flash ROMs. -# -# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen -# per CONFIG_BOOTSCRIPT script above. -# -# Below, we just move produced ROM with a name appended with -top.rom for clarity. -all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom -$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE) - $(call do,MV 4MB top ROM,$@, mv $< $@) - @sha256sum $@ +BOARD_TARGETS := legacy_flash diff --git a/boards/x230-legacy-flash/x230-legacy-flash.config b/boards/x230-legacy-flash/x230-legacy-flash.config index 8e3ccecf..356ca7c7 100644 --- a/boards/x230-legacy-flash/x230-legacy-flash.config +++ b/boards/x230-legacy-flash/x230-legacy-flash.config @@ -33,19 +33,4 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image CONFIG_LEGACY_FLASH=y -# This board is "special" in that we need a 4MB top SPI flashable ROM. -# This is enough to allow the board to boot into a minimal Heads and read the full Legacy -# ROM from an external USB media. -# -# No tools outside of flashrom are provided here as you can see per activated modules above. -# Everything Heads is now delegated to the Legacy ROM to be flashed -# from xx30-flash ROMs. -# -# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen -# per CONFIG_BOOTSCRIPT script above. -# -# Below, we just move produced ROM with a name appended with -top.rom for clarity. -all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom -$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE) - $(call do,MV 4MB top ROM,$@, mv $< $@) - @sha256sum $@ +BOARD_TARGETS := legacy_flash diff --git a/targets/legacy_flash.mk b/targets/legacy_flash.mk new file mode 100644 index 00000000..de90e7a5 --- /dev/null +++ b/targets/legacy_flash.mk @@ -0,0 +1,16 @@ +# legacy-flash boards are "special" in that we need a 4MB top SPI flashable ROM. +# This is enough to allow the board to boot into a minimal Heads and read the full Legacy +# ROM from an external USB media. +# +# No tools outside of flashrom are provided here as you can see per activated modules above. +# Everything Heads is now delegated to the Legacy ROM to be flashed +# from xx30-flash ROMs. +# +# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen +# per CONFIG_BOOTSCRIPT script above. +# +# Below, we just move produced ROM with a name appended with -top.rom for clarity. +all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom +$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE) + $(call do,MV 4MB top ROM,$@, mv $< $@) + @sha256sum $@