Attention is currently required from: Hung-Te Lin, Xi Chen, Yidi Lin.
Yu-Ping Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/87225?usp=email )
Change subject: util/mtkheader: Rename to util/mediatek ......................................................................
util/mtkheader: Rename to util/mediatek
To allow adding more scripts to the util/mtkheader folder, rename it to util/mediatek. Also update description.md and regenerate Documentation/util.md and util/README.md by util_readme.sh.
Change-Id: Ibc6ef9dddc541d2dd471898af431cadde231edca Signed-off-by: Yu-Ping Wu yupingso@chromium.org --- M Documentation/util.md M src/soc/mediatek/mt8173/Makefile.mk M src/soc/mediatek/mt8183/Makefile.mk M src/soc/mediatek/mt8186/Makefile.mk M src/soc/mediatek/mt8188/Makefile.mk M src/soc/mediatek/mt8189/Makefile.mk M src/soc/mediatek/mt8192/Makefile.mk M src/soc/mediatek/mt8195/Makefile.mk M src/soc/mediatek/mt8196/Makefile.mk M util/README.md M util/cbfstool/platform_fixups.c A util/mediatek/description.md R util/mediatek/gen-bl-img.py D util/mtkheader/description.md 14 files changed, 17 insertions(+), 12 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/87225/1
diff --git a/Documentation/util.md b/Documentation/util.md index f902ba4..8a52557 100644 --- a/Documentation/util.md +++ b/Documentation/util.md @@ -87,9 +87,11 @@ * __marvell__ - Add U-Boot boot loader for Marvell ARMADA38X `C` * __[me_cleaner](https://github.com/corna/me_cleaner)__ - Tool for partial deblobbing of Intel ME/TXE firmware images `Python` +* __mediatek__ + * gen-bl-img.py - Generate MediaTek bootloader header. +`Python3` * __mma__ - Memory Margin Analysis automation tests `Bash` * __msrtool__ - Dumps chipset-specific MSR registers. `C` -* __mtkheader__ - Generate MediaTek bootload header. `Python3` * __nvidia__ - nvidia blob parsers * __nvramtool__ - Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. `C` diff --git a/src/soc/mediatek/mt8173/Makefile.mk b/src/soc/mediatek/mt8173/Makefile.mk index ee698b7..49861a7 100644 --- a/src/soc/mediatek/mt8173/Makefile.mk +++ b/src/soc/mediatek/mt8173/Makefile.mk @@ -79,7 +79,7 @@
# Generate the actual coreboot bootblock code $(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8173 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8173 sf $< $@
CPPFLAGS_common += -Isrc/soc/mediatek/mt8173/include CPPFLAGS_common += -Isrc/soc/mediatek/common/include diff --git a/src/soc/mediatek/mt8183/Makefile.mk b/src/soc/mediatek/mt8183/Makefile.mk index bd50780..c1fd3b8 100644 --- a/src/soc/mediatek/mt8183/Makefile.mk +++ b/src/soc/mediatek/mt8183/Makefile.mk @@ -96,6 +96,6 @@ CPPFLAGS_common += -Isrc/soc/mediatek/common/include
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8183 emmc $< $@ + ./util/mediatek/gen-bl-img.py mt8183 emmc $< $@
endif diff --git a/src/soc/mediatek/mt8186/Makefile.mk b/src/soc/mediatek/mt8186/Makefile.mk index ea4bcfc..c6c47fd 100644 --- a/src/soc/mediatek/mt8186/Makefile.mk +++ b/src/soc/mediatek/mt8186/Makefile.mk @@ -81,6 +81,6 @@ cbfs-files-y += $(DRAM_CBFS)
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8183 sf $< $@
endif diff --git a/src/soc/mediatek/mt8188/Makefile.mk b/src/soc/mediatek/mt8188/Makefile.mk index 2c8379e..dc6b649 100644 --- a/src/soc/mediatek/mt8188/Makefile.mk +++ b/src/soc/mediatek/mt8188/Makefile.mk @@ -91,6 +91,6 @@ cbfs-files-y += $(DRAM_CBFS)
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8183 sf $< $@
endif diff --git a/src/soc/mediatek/mt8189/Makefile.mk b/src/soc/mediatek/mt8189/Makefile.mk index 6774f52..d865667 100644 --- a/src/soc/mediatek/mt8189/Makefile.mk +++ b/src/soc/mediatek/mt8189/Makefile.mk @@ -23,6 +23,6 @@ CPPFLAGS_common += -Isrc/soc/mediatek/common/include
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8189 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8189 sf $< $@
endif diff --git a/src/soc/mediatek/mt8192/Makefile.mk b/src/soc/mediatek/mt8192/Makefile.mk index b2c3ced..90a4e6d 100644 --- a/src/soc/mediatek/mt8192/Makefile.mk +++ b/src/soc/mediatek/mt8192/Makefile.mk @@ -83,6 +83,6 @@ cbfs-files-y += $(DRAM_CBFS)
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8183 sf $< $@
endif diff --git a/src/soc/mediatek/mt8195/Makefile.mk b/src/soc/mediatek/mt8195/Makefile.mk index ecc6965..c460d58 100644 --- a/src/soc/mediatek/mt8195/Makefile.mk +++ b/src/soc/mediatek/mt8195/Makefile.mk @@ -101,6 +101,6 @@ cbfs-files-y += $(DRAM_CBFS)
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8183 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8183 sf $< $@
endif diff --git a/src/soc/mediatek/mt8196/Makefile.mk b/src/soc/mediatek/mt8196/Makefile.mk index 1793104..1a609bf 100644 --- a/src/soc/mediatek/mt8196/Makefile.mk +++ b/src/soc/mediatek/mt8196/Makefile.mk @@ -135,6 +135,6 @@ cbfs-files-y += $(FSP_RAMSTAGE_CBFS)
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin - ./util/mtkheader/gen-bl-img.py mt8196 sf $< $@ + ./util/mediatek/gen-bl-img.py mt8196 sf $< $@
endif diff --git a/util/README.md b/util/README.md index 7a98bb6..0253a71 100644 --- a/util/README.md +++ b/util/README.md @@ -78,9 +78,11 @@ * __marvell__ - Add U-Boot boot loader for Marvell ARMADA38X `C` * __[me_cleaner](https://github.com/corna/me_cleaner)__ - Tool for partial deblobbing of Intel ME/TXE firmware images `Python` +* __mediatek__ + * gen-bl-img.py - Generate MediaTek bootloader header. +`Python3` * __mma__ - Memory Margin Analysis automation tests `Bash` * __msrtool__ - Dumps chipset-specific MSR registers. `C` -* __mtkheader__ - Generate MediaTek bootload header. `Python3` * __nvidia__ - nvidia blob parsers * __nvramtool__ - Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. `C` diff --git a/util/cbfstool/platform_fixups.c b/util/cbfstool/platform_fixups.c index 12a5ad7..74035bb 100644 --- a/util/cbfstool/platform_fixups.c +++ b/util/cbfstool/platform_fixups.c @@ -109,7 +109,7 @@ }
/* - * MediaTek bootblock.bin layout (see util/mtkheader/gen-bl-img.py): + * MediaTek bootblock.bin layout (see util/mediatek/gen-bl-img.py): * header 2048 bytes * gfh info 176 bytes, where bytes 32-35 (in little endian) is the * total size excluding the header (gfh info + data + hash) diff --git a/util/mediatek/description.md b/util/mediatek/description.md new file mode 100644 index 0000000..67ff390 --- /dev/null +++ b/util/mediatek/description.md @@ -0,0 +1,2 @@ +__mediatek__ + * gen-bl-img.py - Generate MediaTek bootloader header. `Python3` diff --git a/util/mtkheader/gen-bl-img.py b/util/mediatek/gen-bl-img.py similarity index 100% rename from util/mtkheader/gen-bl-img.py rename to util/mediatek/gen-bl-img.py diff --git a/util/mtkheader/description.md b/util/mtkheader/description.md deleted file mode 100644 index 01c0776c..0000000 --- a/util/mtkheader/description.md +++ /dev/null @@ -1 +0,0 @@ -Generate MediaTek bootload header. `Python3`
-
Yu-Ping Wu (Code Review)