imx6ul: enable u-boot 2022.04

meta-lmp-base/recipes-security/optee/optee-os-fio.inc

@@ -21,7 +21,8 @@ CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os"
 PROVIDES = "virtual/optee-os"
 
 SRCBRANCH ?= "master"
-SRC_URI = "git://github.com/foundriesio/optee_os.git;protocol=https;branch=${SRCBRANCH}"
+OPTEE_OS_REPO ?= "git://github.com/foundriesio/optee_os.git"
+SRC_URI = "${OPTEE_OS_REPO};protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc

@@ -175,10 +175,12 @@ UBOOT_RD_LOADADDRESS:mx6ul-generic-bsp = "0x84000000"
 MACHINE_FEATURES:append:mx6ul-generic-bsp = " optee"
 LMP_BOOT_FIRMWARE_FILES:mx6ul-generic-bsp = "SPL u-boot.itb"
 IMAGE_BOOT_FILES:sota:mx6ul-generic-bsp = " boot.itb"
-IMAGE_BOOT_FILES:mx6ul-generic-bsp = " boot.scr uEnv.txt zImage"
+IMAGE_BOOT_FILES:mx6ul-generic-bsp = " boot.scr uEnv.txt zImage ${@make_dtb_boot_files(d)}"
 KERNEL_IMAGETYPE:sota:mx6ul-generic-bsp = "fitImage"
 KERNEL_CLASSES:sota:mx6ul-generic-bsp = " kernel-lmp-fitimage "
 WKS_FILE:mx6ul-generic-bsp:sota = "sdimage-imx6-spl-fit-sota.wks"
+PREFERRED_VERSION_u-boot-fio:mx6ul-nxp-bsp ?= "imx-2022.04"
+PREFERRED_VERSION_u-boot-fio-mfgtool:mx6ul-nxp-bsp ?= "imx-2022.04"
 # iMX6UL EVK
 SOTA_CLIENT_FEATURES:append:imx6ulevk = " ubootenv"
 UBOOT_MACHINE:imx6ulevk = "mx6ul_14x14_evk_defconfig"
@@ -206,6 +208,8 @@ IMAGE_BOOT_FILES:mx6ull-generic-bsp = " boot.scr uEnv.txt zImage ${@make_dtb_boo
 KERNEL_IMAGETYPE:sota:mx6ull-generic-bsp = "fitImage"
 KERNEL_CLASSES:sota:mx6ull-generic-bsp = " kernel-lmp-fitimage "
 WKS_FILE:mx6ull-generic-bsp:sota = "sdimage-imx6-spl-fit-sota.wks"
+PREFERRED_VERSION_u-boot-fio:mx6ull-nxp-bsp ?= "imx-2022.04"
+PREFERRED_VERSION_u-boot-fio-mfgtool:mx6ull-nxp-bsp ?= "imx-2022.04"
 # iMX6ULL EVK
 SOTA_CLIENT_FEATURES:append:imx6ullevk = " ubootenv"
 UBOOT_MACHINE:imx6ullevk = "mx6ull_14x14_evk_defconfig"

meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx6ulevk/lmp.cfg

@@ -1,23 +1,25 @@
 CONFIG_SPL=y
-# MAX SIZE = D000(SPL+dtb) + 2060(csf) - 400(fit signing data)
-CONFIG_SPL_SIZE_LIMIT=0xEC60
+CONFIG_SPL_DM=y
+# MAX SIZE = 0x10000(0x918000-0x908000, IMX6ULRM 8.4.1 Internal ROM/RAM memory map) - 0x400(FIT signing data)
+CONFIG_SPL_SIZE_LIMIT=0xFC00
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds"
 CONFIG_SPL_TEXT_BASE=0x00908000
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_RSA=y
+CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_SHA256_SUPPORT=y
-CONFIG_SPL_CRYPTO_SUPPORT=y
-CONFIG_SPL_HASH_SUPPORT=y
+CONFIG_SPL_SHA256=y
+CONFIG_SPL_CRYPTO=y
+CONFIG_SPL_HASH=y
 CONFIG_SPL_OPTEE=y
