Lmp.cfg common (lmp/lmp-mfgtool)

meta-lmp-base/recipes-bsp/u-boot/u-boot-fio-common.inc

@@ -12,11 +12,15 @@ UBOOT_REPO ??= "git://github.com/foundriesio/u-boot.git"
 
 SRC_URI = "${UBOOT_REPO};protocol=https;branch=${SRCBRANCH} \
     file://fw_env.config \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'ebbr', 'file://lmp-ebbr.cfg', 'file://lmp.cfg', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'ebbr', 'file://lmp-ebbr.cfg', 'file://lmp-common.cfg', d)} \
+    ${@bb.utils.contains('UBOOT_SIGN_ENABLE', '1', '', 'file://lmp-common-nosec.cfg', d)} \
+    ${@bb.utils.contains('MACHINE_FEATURES', 'ebbr', '', 'file://lmp.cfg', d)} \
 "
 # LMP base requires a different u-boot configuration fragment
 SRC_URI:append:lmp-base = " file://lmp-base.cfg "
 SRC_URI:remove:lmp-base = "file://lmp.cfg"
+SRC_URI:remove:lmp-base = "file://lmp-common.cfg"
+SRC_URI:remove:lmp-base = "file://lmp-common-nosec.cfg"
 
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

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

@@ -0,0 +1,103 @@
+CONFIG_SPL_FIT=y
+CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_SPL_FIT_SIGNATURE_STRICT=y
+CONFIG_SPL_LOAD_FIT=y
+# CONFIG_SPL_FIT_IMAGE_TINY is not set
+CONFIG_SPL_HASH=y
+CONFIG_SPL_CRYPTO=y
+# CONFIG_SPL_IMX_HAB is not set
+CONFIG_SPL_SHA256=y
+# CONFIG_SPL_PARTITION_UUIDS is not set
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+CONFIG_SPL_DM=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+# CONFIG_SPL_MMC is not set
+# CONFIG_SPL_DM_USB is not set
+# CONFIG_SPL_BLK is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_SPL_HW_WATCHDOG=y
+CONFIG_BOOTDELAY=-2
+# CONFIG_CMD_BOOTZ is not set
+CONFIG_FIT_SIGNATURE_STRICT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_FIT=y
+# CONFIG_LEGACY_IMAGE_FORMAT is not set
+# CONFIG_NET is not set
+CONFIG_RSA=y
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="reset"
+# 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_CMD_BDI is not set
+# CONFIG_CMD_BMODE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_DEKBLOB is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_EXPORTENV is not set
+CONFIG_CMD_FIOVB=y
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_SATA is not set
+# CONFIG_CMD_SYSBOOT is not set
+# CONFIG_CMD_USB_MASS_STORAGE is not set
+CONFIG_CMD_XIMG=y
+# CONFIG_DISTRO_DEFAULTS is not set
+# CONFIG_DM_SCSI is not set
+# CONFIG_DWC_AHSATA is not set
+# CONFIG_EFI_LOADER is not set
+CONFIG_ENV_IS_NOWHERE=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FIOVB=y
+CONFIG_FSL_FASTBOOT_BOOTLOADER_SECONDARY=y
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_OPTEE_LIB=y
+CONFIG_OPTEE=y
+CONFIG_PARTITION_UUIDS=y
+# CONFIG_SATA is not set
+CONFIG_TEE=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+# CONFIG_USB_HOST_ETHER is not set
+# CONFIG_USB_KEYBOARD is not set
+# CONFIG_USB_STORAGE is not set
+CONFIG_DM_USB=y
+# CONFIG_ENV_IS_IN_MMC is not set
+CONFIG_FASTBOOT_UUU_SUPPORT=y
+CONFIG_FSL_FASTBOOT_BOOTLOADER2=y
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0152
+CONFIG_USB_GADGET_VENDOR_NUM=0x1fc9
+CONFIG_USB=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
+# CONFIG_CMD_BOOTP is not set
+# CONFIG_CMD_DHCP is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_PXE is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_TFTPBOOT is not set
+# CONFIG_DM_VIDEO is not set
+# CONFIG_SHA_HW_ACCEL is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_GETTIME is not set
+# CONFIG_CMD_POWEROFF is not set
+# CONFIG_CMD_RTC is not set
+# CONFIG_CMD_SNTP is not set
+# CONFIG_CMD_TIME is not set
+# CONFIG_CMD_TIMER is not set
+# CONFIG_DFU is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
+CONFIG_SUPPORT_EMMC_RPMB=y
+# CONFIG_CMD_DFU is not set
+CONFIG_HASH=y
+CONFIG_IMX_WATCHDOG=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_USB_GADGET_MASS_STORAGE=y

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

@@ -0,0 +1,3 @@
+# CONFIG_FIT_SIGNATURE_STRICT is not set
+CONFIG_BOOTDELAY=2
+CONFIG_DISTRO_DEFAULTS=y

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

