Commit 02f55036e50146488ab256d4496409d9b693bdcf
1 parent
f2ebacd723
Exists in
smarc-8mq-q10.0.0_2.6.0
Fix the path errors and add trusty support
Showing 9 changed files with 64 additions and 66 deletions Side-by-side Diff
- imx8m/smarc_mx8mq/BoardConfig.mk
- imx8m/smarc_mx8mq/UbootKernelBoardConfig.mk
- imx8m/smarc_mx8mq/smarc_mx8mq.mk
- imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-emmc.lst
- imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-sd.lst
- imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.bat
- imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
- scripts/sh/smarc-mkemmc.sh
- scripts/sh/smarc-mksdcard.sh
imx8m/smarc_mx8mq/BoardConfig.mk
| ... | ... | @@ -135,12 +135,12 @@ |
| 135 | 135 | BOARD_PREBUILT_DTBOIMAGE := out/target/product/smarc_mx8mq/dtbo-smarcimx8mq-hdmi.img |
| 136 | 136 | |
| 137 | 137 | TARGET_BOARD_DTS_CONFIG := \ |
| 138 | - smarcimx8mq-dcss-lvds:imx8mq-smarc-dcss-lvds.dtb \ | |
| 139 | - smarcimx8mq-dp:imx8mq-smarc-dp.dtb \ | |
| 140 | - smarcimx8mq:imx8mq-smarc.dtb \ | |
| 141 | - smarcimx8mq-dual-display:imx8mq-smarc-dual-display.dtb \ | |
| 142 | - smarcimx8mq-hdmi:imx8mq-smarc-hdmi.dtb \ | |
| 143 | - smarcimx8mq-lcdif-lvds:imx8mq-smarc-lcdif-lvds.dtb | |
| 138 | + imx8mq-smarc-dcss-lvds:imx8mq-smarc-dcss-lvds.dtb \ | |
| 139 | + imx8mq-smarc-dp:imx8mq-smarc-dp.dtb \ | |
| 140 | + imx8mq-smarc:imx8mq-smarc.dtb \ | |
| 141 | + imx8mq-smarc-dual-display:imx8mq-smarc-dual-display.dtb \ | |
| 142 | + imx8mq-smarc-hdmi:imx8mq-smarc-hdmi.dtb \ | |
| 143 | + imx8mq-smarc-lcdif-lvds:imx8mq-smarc-lcdif-lvds.dtb | |
| 144 | 144 | |
| 145 | 145 | BOARD_SEPOLICY_DIRS := \ |
| 146 | 146 | device/fsl/imx8m/sepolicy \ |
imx8m/smarc_mx8mq/UbootKernelBoardConfig.mk
| ... | ... | @@ -5,15 +5,20 @@ |
| 5 | 5 | TARGET_BOOTLOADER_CONFIG := \ |
| 6 | 6 | imx8mq-smarc_2g:smarcimx8mq_2g_ser3_android_defconfig \ |
| 7 | 7 | imx8mq-smarc_4g:smarcimx8mq_4g_ser3_android_defconfig \ |
| 8 | + imx8mq-dual-smarc_2g:smarcimx8mq_2g_ser3_android_dual_defconfig \ | |
| 9 | + imx8mq-dual-smarc_4g:smarcimx8mq_4g_ser3_android_dual_defconfig \ | |
| 8 | 10 | imx8mq-smarc_2g-uuu:smarcimx8mq_2g_ser3_android_uuu_defconfig \ |
| 9 | 11 | imx8mq-smarc_4g-uuu:smarcimx8mq_4g_ser3_android_uuu_defconfig |
| 10 | 12 | ifeq ($(PRODUCT_IMX_TRUSTY),true) |
| 11 | 13 | TARGET_BOOTLOADER_CONFIG += \ |
| 12 | - imx8mq-smarc_2g-trusty:smarcimx8mq_2g_ser3_android_trusty_defconfig \ | |
| 13 | - imx8mq-smarc_4g-trusty:smarcimx8mq_4g_ser3_android_trusty_defconfig | |
| 14 | + imx8mq-trusty-smarc_2g:smarcimx8mq_2g_ser3_android_trusty_defconfig \ | |
| 15 | + imx8mq-trusty-smarc_4g:smarcimx8mq_4g_ser3_android_trusty_defconfig | |
| 14 | 16 | TARGET_BOOTLOADER_CONFIG += \ |
| 15 | - imx8mq-smarc_2g-trusty-secure-unlock:smarcimx8mq_2g_ser3_android_trusty_secure_unlock_defconfig \ | |
| 16 | - imx8mq-smarc_4g-trusty-secure-unlock:smarcimx8mq_4g_ser3_android_trusty_secure_unlock_defconfig | |
| 17 | + imx8mq-trusty-secure-unlock-smarc_2g:smarcimx8mq_2g_ser3_android_trusty_secure_unlock_defconfig \ | |
| 18 | + imx8mq-trusty-secure-unlock-smarc_4g:smarcimx8mq_4g_ser3_android_trusty_secure_unlock_defconfig | |
| 19 | + TARGET_BOOTLOADER_CONFIG += \ | |
| 20 | + imx8mq-trusty-dual-smarc_2g:smarcimx8mq_2g_ser3_android_trusty_dual_defconfig \ | |
| 21 | + imx8mq-trusty-dual-smarc_4g:smarcimx8mq_4g_ser3_android_trusty_dual_defconfig | |
| 17 | 22 | endif |
| 18 | 23 | |
| 19 | 24 | TARGET_KERNEL_DEFCONFIG := imx_v8_android_defconfig |
imx8m/smarc_mx8mq/smarc_mx8mq.mk
| ... | ... | @@ -2,6 +2,11 @@ |
| 2 | 2 | # It will inherit from FSL core product which in turn inherit from Google generic |
| 3 | 3 | |
| 4 | 4 | IMX_DEVICE_PATH := device/embedian/imx8m/smarc_mx8mq |
| 5 | +LINUX_FIRMWARE_IMX_PATH := vendor/nxp | |
| 6 | +FSL_PROPRIETARY_PATH := vendor/nxp | |
| 7 | +IMX_SECURITY_PATH := vendor/nxp-private/security | |
| 8 | +IMX_PATH := vendor/nxp-opensource | |
| 9 | +FSL_CODEC_PATH := vendor/nxp | |
| 5 | 10 | |
| 6 | 11 | # configs shared between uboot, kernel and Android rootfs |
| 7 | 12 | include $(IMX_DEVICE_PATH)/SharedBoardConfig.mk |
imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-emmc.lst
| ... | ... | @@ -12,20 +12,20 @@ |
| 12 | 12 | FB: ucmd mmc dev 0 0 |
| 13 | 13 | FB: ucmd mmc erase 0x2000 0x8 |
| 14 | 14 | FB: ucmd mmc partconf 0 1 1 1 |
| 15 | -FB[-t 600000]: flash bootloader0 u-boot-imx8mq-smarc_4g.imx | |
| 15 | +FB[-t 600000]: flash bootloader0 u-boot-imx8mq-trusty-smarc_4g.imx | |
| 16 | 16 | FB[-t 600000]: flash gpt partition-table.img |
| 17 | 17 | FB: ucmd setenv fastboot_dev mmc |
| 18 | -FB[-t 600000]: flash dtbo_a dtbo-smarcimx8mq-hdmi.img | |
| 18 | +FB[-t 600000]: flash dtbo_a dtbo-imx8mq-smarc-hdmi.img | |
| 19 | 19 | FB[-t 600000]: flash boot_a boot.img |
| 20 | -FB[-t 600000]: flash vbmeta_a vbmeta-smarcimx8mq-hdmi.img | |
| 21 | -FB[-t 600000]: flash dtbo_b dtbo-smarcimx8mq-hdmi.img | |
| 20 | +FB[-t 600000]: flash vbmeta_a vbmeta-imx8mq-smarc-hdmi.img | |
| 21 | +FB[-t 600000]: flash dtbo_b dtbo-imx8mq-smarc-hdmi.img | |
| 22 | 22 | FB[-t 600000]: flash boot_b boot.img |
| 23 | -FB[-t 600000]: flash vbmeta_b vbmeta-smarcimx8mq-hdmi.img | |
| 23 | +FB[-t 600000]: flash vbmeta_b vbmeta-imx8mq-smarc-hdmi.img | |
| 24 | 24 | FB[-t 600000]: flash super super.img |
| 25 | 25 | FB[-t 600000]: erase misc |
| 26 | 26 | FB[-t 600000]: erase presistdata |
| 27 | 27 | FB[-t 600000]: erase fbmisc |
| 28 | 28 | FB[-t 600000]: erase metadata |
| 29 | 29 | FB[-t 600000]: erase userdata |
| 30 | -FB: done | |
| 30 | +FB: done |
imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-sd.lst
| ... | ... | @@ -12,20 +12,20 @@ |
| 12 | 12 | FB: ucmd mmc dev 1 0 |
| 13 | 13 | FB: ucmd mmc erase 0x2000 0x8 |
| 14 | 14 | FB: ucmd mmc partconf 1 1 1 1 |
| 15 | -FB[-t 600000]: flash bootloader0 u-boot-imx8mq-smarc_4g.imx | |
| 15 | +FB[-t 600000]: flash bootloader0 u-boot-imx8mq-trusty-smarc_4g.imx | |
| 16 | 16 | FB[-t 600000]: flash gpt partition-table.img |
| 17 | 17 | FB: ucmd setenv fastboot_dev mmc |
| 18 | -FB[-t 600000]: flash dtbo_a dtbo-smarcimx8mq-hdmi.img | |
| 18 | +FB[-t 600000]: flash dtbo_a dtbo-imx8mq-smarc-hdmi.img | |
| 19 | 19 | FB[-t 600000]: flash boot_a boot.img |
| 20 | -FB[-t 600000]: flash vbmeta_a vbmeta-smarcimx8mq-hdmi.img | |
| 21 | -FB[-t 600000]: flash dtbo_b dtbo-smarcimx8mq-hdmi.img | |
| 20 | +FB[-t 600000]: flash vbmeta_a vbmeta-imx8mq-smarc-hdmi.img | |
| 21 | +FB[-t 600000]: flash dtbo_b dtbo-imx8mq-smarc-hdmi.img | |
| 22 | 22 | FB[-t 600000]: flash boot_b boot.img |
| 23 | -FB[-t 600000]: flash vbmeta_b vbmeta-smarcimx8mq-hdmi.img | |
| 23 | +FB[-t 600000]: flash vbmeta_b vbmeta-imx8mq-smarc-hdmi.img | |
| 24 | 24 | FB[-t 600000]: flash super super.img |
| 25 | 25 | FB[-t 600000]: erase misc |
| 26 | 26 | FB[-t 600000]: erase presistdata |
| 27 | 27 | FB[-t 600000]: erase fbmisc |
| 28 | 28 | FB[-t 600000]: erase metadata |
| 29 | 29 | FB[-t 600000]: erase userdata |
| 30 | -FB: done | |
| 30 | +FB: done |
imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.bat
| ... | ... | @@ -79,8 +79,7 @@ |
| 79 | 79 | set imx8mm_uboot_feature=dual trusty-dual 4g-evk-uuu 4g ddr4-evk-uuu ddr4 evk-uuu trusty-4g trusty-secure-unlock trusty |
| 80 | 80 | set imx8mn_uboot_feature=dual trusty-dual evk-uuu trusty-secure-unlock trusty ddr4-evk-uuu ddr4 |
| 81 | 81 | set imx8mp_uboot_feature=dual trusty-dual evk-uuu trusty-secure-unlock trusty |
| 82 | -set imx8mq_uboot_feature=dual trusty-dual evk-uuu trusty-secure-unlock trusty | |
| 83 | -set smarcimx8mq_uboot_feature=smarc_4g smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_4g-trusty smarc_2g smarc_2g-uuu smarc_2g-trusty-secure-unlock smarc_2g-trusty | |
| 82 | +set imx8mq_uboot_feature=smarc_2g trusty-smarc_2g trusty-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g trusty-smarc_4g trusty-dual-smarc_4g trusty-secure-unlock-smarc_4g | |
| 84 | 83 | set imx8qxp_uboot_feature=mek-uuu trusty-secure-unlock trusty secure-unlock c0 trusty-c0 mek-c0-uuu |
| 85 | 84 | set imx8qm_uboot_feature=mek-uuu trusty-secure-unlock trusty secure-unlock md hdmi |
| 86 | 85 | set imx7ulp_uboot_feature=evk-uuu |
| ... | ... | @@ -88,8 +87,7 @@ |
| 88 | 87 | set imx8mm_dtb_feature=ddr4 m4 mipi-panel |
| 89 | 88 | set imx8mn_dtb_feature=mipi-panel rpmsg ddr4 ddr4-mipi-panel ddr4-rpmsg |
| 90 | 89 | set imx8mp_dtb_feature=rpmsg hdmi lvds-panel lvds mipi-panel basler ov5640 |
| 91 | -set imx8mq_dtb_feature=dual mipi-panel mipi | |
| 92 | -set smarcimx8mq_dtb_feature=hdmi dcss-lvds lcdif-lvds dp dual-display | |
| 90 | +set imx8mq_dtb_feature=hdmi dcss-lvds dp lcdif-lvds dual-display dual mipi-panel mipi | |
| 93 | 91 | set imx8qxp_dtb_feature= |
| 94 | 92 | set imx8qm_dtb_feature=hdmi mipi-panel md xen |
| 95 | 93 | set imx7ulp_dtb_feature=evk-mipi evk mipi |
| ... | ... | @@ -237,15 +235,6 @@ |
| 237 | 235 | ) |
| 238 | 236 | goto :device_info_end |
| 239 | 237 | ) |
| 240 | -if not [%soc_name:smarcimx8mq=%] == [%soc_name%] ( | |
| 241 | - set vid=0x1fc9& set pid=0x012b& set chip=MX8MQ | |
| 242 | - set uboot_env_start=0x2000& set uboot_env_len=0x8 | |
| 243 | - set emmc_num=0& set sd_num=1 | |
| 244 | - if [%board%] == [] ( | |
| 245 | - set board=smarc | |
| 246 | - ) | |
| 247 | - goto :device_info_end | |
| 248 | -) | |
| 249 | 238 | if not [%soc_name:imx8mm=%] == [%soc_name%] ( |
| 250 | 239 | set vid=0x1fc9& set pid=00x0134& set chip=MX8MM |
| 251 | 240 | set uboot_env_start=0x2000& set uboot_env_len=0x8 |
| ... | ... | @@ -362,8 +351,8 @@ |
| 362 | 351 | :without_sdps |
| 363 | 352 | |
| 364 | 353 | :: default bootloader image name |
| 365 | -set bootloader_used_by_uuu=u-boot-imx8mq%uboot_feature%-uuu.imx | |
| 366 | -set bootloader_flashed_to_board=u-boot-imx8mq%uboot_feature%.imx | |
| 354 | +set bootloader_used_by_uuu=u-boot-%soc_name%-smarc_4g-uuu.imx | |
| 355 | +set bootloader_flashed_to_board=u-boot-%soc_name%%uboot_feature%.imx | |
| 367 | 356 | |
| 368 | 357 | |
| 369 | 358 | :: find the names of the bootloader used by uuu |
| 370 | 359 | |
| ... | ... | @@ -420,11 +409,11 @@ |
| 420 | 409 | cmd /c mklink u-boot-imx8qm-xen-dom0.imx.link %image_directory%u-boot-imx8qm-xen-dom0.imx > nul |
| 421 | 410 | echo FB: flash bootloader0 u-boot-imx8qm-xen-dom0.imx.link >> uuu.lst |
| 422 | 411 | :: write the xen spl from android team to FAT on SD card |
| 423 | - set xen_uboot_name=spl-%soc_name%-%dtb_feature%.bin | |
| 412 | + set xen_uboot_name=spl-%soc_name%-smarc-%dtb_feature%.bin | |
| 424 | 413 | for /f "usebackq" %%A in ('%image_directory%!xen_uboot_name!') do set xen_uboot_size_dec=%%~zA |
| 425 | 414 | :: directly pass the name of variable, just like pointer in C program |
| 426 | 415 | call :dec_to_hex !xen_uboot_size_dec! xen_uboot_size_hex |
| 427 | - echo generate lines to write spl-%soc_name%-%dtb_feature%.bin to FAT on SD card | |
| 416 | + echo generate lines to write spl-%soc_name%-smarc-%dtb_feature%.bin to FAT on SD card | |
| 428 | 417 | if exist !xen_uboot_name!.link ( |
| 429 | 418 | del !xen_uboot_name!.link |
| 430 | 419 | ) |
| 431 | 420 | |
| ... | ... | @@ -525,10 +514,10 @@ |
| 525 | 514 | echo ๅฟตๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆ |
| 526 | 515 | echo ๅฒซ imx8mp ๅฒซ dual trusty-dual evk-uuu trusty-secure-unlock trusty ๅฒซ |
| 527 | 516 | echo ๅฟตๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆ |
| 528 | -echo ๅฒซ imx8mq ๅฒซ dual trusty-dual evk-uuu trusty-secure-unlock ๅฒซ | |
| 517 | +echo ๅฒซ imx8mq ๅฒซ smarc_2g trusty-smarc_2g trusty-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g trusty-smarc_4g trusty-dual-smarc_4g trusty-secure-unlock-smarc_4g ๅฒซ | |
| 529 | 518 | echo ๅฟตๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆ |
| 530 | 519 | echo ๅฟตๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆ |
| 531 | -echo ๅฒซ smarcimx8mq ๅฒซ smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_2g-uuu smarc_2g-trusty-secure-unlock ๅฒซ | |
| 520 | +echo ๅฒซ smarcimx8mq ๅฒซ smarc_4g-uuu smarc_4g-dual smarc_4g-trusty smarc_4g-trusty-dualsmarc_4g-trusty-secure-unlock smarc_2g-uuu smarc_2g-dual smarc_2g-trusty-secure-unlock smarc_2g-trusty smarc_2g-trusty-dual ๅฒซ | |
| 532 | 521 | echo ๅฟตๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆ |
| 533 | 522 | echo ๅฒซ imx8qxp ๅฒซ mek-uuu trusty-secure-unlock trusty secure-unlock c0 trusty-c0 mek-c0-uuu ๅฒซ |
| 534 | 523 | echo ๅฟตๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๅฒธๆ |
| ... | ... | @@ -672,7 +661,7 @@ |
| 672 | 661 | set local_str=%local_str:_a=% |
| 673 | 662 | set local_str=%local_str:_b=% |
| 674 | 663 | |
| 675 | -set img_name=%local_str%-%soc_name%.img | |
| 664 | +set img_name=%local_str%-%soc_name%-smarc.img | |
| 676 | 665 | |
| 677 | 666 | if not [%partition_to_be_flashed:bootloader_=%] == [%partition_to_be_flashed%] ( |
| 678 | 667 | set img_name=%uboot_proper_to_be_flashed% |
| 679 | 668 | |
| 680 | 669 | |
| ... | ... | @@ -696,15 +685,15 @@ |
| 696 | 685 | goto :start_to_flash |
| 697 | 686 | ) |
| 698 | 687 | if not [%partition_to_be_flashed:vbmeta=%] == [%partition_to_be_flashed%] if not [%dtb_feature%] == [] ( |
| 699 | - set img_name=%local_str%-%soc_name%-%dtb_feature%.img | |
| 688 | + set img_name=%local_str%-%soc_name%-smarc-%dtb_feature%.img | |
| 700 | 689 | goto :start_to_flash |
| 701 | 690 | ) |
| 702 | 691 | if not [%partition_to_be_flashed:dtbo=%] == [%partition_to_be_flashed%] if not [%dtb_feature%] == [] ( |
| 703 | - set img_name=%local_str%-%soc_name%-%dtb_feature%.img | |
| 692 | + set img_name=%local_str%-%soc_name%-smarc-%dtb_feature%.img | |
| 704 | 693 | goto :start_to_flash |
| 705 | 694 | ) |
| 706 | 695 | if not [%partition_to_be_flashed:recovery=%] == [%partition_to_be_flashed%] if not [%dtb_feature%] == [] ( |
| 707 | - set img_name=%local_str%-%soc_name%-%dtb_feature%.img | |
| 696 | + set img_name=%local_str%-%soc_name%-smarc-%dtb_feature%.img | |
| 708 | 697 | goto :start_to_flash |
| 709 | 698 | ) |
| 710 | 699 | if not [%partition_to_be_flashed:bootloader=%] == [%partition_to_be_flashed%] ( |
| 711 | 700 | |
| ... | ... | @@ -781,12 +770,12 @@ |
| 781 | 770 | |
| 782 | 771 | :: if dual bootloader is supported, the name of the bootloader flashed to the board need to be updated |
| 783 | 772 | if %support_dual_bootloader% == 1 ( |
| 784 | - set bootloader_flashed_to_board=spl-imx8mq%uboot_feature%.bin | |
| 785 | - set uboot_proper_to_be_flashed=bootloader-imx8mq%uboot_feature%.img | |
| 773 | + set bootloader_flashed_to_board=spl-%soc_name%%uboot_feature%.bin | |
| 774 | + set uboot_proper_to_be_flashed=bootloader-%soc_name%%uboot_feature%.img | |
| 786 | 775 | :: # specially handle xen related condition |
| 787 | 776 | if [%dtb_feature%] == [xen] ( |
| 788 | 777 | if [%soc_name%] == [imx8qm] ( |
| 789 | - set uboot_proper_to_be_flashed=bootloader-%soc_name%-%dtb_feature%.img | |
| 778 | + set uboot_proper_to_be_flashed=bootloader-%soc_name%-smarc-%dtb_feature%.img | |
| 790 | 779 | ) |
| 791 | 780 | ) |
| 792 | 781 | ) |
imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | โโโโโโโโโโโโโโโโโโผโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโค |
| 41 | 41 | โ imx8mp โ dual trusty-dual evk-uuu trusty-secure-unlock trusty โ |
| 42 | 42 | โโโโโโโโโโโโโโโโโโผโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโค |
| 43 | - โ imx8mq โ dual trusty-dual evk-uuu trusty-secure-unlock trusty โ | |
| 43 | + โ imx8mq โ smarc_2g trusty-smarc_2g trusty-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g trusty-smarc_4g trusty-dual-smarc_4g trusty-secure-unlock-smarc_4g โ | |
| 44 | 44 | โโโโโโโโโโโโโโโโโโผโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโค |
| 45 | 45 | โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโค |
| 46 | 46 | โ imx8mq โ smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_2g-uuu smarc_2g-trusty-secure-unlock โ |
| ... | ... | @@ -134,7 +134,7 @@ |
| 134 | 134 | img_name="${soc_name}_mcu_demo.img" |
| 135 | 135 | fi |
| 136 | 136 | elif [ "$(echo ${1} | grep -E "dtbo|vbmeta|recovery")" != "" -a "${dtb_feature}" != "" ]; then |
| 137 | - img_name="${1%_*}-${soc_name}-${dtb_feature}.img" | |
| 137 | + img_name="${1%_*}-${soc_name}-smarc-${dtb_feature}.img" | |
| 138 | 138 | elif [ "$(echo ${1} | grep "gpt")" != "" ]; then |
| 139 | 139 | img_name=${partition_file} |
| 140 | 140 | elif [ "$(echo ${1} | grep "super")" != "" ]; then |
| 141 | 141 | |
| ... | ... | @@ -203,10 +203,10 @@ |
| 203 | 203 | |
| 204 | 204 | # uboot or spl&bootloader |
| 205 | 205 | if [ ${support_dual_bootloader} -eq 1 ]; then |
| 206 | - bootloader_flashed_to_board="spl-imx8mq${uboot_feature}.bin" | |
| 207 | - uboot_proper_to_be_flashed="bootloader-imx8mq${uboot_feature}.img" | |
| 206 | + bootloader_flashed_to_board="spl-${soc_name}${uboot_feature}.bin" | |
| 207 | + uboot_proper_to_be_flashed="bootloader-${soc_name}${uboot_feature}.img" | |
| 208 | 208 | else |
| 209 | - bootloader_flashed_to_board="u-boot-imx8mq${uboot_feature}.imx" | |
| 209 | + bootloader_flashed_to_board="u-boot-${soc_name}${uboot_feature}.imx" | |
| 210 | 210 | fi |
| 211 | 211 | |
| 212 | 212 | # in the source code, if AB slot feature is supported, uboot partition name is bootloader0, otherwise it's bootloader |
| ... | ... | @@ -356,7 +356,7 @@ |
| 356 | 356 | # images when flash another set of images can not be detect early with this scenario. |
| 357 | 357 | imx8mm_uboot_feature=(dual trusty-dual 4g-evk-uuu 4g ddr4-evk-uuu ddr4 evk-uuu trusty-4g trusty-secure-unlock trusty) |
| 358 | 358 | imx8mn_uboot_feature=(dual trusty-dual evk-uuu trusty-secure-unlock trusty ddr4-evk-uuu ddr4) |
| 359 | -imx8mq_uboot_feature=(dual trusty-dual evk-uuu trusty-secure-unlock trusty) | |
| 359 | +imx8mq_uboot_feature=(smarc_2g smarc_2g-dp trusty-smarc_2g trustu-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g smarc_4g-dp trusty-smarc_4g trustu-dual-smarc_4g trusty-secure-unlock-smarc_4g) | |
| 360 | 360 | smarcimx8mq_uboot_feature=(smarc_4g smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_4g-trusty smarc_2g smarc_2g-uuu smarc_2g-trusty-secure-unlock smarc_2g-trusty) |
| 361 | 361 | imx8mp_uboot_feature=(dual trusty-dual evk-uuu trusty-secure-unlock trusty) |
| 362 | 362 | imx8qxp_uboot_feature=(mek-uuu trusty-secure-unlock trusty secure-unlock c0 trusty-c0 mek-c0-uuu) |
| ... | ... | @@ -365,8 +365,7 @@ |
| 365 | 365 | |
| 366 | 366 | imx8mm_dtb_feature=(ddr4 m4 mipi-panel) |
| 367 | 367 | imx8mn_dtb_feature=(mipi-panel rpmsg ddr4 ddr4-mipi-panel ddr4-rpmsg) |
| 368 | -imx8mq_dtb_feature=(dual mipi-panel mipi) | |
| 369 | -smarcimx8mq_dtb_feature=(hdmi dcss-lvds lcdif-lvds dp dual-display) | |
| 368 | +imx8mq_dtb_feature=(hdmi dcss-lvds lcdif-lvds dp dual-display) | |
| 370 | 369 | imx8mp_dtb_feature=(rpmsg hdmi lvds-panel lvds mipi-panel basler ov5640) |
| 371 | 370 | imx8qxp_dtb_feature=() |
| 372 | 371 | imx8qm_dtb_feature=(hdmi mipi-panel md xen) |
scripts/sh/smarc-mkemmc.sh
| ... | ... | @@ -164,7 +164,7 @@ |
| 164 | 164 | fi |
| 165 | 165 | |
| 166 | 166 | # imx8mq chips and imx8mm chips, bootloader offset is 33KB on SD card |
| 167 | -if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" -o "${soc_name}" = "smarcimx8mq" ]; then | |
| 167 | +if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" ]; then | |
| 168 | 168 | bootloader_offset=33 |
| 169 | 169 | fi |
| 170 | 170 | |
| ... | ... | @@ -300,7 +300,7 @@ |
| 300 | 300 | elif [ ${support_dtbo} -eq 1 ] && [ $(echo ${1} | grep "boot") != "" ] 2>/dev/null; then |
| 301 | 301 | img_name="boot.img" |
| 302 | 302 | elif [ "$(echo ${1} | grep -E "dtbo|vbmeta|recovery")" != "" -a "${dtb_feature}" != "" ]; then |
| 303 | - img_name="${1%_*}-${soc_name}${dtb_feature}.img" | |
| 303 | + img_name="${1%_*}-${soc_name}-smarc-${dtb_feature}.img" | |
| 304 | 304 | elif [ "$(echo ${1} | grep "super")" != "" ]; then |
| 305 | 305 | if [ ${dont_generate_super} -eq 0 ]; then |
| 306 | 306 | make_super_image |
| 307 | 307 | |
| ... | ... | @@ -363,12 +363,12 @@ |
| 363 | 363 | gdisk -l ${node} 2>/dev/null | grep -q "super" && support_dynamic_partition=1 |
| 364 | 364 | |
| 365 | 365 | if [ ${support_dual_bootloader} -eq 1 ]; then |
| 366 | - bootloader_file=spl-imx8mq${uboot_feature}.bin | |
| 367 | - uboot_proper_file=bootloader-imx8mq${uboot_feature}.img | |
| 366 | + bootloader_file=spl-${soc_name}${uboot_feature}.bin | |
| 367 | + uboot_proper_file=bootloader-${soc_name}${uboot_feature}.img | |
| 368 | 368 | bootloader_partition="bootloader"${slot} |
| 369 | 369 | flash_partition ${bootloader_partition} || exit 1 |
| 370 | 370 | else |
| 371 | - bootloader_file=u-boot-imx8mq${uboot_feature}.imx | |
| 371 | + bootloader_file=u-boot-${soc_name}${uboot_feature}.imx | |
| 372 | 372 | fi |
| 373 | 373 | |
| 374 | 374 | if [ "${support_dtbo}" -eq "1" ] ; then |
scripts/sh/smarc-mksdcard.sh
| ... | ... | @@ -165,7 +165,7 @@ |
| 165 | 165 | fi |
| 166 | 166 | |
| 167 | 167 | # imx8mq chips and imx8mm chips, bootloader offset is 33KB on SD card |
| 168 | -if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" -o "${soc_name}" = "smarcimx8mq" ]; then | |
| 168 | +if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" ]; then | |
| 169 | 169 | bootloader_offset=33 |
| 170 | 170 | fi |
| 171 | 171 | |
| ... | ... | @@ -301,7 +301,7 @@ |
| 301 | 301 | elif [ ${support_dtbo} -eq 1 ] && [ $(echo ${1} | grep "boot") != "" ] 2>/dev/null; then |
| 302 | 302 | img_name="boot.img" |
| 303 | 303 | elif [ "$(echo ${1} | grep -E "dtbo|vbmeta|recovery")" != "" -a "${dtb_feature}" != "" ]; then |
| 304 | - img_name="${1%_*}-${soc_name}${dtb_feature}.img" | |
| 304 | + img_name="${1%_*}-${soc_name}-smarc-${dtb_feature}.img" | |
| 305 | 305 | elif [ "$(echo ${1} | grep "super")" != "" ]; then |
| 306 | 306 | if [ ${dont_generate_super} -eq 0 ]; then |
| 307 | 307 | make_super_image |
| 308 | 308 | |
| ... | ... | @@ -367,12 +367,12 @@ |
| 367 | 367 | gdisk -l ${node} 2>/dev/null | grep -q "super" && support_dynamic_partition=1 |
| 368 | 368 | |
| 369 | 369 | if [ ${support_dual_bootloader} -eq 1 ]; then |
| 370 | - bootloader_file=spl-imx8mq${uboot_feature}.bin | |
| 371 | - uboot_proper_file=bootloader-imx8mq${uboot_feature}.img | |
| 370 | + bootloader_file=spl-${soc_name}${uboot_feature}.bin | |
| 371 | + uboot_proper_file=bootloader-${soc_name}${uboot_feature}.img | |
| 372 | 372 | bootloader_partition="bootloader"${slot} |
| 373 | 373 | flash_partition ${bootloader_partition} || exit 1 |
| 374 | 374 | else |
| 375 | - bootloader_file=u-boot-imx8mq${uboot_feature}.imx | |
| 375 | + bootloader_file=u-boot-${soc_name}${uboot_feature}.imx | |
| 376 | 376 | fi |
| 377 | 377 | |
| 378 | 378 | if [ "${support_dtbo}" -eq "1" ] ; then |