diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2020-07-21 19:14:18 +0100 |
|---|---|---|
| committer | Chuanhong Guo <gch981213@gmail.com> | 2020-07-26 17:08:21 +0800 |
| commit | 1113dcab05de31d52a91e99f7a63d0099415edad (patch) | |
| tree | b34f52df0105542fe5f816ad3d56a998209802aa | |
| parent | f5cebbe2e49c3807d1bd3ed371da35ed2ef32314 (diff) | |
| download | upstream-1113dcab05de31d52a91e99f7a63d0099415edad.tar.gz upstream-1113dcab05de31d52a91e99f7a63d0099415edad.tar.bz2 upstream-1113dcab05de31d52a91e99f7a63d0099415edad.zip | |
mediatek: mt7623: rename gen_banana_pi_img.sh → gen_mtk_mmc_img.sh
As I buy more hardware and continue to work on consolidation, This will
apply to a lot of MediaTek platforms; rename it accordingly.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | target/linux/mediatek/image/Config.in | 4 | ||||
| -rwxr-xr-x | target/linux/mediatek/image/gen_mtk_mmc_img.sh (renamed from target/linux/mediatek/image/gen_banana_pi_img.sh) | 4 | ||||
| -rw-r--r-- | target/linux/mediatek/image/mt7623.mk | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/mediatek/image/Config.in b/target/linux/mediatek/image/Config.in index 0e5449e2f9..12d47d77b9 100644 --- a/target/linux/mediatek/image/Config.in +++ b/target/linux/mediatek/image/Config.in @@ -1,4 +1,4 @@ -config BANANA_PI_BOOT_PARTSIZE - int "Boot (SD Card) filesystem partition size (in MiB)" +config MTK_BOOT_PARTSIZE + int "Boot (SD Card/eMMC) filesystem partition size (in MiB)" depends on TARGET_mediatek_mt7623_DEVICE_bpi_bananapi-r2 || TARGET_DEVICE_mediatek_mt7623_DEVICE_bpi_bananapi-r2 default 32 diff --git a/target/linux/mediatek/image/gen_banana_pi_img.sh b/target/linux/mediatek/image/gen_mtk_mmc_img.sh index 611a17edff..ea8a9c63a1 100755 --- a/target/linux/mediatek/image/gen_banana_pi_img.sh +++ b/target/linux/mediatek/image/gen_mtk_mmc_img.sh @@ -27,7 +27,7 @@ # The second partition is a FAT file system containing the kernel # image and a uboot.env file, which is provided to this script as # $4 (bootfs image). Its size is configurable with the -# CONFIG_BANANA_PI_BOOT_PARTSIZE option; by default 32MiB. +# CONFIG_MTK_BOOT_PARTSIZE option; by default 32MiB. # # The root filesystem comes next in the third partition. # @@ -56,7 +56,7 @@ # |----------------------| # | MBR partition #2 | # | | -# | FAT partition | ( BANANA_PI_BOOT_PARTSIZE +# | FAT partition | ( MTK_BOOT_PARTSIZE # . . default 32MiB ) # . (kernel, uEnv) . # | | diff --git a/target/linux/mediatek/image/mt7623.mk b/target/linux/mediatek/image/mt7623.mk index 1061a0d281..881092f478 100644 --- a/target/linux/mediatek/image/mt7623.mk +++ b/target/linux/mediatek/image/mt7623.mk @@ -1,30 +1,30 @@ KERNEL_LOADADDR := 0x80008000 DEVICE_VARS += UBOOT_TARGET UBOOT_OFFSET UBOOT_ENVSIZE -ifneq ($(CONFIG_BANANA_PI_BOOT_PARTSIZE),) +ifneq ($(CONFIG_MTK_BOOT_PARTSIZE),) BOOTFS_BLOCK_SIZE := 1024 -BOOTFS_BLOCKS := $(shell echo $$(($(CONFIG_BANANA_PI_BOOT_PARTSIZE)*1024*1024/$(BOOTFS_BLOCK_SIZE)))) +BOOTFS_BLOCKS := $(shell echo $$(($(CONFIG_MTK_BOOT_PARTSIZE)*1024*1024/$(BOOTFS_BLOCK_SIZE)))) endif -define Build/banana-pi-sdcard +define Build/mtk-mmc-img rm -f $@.boot mkfs.fat -C $@.boot $(BOOTFS_BLOCKS) if [ -r $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin ]; then \ - ./gen_banana_pi_img.sh emmc $@.emmc \ + ./gen_mtk_mmc_img.sh emmc $@.emmc \ $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin; \ mcopy -i $@.boot $@.emmc ::eMMCboot.bin; \ fi mkenvimage -s $(UBOOT_ENVSIZE) -o $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env $(UBOOT_TARGET)-uEnv.txt mcopy -i $@.boot $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-uboot.env ::uboot.env mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage - ./gen_banana_pi_img.sh sd $@ \ + ./gen_mtk_mmc_img.sh sd $@ \ $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-preloader.bin \ $(STAGING_DIR_IMAGE)/$(UBOOT_TARGET)-u-boot*.bin \ $(UBOOT_OFFSET) \ $@.boot \ $(IMAGE_ROOTFS) \ - $(CONFIG_BANANA_PI_BOOT_PARTSIZE) \ + $(CONFIG_MTK_BOOT_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) endef @@ -47,7 +47,7 @@ define Device/bpi_bananapi-r2 UBOOT_OFFSET := 320k UBOOT_TARGET := mt7623n_bpir2 IMAGES := img.gz - IMAGE/img.gz := banana-pi-sdcard | gzip | append-metadata + IMAGE/img.gz := mtk-mmc-img | gzip | append-metadata ARTIFACT/preloader.bin := preloader $$(UBOOT_TARGET) ARTIFACT/scatter.txt := scatterfile $$(firstword $$(FILESYSTEMS))-$$(firstword $$(IMAGES)) ARTIFACTS = preloader.bin scatter.txt |