Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate apalis-imx6 to the latest NXP BSP #945

Merged
merged 4 commits into from
Nov 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require u-boot-fio-common.inc

SRCREV = "8dbcdd99bb921b641bbd0d6123565811fcb9caf9"
SRCREV = "9d8a0ac2e51ab8b3250e1443a2fd7a872561ebe3"
SRCBRANCH = "2022.04+lf-5.15.52-2.1.0-fio"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"

Expand Down
2 changes: 2 additions & 0 deletions meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ UBOOT_MACHINE:apalis-imx6 = "apalis_imx6_defconfig"
UBOOT_CLASSES:apalis-imx6 = "uboot-fitimage"
UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x15800000"
UBOOT_RD_LOADADDRESS:apalis-imx6 = "0x14000000"
PREFERRED_VERSION_u-boot-fio:apalis-imx6 ?= "imx-2022.04"
PREFERRED_VERSION_u-boot-fio-mfgtool:apalis-imx6 ?= "imx-2022.04"
WKS_FILE:apalis-imx6 = "sdimage-imx6dq-spl-fit.wks"
WKS_FILES:sota:apalis-imx6 = "sdimage-imx6dq-spl-fit-sota.wks"
MACHINE_FEATURES:append:apalis-imx6 = " optee"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ KERNEL_CLASSES:mx8mn-generic-bsp = " kernel-lmp-fitimage "
# Apalis-iMX6
UBOOT_SIGN_ENABLE:apalis-imx6 = "1"
PREFERRED_PROVIDER_virtual/kernel:apalis-imx6 = "linux-lmp-dev-mfgtool"
PREFERRED_VERSION_linux-lmp-dev-mfgtool:apalis-imx6 = "5.15%"
IMX_DEFAULT_BOOTLOADER:apalis-imx6 ?= "u-boot-fio-mfgtool"
PREFERRED_PROVIDER_u-boot-default-script:apalis-imx6 = "u-boot-ostree-scr-fit"
UBOOT_CLASSES:apalis-imx6 = "uboot-fitimage"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,34 @@ CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_FIT_SIGNATURE_STRICT=y
CONFIG_SPL_FIT_PRINT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_SHA256_SUPPORT=y
CONFIG_SPL_CRYPTO_SUPPORT=y
CONFIG_SPL_HASH_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_OPTEE=y
CONFIG_SPL_SHA256=y
CONFIG_SPL_CRYPTO=y
CONFIG_SPL_HASH=y
CONFIG_SPL_WATCHDOG=y
CONFIG_SPL_HW_WATCHDOG=y
CONFIG_SPL_OPTEE_IMAGE=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SHA256=y
# CONFIG_SPL_DM_USB is not set
# CONFIG_SPL_SPI is not set
# CONFIG_SPL_MMC is not set
# CONFIG_SPL_ENV_SUPPORT 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_BLK is not set
# CONFIG_SPL_DM_SERIAL is not set
# CONFIG_SPL_DM_USB is not set
# CONFIG_SPL_FIOVB is not set
# CONFIG_SPL_BLK is not set
CONFIG_FSL_FASTBOOT_BOOTLOADER2_OFFSET=0x100
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
CONFIG_IMX_HAB=y
# CONFIG_CMD_DEKBLOB is not set
CONFIG_TEE=y
CONFIG_OPTEE=y
CONFIG_OPTEE_LIB=y
# CONFIG_IMX_OPTEE is not set
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
CONFIG_OPTEE_TZDRAM_BASE=0x4E000000
CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_SYS_L2CACHE_OFF=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
Expand All @@ -46,13 +49,21 @@ CONFIG_MISC=y
CONFIG_FIOVB=y
CONFIG_CMD_FIOVB=y
CONFIG_CMD_XIMG=y
CONFIG_WDT=y
CONFIG_WATCHDOG=y
CONFIG_IMX_WATCHDOG=y
CONFIG_SUPPORT_EMMC_RPMB=y
CONFIG_DM_I2C_GPIO=y
# CONFIG_ENV_IS_IN_FAT is not set
CONFIG_ENV_IS_NOWHERE=y
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_SUPPORT_PASSING_ATAGS=y
CONFIG_SERIAL_TAG=y
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=0x12000000
Expand All @@ -61,6 +72,12 @@ CONFIG_BOOTDELAY=-2
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="reset"
CONFIG_SDP_LOADADDR=0x12000000
CONFIG_RSA=y
CONFIG_RSA_VERIFY=y
CONFIG_DM_RESET=y
CONFIG_SYSRESET=y
CONFIG_SYSRESET_PSCI=y
CONFIG_CMD_HASH=y
# CONFIG_NET is not set
# CONFIG_CMD_NET is not set
# CONFIG_CMD_DHCP is not set
Expand All @@ -75,7 +92,6 @@ CONFIG_SDP_LOADADDR=0x12000000
# 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
Expand All @@ -91,3 +107,9 @@ CONFIG_SDP_LOADADDR=0x12000000
# CONFIG_BOOTM_RTEMS is not set
# CONFIG_BOOTM_VXWORKS is not set
# CONFIG_DISTRO_DEFAULTS is not set
# CONFIG_DM_VIDEO is not set
# CONFIG_OPTEE_TA_AVB is not set
# CONFIG_CHIMP_OPTEE is not set
# CONFIG_SPL_SHA1 is not set
# CONFIG_SPL_CRC16 is not set
# CONFIG_SHA_HW_ACCEL is not set
26 changes: 16 additions & 10 deletions meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@ CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_FIT_SIGNATURE_STRICT=y
CONFIG_SPL_FIT_PRINT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_SHA256_SUPPORT=y
CONFIG_SPL_CRYPTO_SUPPORT=y
CONFIG_SPL_HASH_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_SHA256=y
CONFIG_SPL_CRYPTO=y
CONFIG_SPL_HASH=y
CONFIG_SPL_WATCHDOG=y
# CONFIG_SPL_WDT is not set
CONFIG_SPL_HW_WATCHDOG=y
CONFIG_SPL_OPTEE=y
CONFIG_SPL_OPTEE_IMAGE=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPL_MMC=y
CONFIG_CMD_SECONDARY_BOOT=y
CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x800
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
CONFIG_FSL_USDHC=y
CONFIG_WDT=y
CONFIG_WATCHDOG=y
CONFIG_IMX_WATCHDOG=y
CONFIG_RSA=y
CONFIG_DM_RESET=y
CONFIG_SYSRESET=y
CONFIG_SYSRESET_PSCI=y
Expand All @@ -32,20 +35,20 @@ CONFIG_SYSRESET_PSCI=y
# CONFIG_SPL_PARTITION_UUIDS is not set
# CONFIG_SPL_BLK is not set
# CONFIG_SPL_DM_SERIAL is not set
# CONFIG_SPL_DM_USB is not set
# CONFIG_SPL_FIOVB is not set
# CONFIG_SPL_I2C_SUPPORT is not set
# CONFIG_SPL_USB_HOST_SUPPORT is not set
# CONFIG_SPL_I2C is not set
# CONFIG_SPL_USB_HOST is not set
# CONFIG_SPL_USB_GADGET is not set
# CONFIG_SPL_DM_MMC is not set
CONFIG_IMX_HAB=y
# CONFIG_CMD_DEKBLOB is not set
CONFIG_TEE=y
CONFIG_OPTEE=y
CONFIG_OPTEE_LIB=y
# CONFIG_IMX_OPTEE is not set
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
CONFIG_OPTEE_TZDRAM_BASE=0x4E000000
CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_SYS_L2CACHE_OFF=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
Expand Down Expand Up @@ -98,3 +101,6 @@ CONFIG_BOOTCOMMAND="setenv script_addr 0x15000000; setenv verify 1; source ${scr
# CONFIG_BOOTM_RTEMS is not set
# CONFIG_BOOTM_VXWORKS is not set
# CONFIG_DISTRO_DEFAULTS is not set
# CONFIG_DM_VIDEO is not set
# CONFIG_OPTEE_TA_AVB is not set
# CONFIG_CHIMP_OPTEE is not set
25 changes: 15 additions & 10 deletions meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp-base.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@ CONFIG_SPL_DM_GPIO=y
CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_FIT_PRINT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_SHA256_SUPPORT=y
CONFIG_SPL_CRYPTO_SUPPORT=y
CONFIG_SPL_HASH_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_SHA256=y
CONFIG_SPL_CRYPTO=y
CONFIG_SPL_HASH=y
CONFIG_SPL_WATCHDOG=y
# CONFIG_SPL_WDT is not set
CONFIG_SPL_HW_WATCHDOG=y
CONFIG_SPL_OPTEE=y
CONFIG_SPL_OPTEE_IMAGE=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPL_MMC=y
CONFIG_CMD_SECONDARY_BOOT=y
CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x800
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
CONFIG_FSL_USDHC=y
CONFIG_WDT=y
CONFIG_WATCHDOG=y
CONFIG_IMX_WATCHDOG=y
Expand All @@ -30,20 +32,20 @@ CONFIG_SYSRESET_PSCI=y
# CONFIG_SPL_PARTITION_UUIDS is not set
# CONFIG_SPL_BLK is not set
# CONFIG_SPL_DM_SERIAL is not set
# CONFIG_SPL_DM_USB is not set
# CONFIG_SPL_FIOVB is not set
# CONFIG_SPL_I2C_SUPPORT is not set
# CONFIG_SPL_USB_HOST_SUPPORT is not set
# CONFIG_SPL_I2C is not set
# CONFIG_SPL_USB_HOST is not set
# CONFIG_SPL_USB_GADGET is not set
# CONFIG_SPL_DM_MMC is not set
# CONFIG_IMX_HAB is not set
# CONFIG_CMD_DEKBLOB is not set
CONFIG_TEE=y
CONFIG_OPTEE=y
CONFIG_OPTEE_LIB=y
# CONFIG_IMX_OPTEE is not set
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
CONFIG_OPTEE_TZDRAM_BASE=0x4E000000
CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_SYS_L2CACHE_OFF=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
Expand Down Expand Up @@ -79,3 +81,6 @@ CONFIG_CMD_BOOTZ=y
# CONFIG_BOOTM_RTEMS is not set
# CONFIG_BOOTM_VXWORKS is not set
# CONFIG_DISTRO_DEFAULTS is not set
# CONFIG_DM_VIDEO is not set
# CONFIG_OPTEE_TA_AVB is not set
# CONFIG_CHIMP_OPTEE is not set
26 changes: 16 additions & 10 deletions meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@ CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_FIT_SIGNATURE_STRICT=y
CONFIG_SPL_FIT_PRINT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_SHA256_SUPPORT=y
CONFIG_SPL_CRYPTO_SUPPORT=y
CONFIG_SPL_HASH_SUPPORT=y
CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_SPL_SHA256=y
CONFIG_SPL_CRYPTO=y
CONFIG_SPL_HASH=y
CONFIG_SPL_WATCHDOG=y
# CONFIG_SPL_WDT is not set
CONFIG_SPL_HW_WATCHDOG=y
CONFIG_SPL_OPTEE=y
CONFIG_SPL_OPTEE_IMAGE=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPL_MMC=y
CONFIG_CMD_SECONDARY_BOOT=y
CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x800
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
CONFIG_FSL_USDHC=y
CONFIG_WDT=y
CONFIG_WATCHDOG=y
CONFIG_IMX_WATCHDOG=y
CONFIG_RSA=y
CONFIG_DM_RESET=y
CONFIG_SYSRESET=y
CONFIG_SYSRESET_PSCI=y
Expand All @@ -32,20 +35,20 @@ CONFIG_SYSRESET_PSCI=y
# CONFIG_SPL_PARTITION_UUIDS is not set
# CONFIG_SPL_BLK is not set
# CONFIG_SPL_DM_SERIAL is not set
# CONFIG_SPL_DM_USB is not set
# CONFIG_SPL_FIOVB is not set
# CONFIG_SPL_I2C_SUPPORT is not set
# CONFIG_SPL_USB_HOST_SUPPORT is not set
# CONFIG_SPL_I2C is not set
# CONFIG_SPL_USB_HOST is not set
# CONFIG_SPL_USB_GADGET is not set
# CONFIG_SPL_DM_MMC is not set
CONFIG_IMX_HAB=y
# CONFIG_CMD_DEKBLOB is not set
CONFIG_TEE=y
CONFIG_OPTEE=y
CONFIG_OPTEE_LIB=y
# CONFIG_IMX_OPTEE is not set
CONFIG_OF_LIBFDT_OVERLAY=y
CONFIG_OPTEE_TZDRAM_SIZE=0x02000000
CONFIG_OPTEE_TZDRAM_BASE=0x4E000000
CONFIG_OPTEE_SKIP_LOWLEVEL_INIT=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_SYS_L2CACHE_OFF=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
Expand Down Expand Up @@ -98,3 +101,6 @@ CONFIG_BOOTCOMMAND="setenv script_addr 0x15000000; setenv verify 1; source ${scr
# CONFIG_BOOTM_RTEMS is not set
# CONFIG_BOOTM_VXWORKS is not set
# CONFIG_DISTRO_DEFAULTS is not set
# CONFIG_DM_VIDEO is not set
# CONFIG_OPTEE_TA_AVB is not set
# CONFIG_CHIMP_OPTEE is not set
Original file line number Diff line number Diff line change
Expand Up @@ -467,3 +467,4 @@ CONFIG_DEBUG_FS=y
CONFIG_PROVE_LOCKING=y
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_FTRACE is not set
CONFIG_MAILBOX=y
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ uuu_version 1.2.39
SDP: boot -f SPL-mfgtool.signed