@@ -0,0 +1,8 @@
+CONFIG_FIT=y
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTDELAY=-2
+CONFIG_FIT_VERBOSE=y
+# CONFIG_DISTRO_DEFAULTS is not set
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_SIGNATURE_STRICT=y
+CONFIG_RSA=y

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

@@ -1,116 +1,42 @@
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_MX6_OCRAM_256KB=y
 CONFIG_SPL_SIZE_LIMIT=200704
-CONFIG_SPL_DM=y
 CONFIG_SPL_DM_GPIO=y
-CONFIG_SPL_FIT_SIGNATURE=y
-CONFIG_SPL_FIT_SIGNATURE_STRICT=y
 CONFIG_SPL_FIT_PRINT=y
-CONFIG_SPL_LOAD_FIT=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_DM_SERIAL is not set
 # CONFIG_SPL_FIOVB is not set
 CONFIG_FSL_FASTBOOT_BOOTLOADER2_OFFSET=0x100
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
 CONFIG_SYS_MMC_ENV_DEV=2
 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_SKIP_LOWLEVEL_INIT=y
 CONFIG_SYS_L2CACHE_OFF=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_FSL_FASTBOOT_BOOTLOADER_SECONDARY=y
 CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x800
 CONFIG_CMD_SECONDARY_BOOT=y
-# CONFIG_LEGACY_IMAGE_FORMAT is not set
-CONFIG_PARTITION_UUIDS=y
 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=0x1fc9
-CONFIG_USB_GADGET_PRODUCT_NUM=0x0152
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_UUU_SUPPORT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x12000000
-CONFIG_FSL_FASTBOOT_BOOTLOADER2=y
-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
-# 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_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_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

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

@@ -1,107 +1,21 @@
-CONFIG_SPL_DM=y
-CONFIG_SPL_FIT=y
-CONFIG_SPL_LOAD_FIT=y
 CONFIG_PSCI_BOARD_REBOOT=y
-# CONFIG_SPL_FIT_IMAGE_TINY is not set
-CONFIG_SPL_CRYPTO=y
-CONFIG_SPL_HASH=y
-CONFIG_SPL_SHA256=y
-CONFIG_SPL_OF_CONTROL=y
-CONFIG_SPL_USB_GADGET=y
-CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SPL_MISC=y
 CONFIG_SPL_DRIVERS_MISC=y
 CONFIG_SPL_SERIAL=y
-CONFIG_RSA=y
-CONFIG_HASH=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_SHA_HW_ACCEL is not set
-# CONFIG_CMD_DEKBLOB is not set
-CONFIG_OF_LIBFDT_OVERLAY=y
-CONFIG_FIT=y
-CONFIG_FIT_SIGNATURE=y
-CONFIG_FIT_SIGNATURE_STRICT=y
-CONFIG_SPL_FIT_SIGNATURE=y
-CONFIG_SPL_FIT_SIGNATURE_STRICT=y
-CONFIG_FIT_VERBOSE=y
-# CONFIG_LEGACY_IMAGE_FORMAT is not set
 # CONFIG_SPL_LOAD_IMX_CONTAINER is not set
-CONFIG_PARTITION_UUIDS=y
-CONFIG_FIOVB=y
-CONFIG_TEE=y
-CONFIG_OPTEE=y
-CONFIG_OPTEE_LIB=y
-CONFIG_CMD_FIOVB=y
 CONFIG_AHAB_BOOT=y
-CONFIG_CMD_XIMG=y
-CONFIG_SUPPORT_EMMC_RPMB=y
-CONFIG_SUPPORT_EMMC_BOOT=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_USB_GADGET_MASS_STORAGE=y
-CONFIG_USB_GADGET_MANUFACTURER="FSL"
-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=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x08000000
-CONFIG_ENV_IS_NOWHERE=y
-# CONFIG_ENV_IS_IN_MMC is not set
-# CONFIG_ENV_IS_IN_SPI_FLASH is not set
-CONFIG_FSL_FASTBOOT_BOOTLOADER2=y
 CONFIG_FSL_FASTBOOT_BOOTLOADER2_OFFSET=0x400
-CONFIG_FSL_FASTBOOT_BOOTLOADER_SECONDARY=y
 CONFIG_CMD_SECONDARY_BOOT=y
 CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x0
-CONFIG_BOOTDELAY=-2
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="reset"
 CONFIG_SYS_LOAD_ADDR=0x87000000
-# 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_SCSI 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_SPL_SATA is not set
 # CONFIG_SCSI_AHCI is not set
 # CONFIG_CMD_SCSI is not set
-# CONFIG_SHA_HW_ACCEL is not set
-# CONFIG_DFU is not set
-# CONFIG_CMD_DFU is not set
-# CONFIG_CMD_SNTP is not set
-# CONFIG_CMD_RTC is not set
-# CONFIG_CMD_TIME is not set
-# CONFIG_CMD_GETTIME is not set
-# CONFIG_CMD_TIMER is not set
-# CONFIG_CMD_POWEROFF is not set
+# CONFIG_IMX_WATCHDOG is not set
+CONFIG_SPL_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y