Support branding under branding subdirectories

- Move logos and bootsplashes from blobs to branding/Heads/ - Makefile: add support for BRAND_DIR which depends on BRAND_NAME which defaults to Heads if undefined - Boards coreboot configs: change bootsplash directory to depend on BRAND_DIR - branding/Heads/bootsplash-1024x768.jpg points to branding/Heads/d-wid-ThePlexus_coreboot-linuxboot-heads_background-plain_DonateQrCode.jpg Notes to d-wid: - @d-wid: the xcf has to go. We cannot add 4mb of binary data in repo that might get deleted in the future - I propose this naming scheme so that credit are clear directly in filenames, where commit shoud say that bing is original author as previously stated under linuxboot#1451 - I'm not sure what online dev environement can do and cannot in terms of commit modifications. You seems to have been able to squash all prior commits. What is missing now would be properly credit Bing, ThrillerAtPlay and ThePlexus in your commit for the releative filenames and that would be good to go. - I would then recreate a PR based on your PR, add Makefile magic and modify all coreboot configs to be aligned with qemu config as under this commit
tlaurion · Oct 2, 2023 · b0e8eec · b0e8eec
1 parent d092125
commit b0e8eec
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -183,6 +183,7 @@ FORCE:
 define install_config =
 	sed -e 's!@BOARD_BUILD_DIR@!$(board_build)!g' \
 	    -e 's!@BLOB_DIR@!$(pwd)/blobs!g' \
+	    -e 's!@BRAND_DIR@!$(pwd)/branding/$(BRAND_NAME)!g' \
 	    -e 's!@BRAND_NAME@!$(BRAND_NAME)!g' \
 	    "$1" > "$2"
 endef

diff --git a/blobs/bootsplash-1024x768.jpg b/blobs/bootsplash-1024x768.jpg
diff --git a/...exus-bootsplash-1024x768-DonateQrCode.jpg → ...exus-bootsplash-1024x768-DonateQrCode.jpg b/...exus-bootsplash-1024x768-DonateQrCode.jpg → ...exus-bootsplash-1024x768-DonateQrCode.jpg
diff --git a/blobs/ThePlexus-bootsplash-1024x768.jpg → ...g/Heads/ThePlexus-bootsplash-1024x768.jpg b/blobs/ThePlexus-bootsplash-1024x768.jpg → ...g/Heads/ThePlexus-bootsplash-1024x768.jpg
diff --git a/blobs/ThePlexus-logo.jpg → branding/Heads/ThePlexus-logo.jpg b/blobs/ThePlexus-logo.jpg → branding/Heads/ThePlexus-logo.jpg
diff --git a/blobs/background-plain-3.jpg → ..._blue_background-plain-3_DonateQrCode.jpg b/blobs/background-plain-3.jpg → ..._blue_background-plain-3_DonateQrCode.jpg
diff --git a/blobs/logo.svg → branding/Heads/bing-d-wid_logo.svg b/blobs/logo.svg → branding/Heads/bing-d-wid_logo.svg
diff --git a/branding/Heads/bootsplash-1024x768.jpg b/branding/Heads/bootsplash-1024x768.jpg
@@ -0,0 +1 @@
+d-wid-ThePlexus_coreboot-linuxboot-heads_background-plain_DonateQrCode.jpg
diff --git a/blobs/background-plain.jpg → ...t-heads_background-plain_DonateQrCode.jpg b/blobs/background-plain.jpg → ...t-heads_background-plain_DonateQrCode.jpg
diff --git a/blobs/heads.xcf → ...hrillerAtPlay_background_DonateQrCode.xcf b/blobs/heads.xcf → ...hrillerAtPlay_background_DonateQrCode.xcf
diff --git a/blobs/background-binary.jpg → ...AtPlay-background-binary_DonateQrCode.jpg b/blobs/background-binary.jpg → ...AtPlay-background-binary_DonateQrCode.jpg
diff --git a/blobs/background-binary-2.jpg → ...play_background-binary-2_DonateQrCode.jpg b/blobs/background-binary-2.jpg → ...play_background-binary-2_DonateQrCode.jpg
diff --git a/blobs/background-plain-2.jpg → ...heads_background-plain-2_DonateQrCode.jpg b/blobs/background-plain-2.jpg → ...heads_background-plain-2_DonateQrCode.jpg
diff --git a/config/coreboot-qemu-tpm1.config b/config/coreboot-qemu-tpm1.config
@@ -35,7 +35,7 @@ CONFIG_NO_STAGE_CACHE=y
 # CONFIG_CBMEM_STAGE_CACHE is not set
 # CONFIG_UPDATE_IMAGE is not set
 CONFIG_BOOTSPLASH_IMAGE=y
-CONFIG_BOOTSPLASH_FILE="@BLOB_DIR@/bootsplash-1024x768.jpg"
+CONFIG_BOOTSPLASH_FILE="@BRAND_DIR@/bootsplash-1024x768.jpg"
 CONFIG_BOOTSPLASH_CONVERT=y
 CONFIG_BOOTSPLASH_CONVERT_QUALITY=70
 # CONFIG_BOOTSPLASH_CONVERT_RESIZE is not set