Skip to content

Commit 8ce9c9d

Browse files
*-legacy-flash: Deduplicate generation of "top" ROM
Move Makefile target for the "top" ROM to targets/legacy_flash.mk. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
1 parent d512cd4 commit 8ce9c9d

File tree

3 files changed

+18
-32
lines changed

3 files changed

+18
-32
lines changed

boards/UNTESTED_t430-legacy-flash/UNTESTED_t430-legacy-flash.config

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,4 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
3232

3333
CONFIG_LEGACY_FLASH=y
3434

35-
# This board is "special" in that we need a 4MB top SPI flashable ROM.
36-
# This is enough to allow the board to boot into a minimal Heads and read the full Legacy
37-
# ROM from an external USB media.
38-
#
39-
# No tools outside of flashrom are provided here as you can see per activated modules above.
40-
# Everything Heads is now delegated to the Legacy ROM to be flashed
41-
# from xx30-flash ROMs.
42-
#
43-
# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen
44-
# per CONFIG_BOOTSCRIPT script above.
45-
#
46-
# Below, we just move produced ROM with a name appended with -top.rom for clarity.
47-
all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
48-
$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
49-
$(call do,MV 4MB top ROM,$@, mv $< $@)
50-
@sha256sum $@
35+
BOARD_TARGETS := legacy_flash

boards/x230-legacy-flash/x230-legacy-flash.config

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,4 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
3333

3434
CONFIG_LEGACY_FLASH=y
3535

36-
# This board is "special" in that we need a 4MB top SPI flashable ROM.
37-
# This is enough to allow the board to boot into a minimal Heads and read the full Legacy
38-
# ROM from an external USB media.
39-
#
40-
# No tools outside of flashrom are provided here as you can see per activated modules above.
41-
# Everything Heads is now delegated to the Legacy ROM to be flashed
42-
# from xx30-flash ROMs.
43-
#
44-
# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen
45-
# per CONFIG_BOOTSCRIPT script above.
46-
#
47-
# Below, we just move produced ROM with a name appended with -top.rom for clarity.
48-
all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
49-
$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
50-
$(call do,MV 4MB top ROM,$@, mv $< $@)
51-
@sha256sum $@
36+
BOARD_TARGETS := legacy_flash

targets/legacy_flash.mk

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# legacy-flash boards are "special" in that we need a 4MB top SPI flashable ROM.
2+
# This is enough to allow the board to boot into a minimal Heads and read the full Legacy
3+
# ROM from an external USB media.
4+
#
5+
# No tools outside of flashrom are provided here as you can see per activated modules above.
6+
# Everything Heads is now delegated to the Legacy ROM to be flashed
7+
# from xx30-flash ROMs.
8+
#
9+
# Instructions to mount USB thumb drive and flash legacy 12Mb image will be given on screen
10+
# per CONFIG_BOOTSCRIPT script above.
11+
#
12+
# Below, we just move produced ROM with a name appended with -top.rom for clarity.
13+
all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
14+
$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
15+
$(call do,MV 4MB top ROM,$@, mv $< $@)
16+
@sha256sum $@

0 commit comments

Comments
 (0)