+CONFIG_SPL_OPTEE_IMAGE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_SERIAL=y
+CONFIG_SPL_GPIO=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x5000
-CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_LOGLEVEL=2
@@ -27,16 +29,17 @@ CONFIG_WATCHDOG=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_HW_WATCHDOG=y
+CONFIG_SHA256=y
 # CONFIG_SPL_BLK is not set
-# CONFIG_SPL_CRC32_SUPPORT is not set
+# CONFIG_SPL_CRC32 is not set
 # 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_SPI_SUPPORT is not set
-# CONFIG_SPL_MMC_SUPPORT is not set
+# CONFIG_SPL_SPI is not set
+# CONFIG_SPL_MMC is not set
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 # CONFIG_SPL_MXC_OCOTP is not set
 # CONFIG_SPL_SIMPLE_BUS is not set
@@ -49,7 +52,7 @@ CONFIG_OPTEE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
 CONFIG_OPTEE_TZDRAM_BASE=0x9E000000
-CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_SIGNATURE_STRICT=y
@@ -64,10 +67,12 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+# CONFIG_SPL_DM_USB is not set
+CONFIG_DM_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_USB_GADGET_VENDOR_NUM=0x1fc9
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0152
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x80800000
@@ -79,10 +84,17 @@ CONFIG_BOOTDELAY=-2
 CONFIG_USE_BOOTCOMMAND=y
 CONFIG_BOOTCOMMAND="reset"
 CONFIG_DEFAULT_FDT_FILE="imx6ul-14x14-evk"
+CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk"
 CONFIG_MXC_USB_OTG_HACTIVE=y
 CONFIG_CI_UDC=y
 CONFIG_SDP_LOADADDR=0x80800000
 CONFIG_ENV_IS_NOWHERE=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80800000
+CONFIG_RSA=y
+CONFIG_RSA_VERIFY=y
+CONFIG_CMD_HASH=y
+# CONFIG_FSL_CAAM is not set
+CONFIG_MISC=y
 # CONFIG_ENV_IS_IN_MMC is not set
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 # CONFIG_NET is not set
@@ -114,4 +126,6 @@ CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
-# CONFIG_SHA1 is not set
+# CONFIG_SPL_SHA1 is not set
+# CONFIG_SPL_CRC16 is not set
+# CONFIG_SHA_HW_ACCEL is not set

meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/imx6ullevk/lmp.cfg

@@ -1,4 +1,5 @@
 CONFIG_SPL=y
+CONFIG_SPL_DM=y
 # MAX SIZE = D000(SPL+dtb) + 2060(csf) - 400(fit signing data)
 CONFIG_SPL_SIZE_LIMIT=0xEC60
 CONFIG_SPL_SEPARATE_BSS=y
@@ -10,16 +11,17 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_RSA=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_SHA256_SUPPORT=y
-CONFIG_SPL_CRYPTO_SUPPORT=y
-CONFIG_SPL_HASH_SUPPORT=y
+CONFIG_SPL_SHA256=y
+CONFIG_SPL_CRYPTO=y
+CONFIG_SPL_HASH=y
 CONFIG_SPL_OPTEE=y
+CONFIG_SPL_OPTEE_IMAGE=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_SERIAL=y
+CONFIG_SPL_GPIO=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_SYS_MALLOC_F_LEN=0x5000
-CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_LOGLEVEL=2
@@ -29,16 +31,17 @@ CONFIG_WATCHDOG=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_PSCI=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
+CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_HW_WATCHDOG=y
+CONFIG_SHA256=y
 # CONFIG_SPL_BLK is not set
-# CONFIG_SPL_CRC32_SUPPORT is not set
+# CONFIG_SPL_CRC32 is not set
 # 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_SPI_SUPPORT is not set
