diff options
6 files changed, 141 insertions, 74 deletions
diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc index 30e1775..ca40e6b 100644 --- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc +++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc @@ -187,9 +187,11 @@ UBOOT_DTB_LOADADDRESS_colibri-imx7-emmc = "0x82000000" UBOOT_RD_LOADADDRESS_colibri-imx7-emmc = "0x82100000" # iMX6ULL +UBOOT_SIGN_ENABLE_mx6ull = "1" PREFERRED_PROVIDER_virtual/kernel_mx6ull ?= "linux-lmp-fslc-imx" PREFERRED_PROVIDER_virtual/bootloader_mx6ull ?= "u-boot-fio" PREFERRED_PROVIDER_u-boot_mx6ull ?= "u-boot-fio" +PREFERRED_VERSION_u-boot-fio_mx6ull ?= "2020.04" PREFERRED_PROVIDER_u-boot-fw-utils_mx6ull = "libubootenv" PREFERRED_RPROVIDER_u-boot-fw-utils_mx6ull = "libubootenv" SOTA_CLIENT_FEATURES_append_mx6ull = " ubootenv" diff --git a/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc index e02f54c..57aa6f6 100644 --- a/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc +++ b/meta-lmp-bsp/conf/machine/include/lmp-mfgtool-machine-custom.inc @@ -1,10 +1,17 @@ # iMX6ULL PREFERRED_PROVIDER_virtual/kernel_mx6ull = "linux-lmp-dev-mfgtool" +KERNEL_REPO_mx6ull ?= "git://github.com/Freescale/linux-fslc.git" +LINUX_VERSION_mx6ull ?= "5.4.y" +KERNEL_BRANCH_mx6ull ?= "5.4-1.0.0-imx" +PREFERRED_VERSION_u-boot-fio-mfgtool_mx6ull ?= "2020.04" PREFERRED_PROVIDER_virtual/bootloader_mx6ull = "u-boot-fio-mfgtool" PREFERRED_PROVIDER_u-boot_mx6ull = "u-boot-fio-mfgtool" PREFERRED_PROVIDER_u-boot-default-script_mx6ull = "u-boot-ostree-scr-fit" +UBOOT_CLASSES_mx6ull = "uboot-fitimage" IMAGE_BOOT_FILES_remove_mx6ull = "boot.scr uEnv.txt zImage" IMAGE_BOOT_FILES_append_mx6ull = " boot.itb SPL u-boot.itb" +KERNEL_IMAGETYPE_mx6ull = "fitImage" +KERNEL_CLASSES_mx6ull = " kernel-lmp-fitimage " # Apalis-iMX6 PREFERRED_PROVIDER_virtual/kernel_apalis-imx6 = "linux-lmp-dev-mfgtool" diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx6ullevk/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx6ullevk/lmp.cfg index 2a01722..1007010 100644 --- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx6ullevk/lmp.cfg +++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx6ullevk/lmp.cfg @@ -1,5 +1,5 @@ -CONFIG_DM_REGULATOR_FIXED=y CONFIG_SPL=y +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds" CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_FIT_SIGNATURE=y @@ -11,6 +11,7 @@ CONFIG_SPL_SHA256_SUPPORT=y CONFIG_SPL_CRYPTO_SUPPORT=y CONFIG_SPL_HASH_SUPPORT=y CONFIG_SPL_OPTEE=y +CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_OF_TRANSLATE=y @@ -19,59 +20,91 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y -# CONFIG_SPL_USB_HOST_SUPPORT=y -# CONFIG_SPL_USB_GADGET=y -# CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_EFI_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_DM_GPIO is not set +# CONFIG_SPL_DM_USB is not set +# CONFIG_SPL_USB_HOST_SUPPORT is not set +# CONFIG_SPL_USB_GADGET is not set +# CONFIG_SPL_USB_SDP_SUPPORT is not set # CONFIG_SPL_SPI_SUPPORT is not set # CONFIG_SPL_DM_74X164 is not set -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_IMX_HAB=n +CONFIG_IMX_HAB=y # CONFIG_CMD_DEKBLOB is not set -CONFIG_SUPPORT_EMMC_RPMB=y -CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_TEE=y CONFIG_OPTEE=y -CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_OPTEE_LOAD_ADDR=0x82000000 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000 CONFIG_OPTEE_TZDRAM_BASE=0x9E000000 -CONFIG_BOOTM_OPTEE=y -# CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y +CONFIG_FIT_SIGNATURE_STRICT=y CONFIG_FIT_VERBOSE=y +# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_PARTITION_UUIDS=y CONFIG_FIOVB=y CONFIG_CMD_FIOVB=y -# CONFIG_CMD_ELF is not set -# CONFIG_CMD_IMI is not set -CONFIG_DEFAULT_FDT_FILE="imx6ull-14x14-evk" -CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_OF_CONTROL=y -CONFIG_CMD_USB=y -CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_XIMG=y +CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_REGULATOR_FIXED=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_MXC_USB_OTG_HACTIVE=y -CONFIG_USB_STORAGE=y -CONFIG_USB_GADGET=y +CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 -CONFIG_CI_UDC=y -CONFIG_SDP_LOADADDR=0x82000000 -CONFIG_CMD_FASTBOOT=y -CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_UUU_SUPPORT=y -CONFIG_FASTBOOT=y -CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_FASTBOOT_BUF_ADDR=0x80800000 CONFIG_FASTBOOT_BUF_SIZE=0x03800000 -CONFIG_FASTBOOT_FLASH=y -CONFIG_EFI_PARTITION=y CONFIG_FSL_FASTBOOT_BOOTLOADER2=y +CONFIG_BOOTDELAY=-2 +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="reset" +CONFIG_DEFAULT_FDT_FILE="imx6ull-14x14-evk" +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_CI_UDC=y +CONFIG_SDP_LOADADDR=0x80800000 +CONFIG_ENV_IS_NOWHERE=y +# CONFIG_ENV_IS_IN_MMC is not set +# CONFIG_ANDROID_BOOT_IMAGE is not set +# CONFIG_NET is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_DHCP is not set +# CONFIG_CMD_BOOTP is not set +# CONFIG_CMD_TFTPBOOT is not set +# CONFIG_CMD_NFS is not set +# CONFIG_CMD_SYSBOOT is not set +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_BMODE is not set +# CONFIG_CMD_PXE is not set +# CONFIG_CMD_SATA is not set +# CONFIG_CMD_USB_MASS_STORAGE is not set +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_BOOTZ is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_EFI_LOADER is not set +# CONFIG_SATA is not set +# CONFIG_DWC_AHSATA is not set +# CONFIG_DM_SCSI is not set +# CONFIG_USB_STORAGE is not set +# CONFIG_USB_KEYBOARD is not set +# CONFIG_USB_HOST_ETHER is not set +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set +# CONFIG_DISTRO_DEFAULTS is not set +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_IMI is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_FLASH is not set diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ullevk/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ullevk/lmp.cfg index b1ca47b..6d8e7bf 100644 --- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ullevk/lmp.cfg +++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ullevk/lmp.cfg @@ -1,8 +1,5 @@ -CONFIG_CMD_DHCP=n -CONFIG_CMD_PING=n -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_MMC_BROKEN_CD=y CONFIG_SPL=y +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds" CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_FIT_SIGNATURE=y @@ -14,6 +11,7 @@ CONFIG_SPL_SHA256_SUPPORT=y CONFIG_SPL_CRYPTO_SUPPORT=y CONFIG_SPL_HASH_SUPPORT=y CONFIG_SPL_OPTEE=y +CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_OF_TRANSLATE=y @@ -21,47 +19,90 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_DM_REGULATOR=y -CONFIG_SPL_DM_REGULATOR_FIXED=y -CONFIG_SPL_MXC_OCOTP=n +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +# CONFIG_SPL_EFI_PARTITION is not set +# CONFIG_SPL_PARTITION_UUIDS is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_DM_GPIO is not set +# CONFIG_SPL_DM_USB is not set +# CONFIG_SPL_USB_HOST_SUPPORT is not set +# CONFIG_SPL_USB_GADGET is not set +# CONFIG_SPL_USB_SDP_SUPPORT is not set # CONFIG_SPL_SPI_SUPPORT is not set # CONFIG_SPL_DM_74X164 is not set -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_IMX_HAB=n +# CONFIG_IMX_HAB is not set # CONFIG_CMD_DEKBLOB is not set -CONFIG_SUPPORT_EMMC_RPMB=y -CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_TEE=y CONFIG_OPTEE=y -CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y CONFIG_OF_LIBFDT_OVERLAY=y -CONFIG_OPTEE_LOAD_ADDR=0x82000000 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000 CONFIG_OPTEE_TZDRAM_BASE=0x9E000000 -CONFIG_BOOTM_OPTEE=y -# CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE_STRICT=y CONFIG_FIT_VERBOSE=y -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="setenv script_addr 0x85000000; fatload mmc ${mmcdev}:1 ${script_addr} /boot.itb; setenv verify 1; source ${script_addr}; reset" +# CONFIG_LEGACY_IMAGE_FORMAT is not set CONFIG_PARTITION_UUIDS=y CONFIG_FIOVB=y -CONFIG_SPL_FIOVB=n CONFIG_CMD_FIOVB=y -CONFIG_ENV_IS_IN_MMC=n +CONFIG_CMD_XIMG=y +CONFIG_SUPPORT_EMMC_RPMB=y +CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_MMC_BROKEN_CD=y +# CONFIG_ENV_IS_IN_MMC is not set CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="1:1" CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_BOOTDELAY=-2 +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="setenv script_addr 0x85000000; fatload mmc ${mmcdev}:1 ${script_addr} /boot.itb; setenv verify 1; source ${script_addr}; reset" +CONFIG_DEFAULT_FDT_FILE="imx6ull-14x14-evk" +# CONFIG_ANDROID_BOOT_IMAGE is not set +# CONFIG_NET is not set +# CONFIG_CMD_NET is not set +# CONFIG_CMD_DHCP is not set +# CONFIG_CMD_BOOTP is not set +# CONFIG_CMD_TFTPBOOT is not set +# CONFIG_CMD_NFS is not set +# CONFIG_CMD_SYSBOOT is not set +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_BMODE is not set +# CONFIG_CMD_PXE is not set +# CONFIG_CMD_SATA is not set +# CONFIG_CMD_USB is not set +# CONFIG_CMD_USB_SDP is not set +# CONFIG_CMD_USB_MASS_STORAGE is not set +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_BOOTZ is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_FUSE is not set +# CONFIG_CMD_GPIO is not set +# CONFIG_CMD_GPT is not set +# CONFIG_CMD_EXT4_WRITE is not set +# CONFIG_EFI_LOADER is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_EXT4_WRITE is not set +# CONFIG_SATA is not set +# CONFIG_DWC_AHSATA is not set +# CONFIG_DM_SCSI is not set +# CONFIG_USB is not set +# CONFIG_USB_FUNCTION_FASTBOOT is not set +# CONFIG_CI_UDC is not set +# CONFIG_FASTBOOT is not set +# CONFIG_USB_KEYBOARD is not set +# CONFIG_USB_GADGET is not set +# CONFIG_USB_HOST_ETHER is not set +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set +# CONFIG_DISTRO_DEFAULTS is not set # CONFIG_CMD_ELF is not set # CONFIG_CMD_IMI is not set -CONFIG_EFI_PARTITION=y -CONFIG_DEFAULT_FDT_FILE="imx6ull-14x14-evk" -CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_OF_CONTROL=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_FLASH is not set diff --git a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/bootloader.uuu.in b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/bootloader.uuu.in index 07f9746..d370050 100644 --- a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/bootloader.uuu.in +++ b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/bootloader.uuu.in @@ -2,17 +2,9 @@ uuu_version 1.2.39 SDP: dcd -f SPL-mfgtool SDP: write -f SPL-mfgtool -ivt 0 -SDP: write -f u-boot-mfgtool.itb -addr 0x82000000 +SDP: write -f u-boot-mfgtool.itb -addr 0x80800000 SDP: jump -f SPL-mfgtool -ivt -SDPU: delay 1000 -SDPU: write -f u-boot-mfgtool.itb -addr 0x82000000 -SDPU: jump - -SDPV: delay 1000 -SDPV: write -f u-boot-mfgtool.itb -skipspl -SDPV: jump - FB: ucmd if mmc dev 0; then setenv flash_dev 0; setenv emmc_partconf "mmc partconf ${flash_dev} ${emmc_ack} 1 0"; else setenv flash_dev 1; setenv emmc_partconf "true"; fi; FB: ucmd setenv fastboot_dev mmc FB: ucmd mmc dev ${flash_dev} diff --git a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/full_image.uuu.in b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/full_image.uuu.in index 655c4a8..e22901d 100644 --- a/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/full_image.uuu.in +++ b/meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx6ullevk/full_image.uuu.in @@ -2,17 +2,9 @@ uuu_version 1.2.39 SDP: dcd -f SPL-mfgtool SDP: write -f SPL-mfgtool -ivt 0 -SDP: write -f u-boot-mfgtool.itb -addr 0x82000000 +SDP: write -f u-boot-mfgtool.itb -addr 0x80800000 SDP: jump -f SPL-mfgtool -ivt -SDPU: delay 1000 -SDPU: write -f u-boot-mfgtool.itb -addr 0x82000000 -SDPU: jump - -SDPV: delay 1000 -SDPV: write -f u-boot-mfgtool.itb -skipspl -SDPV: jump - FB: ucmd if mmc dev 0; then setenv flash_dev 0; setenv emmc_partconf "mmc partconf ${flash_dev} ${emmc_ack} 1 0"; else setenv flash_dev 1; setenv emmc_partconf "true"; fi; FB: ucmd setenv fastboot_dev mmc FB: ucmd mmc dev ${flash_dev} |