# Add Toradex PID for Fastboot in u-boot
CFG: FB: -vid 0x0525 -pid 0x4000
CFG: FB: -vid 0x0525 -pid 0x401b
CFG: FB: -vid 0x0525 -pid 0x401c
CFG: FB: -vid 0x0525 -pid 0x401d
CFG: FB: -vid 0x0525 -pid 0x4023
CFG: FB: -vid 0x0525 -pid 0x4025
CFG: FB: -vid 0x0525 -pid 0x402F
CFG: FB: -vid 0x0525 -pid 0x4030
CFG: FB: -vid 0x0525 -pid 0x4031
CFG: FB: -vid 0x1fc9 -pid 0x4000
CFG: FB: -vid 0x1fc9 -pid 0x401b
CFG: FB: -vid 0x1fc9 -pid 0x401c
CFG: FB: -vid 0x1fc9 -pid 0x401d
CFG: FB: -vid 0x1fc9 -pid 0x4023
CFG: FB: -vid 0x1fc9 -pid 0x4025
CFG: FB: -vid 0x1fc9 -pid 0x402F
CFG: FB: -vid 0x1fc9 -pid 0x4030
CFG: FB: -vid 0x1fc9 -pid 0x4031

SDPV: delay 1000
SDPV: write -f u-boot-mfgtool.itb
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
uuu_version 1.2.39

