Skip to content

Commit 12a099a

Browse files
talos-2: Move PPC-style tgz update package targets to targets/
Move the targets generating talos-2's tgz update package to targets. While this wasn't duplicated, it breaks a cyclic dependency between board config and BRAND_NAME by moving the ROM output name dependencies later. The logic probably would be shared with similar boards if any were supported, so it is in the spirit of the other targets/ shared target Makefiles. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
1 parent 8ce9c9d commit 12a099a

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

boards/talos-2/talos-2.config

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,4 @@ export CONFIG_BOOT_DEV="/dev/nvme0n1p2"
5050
export CONFIG_BOARD_NAME="Talos 2"
5151
export CONFIG_FLASHROM_OPTIONS="--noverify-all -p linux_mtd"
5252

53-
OUTPUT_PREFIX := heads-$(BOARD)-$(HEADS_GIT_VERSION)
54-
BUNDLED_LINUX := $(OUTPUT_PREFIX)-zImage.bundled
55-
OUTPUT_FILES := $(CB_OUTPUT_FILE) $(CB_BOOTBLOCK_FILE) $(BUNDLED_LINUX)
56-
57-
all: $(board_build)/$(BUNDLED_LINUX)
58-
$(board_build)/$(BUNDLED_LINUX): $(board_build)/zImage.bundled
59-
$(call do-copy,$<,$@)
60-
61-
all: $(board_build)/$(OUTPUT_PREFIX).tgz
62-
$(board_build)/$(OUTPUT_PREFIX).tgz: \
63-
$(addprefix $(board_build)/,$(OUTPUT_FILES))
64-
rm -rf $(board_build)/pkg # cleanup in case directory exists
65-
mkdir $(board_build)/pkg
66-
cp $^ $(board_build)/pkg
67-
cd $(board_build)/pkg && sha256sum * > sha256sum.txt
68-
cd $(board_build)/pkg && tar zcf $@ *
69-
rm -r $(board_build)/pkg
53+
BOARD_TARGETS := ppc_tgz

targets/ppc_tgz.mk

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
OUTPUT_PREFIX := heads-$(BOARD)-$(HEADS_GIT_VERSION)
2+
BUNDLED_LINUX := $(OUTPUT_PREFIX)-zImage.bundled
3+
OUTPUT_FILES := $(CB_OUTPUT_FILE) $(CB_BOOTBLOCK_FILE) $(BUNDLED_LINUX)
4+
5+
all: $(board_build)/$(BUNDLED_LINUX)
6+
$(board_build)/$(BUNDLED_LINUX): $(board_build)/zImage.bundled
7+
$(call do-copy,$<,$@)
8+
9+
all: $(board_build)/$(OUTPUT_PREFIX).tgz
10+
$(board_build)/$(OUTPUT_PREFIX).tgz: \
11+
$(addprefix $(board_build)/,$(OUTPUT_FILES))
12+
rm -rf $(board_build)/pkg # cleanup in case directory exists
13+
mkdir $(board_build)/pkg
14+
cp $^ $(board_build)/pkg
15+
cd $(board_build)/pkg && sha256sum * > sha256sum.txt
16+
cd $(board_build)/pkg && tar zcf $@ *
17+
rm -r $(board_build)/pkg

0 commit comments

Comments
 (0)