-# CONFIG_SPL_MMC_SUPPORT is not set
+# CONFIG_SPL_SPI is not set
+# CONFIG_SPL_MMC is not set
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 # CONFIG_SPL_MXC_OCOTP is not set
 # CONFIG_SPL_SIMPLE_BUS is not set
@@ -51,7 +54,7 @@ CONFIG_OPTEE=y
 CONFIG_OF_LIBFDT_OVERLAY=y
 CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
 CONFIG_OPTEE_TZDRAM_BASE=0x9E000000
-CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y
+CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_SIGNATURE_STRICT=y
@@ -66,10 +69,12 @@ CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+# CONFIG_SPL_DM_USB is not set
+CONFIG_DM_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_USB_GADGET_VENDOR_NUM=0x1fc9
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0152
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x80800000
@@ -85,6 +90,11 @@ CONFIG_MXC_USB_OTG_HACTIVE=y
 CONFIG_CI_UDC=y
 CONFIG_SDP_LOADADDR=0x80800000
 CONFIG_ENV_IS_NOWHERE=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80800000
+CONFIG_SPL_RSA=y
+CONFIG_SPL_RSA_VERIFY=y
+CONFIG_RSA=y
+CONFIG_RSA_VERIFY=y
 # CONFIG_ENV_IS_IN_MMC is not set
 # CONFIG_ANDROID_BOOT_IMAGE is not set
 # CONFIG_NET is not set
@@ -117,3 +127,4 @@ CONFIG_ENV_IS_NOWHERE=y
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_SHA1 is not set
+# CONFIG_SPL_SHA1 is not set

meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/imx6ulevk/lmp-base.cfg

@@ -0,0 +1,76 @@
+CONFIG_SPL=y
+CONFIG_SPL_DM=y
+# MAX SIZE = 0xF000(0x918000-0x909000, IMX6ULRM 8.4.1 Internal ROM/RAM memory map) - 0x400(FIT signing data)
+CONFIG_SPL_SIZE_LIMIT=0xEC00
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SPL_LDSCRIPT="arch/arm/mach-omap2/u-boot-spl.lds"
+CONFIG_SPL_TEXT_BASE=0x00909000
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SPL_SHA256=y
+CONFIG_SPL_CRYPTO=y
+CONFIG_SPL_HASH=y
+CONFIG_SPL_OPTEE=y
+CONFIG_SPL_OPTEE_IMAGE=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_MMC=y
+CONFIG_SPL_MMC_TINY=y
+# CONFIG_SPL_DM_MMC is not set
+CONFIG_SPL_SERIAL=y
+CONFIG_SPL_GPIO=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_LOGLEVEL=2
+# CONFIG_SPL_BLK is not set
+# CONFIG_SPL_CRC32 is not set
+# CONFIG_SPL_WDT is not set
+CONFIG_FSL_USDHC=y
+CONFIG_WDT=y
+CONFIG_WATCHDOG=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_DM_RESET=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_PSCI=y
+CONFIG_SPL_WATCHDOG=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_USB_HOST is not set
+# CONFIG_SPL_USB_GADGET is not set
+# CONFIG_SPL_SPI is not set
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_MXC_OCOTP is not set
+CONFIG_IMX_HAB=y
+# CONFIG_SPL_IMX_HAB is not set
+# CONFIG_CMD_DEKBLOB is not set
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
+CONFIG_OPTEE_TZDRAM_BASE=0x9E000000
+CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_FIT=y
+CONFIG_SPL_FIT_SIGNATURE_STRICT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
+CONFIG_PARTITION_UUIDS=y
+CONFIG_CMD_XIMG=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_CMD_SECONDARY_BOOT=y
+CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
+CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x1000
+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=5
+CONFIG_DEFAULT_FDT_FILE="imx6ul-14x14-evk"
+CONFIG_CMD_BOOTZ=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80800000
+# CONFIG_SPL_SHA1 is not set
+CONFIG_CMD_HASH=y
+# CONFIG_FSL_CAAM is not set
+CONFIG_MISC=y
+# CONFIG_SHA_HW_ACCEL is not set