# Add Toradex PID for Fastboot in u-boot
CFG: FB: -vid 0x0525 -pid 0x4000
CFG: FB: -vid 0x0525 -pid 0x401b
CFG: FB: -vid 0x0525 -pid 0x401c
CFG: FB: -vid 0x0525 -pid 0x401d
CFG: FB: -vid 0x0525 -pid 0x4023
CFG: FB: -vid 0x1fc9 -pid 0x4000
CFG: FB: -vid 0x1fc9 -pid 0x401b
CFG: FB: -vid 0x1fc9 -pid 0x401c
CFG: FB: -vid 0x1fc9 -pid 0x401d
CFG: FB: -vid 0x1fc9 -pid 0x4023

SDP: boot -f SPL-mfgtool.signed

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
uuu_version 1.2.39

# Add Toradex PID for Fastboot in u-boot
CFG: FB: -vid 0x0525 -pid 0x4000
CFG: FB: -vid 0x0525 -pid 0x401b
CFG: FB: -vid 0x0525 -pid 0x401c
CFG: FB: -vid 0x0525 -pid 0x401d
CFG: FB: -vid 0x0525 -pid 0x4023
CFG: FB: -vid 0x0525 -pid 0x4025
CFG: FB: -vid 0x0525 -pid 0x402F
CFG: FB: -vid 0x0525 -pid 0x4030
CFG: FB: -vid 0x0525 -pid 0x4031
CFG: FB: -vid 0x1fc9 -pid 0x4000
CFG: FB: -vid 0x1fc9 -pid 0x401b
CFG: FB: -vid 0x1fc9 -pid 0x401c
CFG: FB: -vid 0x1fc9 -pid 0x401d
CFG: FB: -vid 0x1fc9 -pid 0x4023
CFG: FB: -vid 0x1fc9 -pid 0x4025
CFG: FB: -vid 0x1fc9 -pid 0x402F
CFG: FB: -vid 0x1fc9 -pid 0x4030
CFG: FB: -vid 0x1fc9 -pid 0x4031

SDP: boot -f SPL-mfgtool.signed

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
uuu_version 1.2.39

# Add Toradex PID for Fastboot in u-boot
CFG: FB: -vid 0x0525 -pid 0x4000
CFG: FB: -vid 0x0525 -pid 0x401b
CFG: FB: -vid 0x0525 -pid 0x401c
CFG: FB: -vid 0x0525 -pid 0x401d
CFG: FB: -vid 0x0525 -pid 0x4023
CFG: FB: -vid 0x1fc9 -pid 0x4000
CFG: FB: -vid 0x1fc9 -pid 0x401b
CFG: FB: -vid 0x1fc9 -pid 0x401c
CFG: FB: -vid 0x1fc9 -pid 0x401d
CFG: FB: -vid 0x1fc9 -pid 0x4023

SDP: boot -f SPL-mfgtool

Expand Down
Loading