diff --git a/recipes-bsp/u-boot/files2/defconfig/pengwyn_dmverity_defconfig b/recipes-bsp/u-boot/files2/defconfig/pengwyn_dmverity_defconfig
new file mode 100644
index 0000000..4c1d57e
--- /dev/null
+++ b/recipes-bsp/u-boot/files2/defconfig/pengwyn_dmverity_defconfig
@@ -0,0 +1,142 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_TI_COMMON_CMD_OPTIONS=y
+CONFIG_DEFAULT_DEVICE_TREE="am335x-pengwyn"
+CONFIG_AM33XX=y
+CONFIG_TARGET_PENGWYN=y
+CONFIG_TEXT_BASE=0x81300000
+CONFIG_CLOCK_SYNTHESIZER=y
+CONFIG_AM335X_USB0=y
+CONFIG_AM335X_USB0_PERIPHERAL=y
+CONFIG_AM335X_USB1=y
+CONFIG_SPL=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4030ff00
+CONFIG_TIMESTAMP=y
+#CONFIG_SPL_LOAD_FIT=y
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_BOOTCOMMAND="run mmcboot;"
+CONFIG_LOGLEVEL=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_ARCH_MISC_INIT=y
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_ETH=y
+# CONFIG_SPL_FS_EXT4 is not set
+CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
+# CONFIG_SPL_MTD_SUPPORT is not set
+CONFIG_SPL_MUSB_NEW=n
+# CONFIG_SPL_NAND_SUPPORT is not set
+# CONFIG_SPL_NAND_DRIVERS is not set
+# CONFIG_SPL_NAND_ECC is not set
+# CONFIG_SPL_NAND_BASE is not set
+# CONFIG_SPL_NET is not set
+CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
+# CONFIG_SPL_OS_BOOT is not set
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
+CONFIG_SPL_FALCON_BOOT_MMCSD=n
+CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
+CONFIG_SPL_USB_GADGET=n
+CONFIG_SPL_USB_ETHER=n
+CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
+CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00080000
+CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_OF_CONTROL=y
+CONFIG_OF_LIST="am335x-pengwyn am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
+CONFIG_ENV_OVERWRITE=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+# CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_VERSION_VARIABLE=y
+CONFIG_NET_RETRY_COUNT=10
+CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
+CONFIG_CLK=y
+CONFIG_CLK_CDCE9XX=y
+CONFIG_CLK_TI_CTRL=y
+CONFIG_DFU_TFTP=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_NAND=y
+CONFIG_NAND_OMAP_ECCSCHEME_BCH16_CODE_HW=y
+CONFIG_DFU_RAM=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_I2C=y
+CONFIG_MISC=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x50
+# CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_SYS_NAND_BLOCK_SIZE=0x80000
+CONFIG_SYS_NAND_ONFI_DETECTION=y
+CONFIG_SYS_NAND_PAGE_COUNT=0x40
+CONFIG_SYS_NAND_PAGE_SIZE=0x1000
+CONFIG_SYS_NAND_OOBSIZE=0xe0
+CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
+CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_PHY_SMSC=y
+CONFIG_PHY_GIGE=y
+CONFIG_MII=y
+CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_OMAP3_SPI=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB_ETHER=y
+CONFIG_WDT=y
+# CONFIG_SPL_WDT is not set
+CONFIG_DYNAMIC_CRC_TABLE=y
+CONFIG_RSA=y
+CONFIG_LZO=y
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+# CONFIG_BLK is not set
+#CONFIG_SPL_OF_CONTROL=y
+#CONFIG_OF_SPL_REMOVE_PROPS=""
+#CONFIG_SPL_OF_TRANSLATE=y
+### for verified boot ###
+#CONFIG_SPL_CRYPTO=y
+#CONFIG_RSA=y
+#CONFIG_SPL_RSA=y
+#CONFIG_SHA1=y
+#CONFIG_SHA256=y
+#CONFIG_SHA512=y
+#CONFIG_SPL_SHA1=y
+#CONFIG_SPL_SHA256=y
+#CONFIG_SPL_SHA512=y
+#CONFIG_FIT_SIGNATURE=y
+#CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
+#CONFIG_SPL_FIT_FULL_CHECK=y
+#CONFIG_SPL_FIT_SIGNATURE=y
+#CONFIG_SPL_FIT_SIGNATURE_MAX_SIZE=0x10000000
+#CONFIG_SPL_LOAD_FIT_FULL=y
diff --git a/recipes-bsp/u-boot/files2/defconfig/pengwyn_fit_kern_defconfig b/recipes-bsp/u-boot/files2/defconfig/pengwyn_fit_kern_defconfig
new file mode 100644
index 0000000..71d93da
--- /dev/null
+++ b/recipes-bsp/u-boot/files2/defconfig/pengwyn_fit_kern_defconfig
@@ -0,0 +1,127 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_TI_COMMON_CMD_OPTIONS=y
+CONFIG_DEFAULT_DEVICE_TREE="am335x-pengwyn"
+CONFIG_AM33XX=y
+CONFIG_TARGET_PENGWYN=y
+CONFIG_TEXT_BASE=0x81000000
+CONFIG_CLOCK_SYNTHESIZER=y
+CONFIG_AM335X_USB0=y
+CONFIG_AM335X_USB0_PERIPHERAL=y
+CONFIG_AM335X_USB1=y
+CONFIG_SPL=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4030ff00
+CONFIG_TIMESTAMP=y
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_BOOTCOMMAND="run mmcboot;"
+CONFIG_LOGLEVEL=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_ARCH_MISC_INIT=y
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_ETH=y
+# CONFIG_SPL_FS_EXT4 is not set
+CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
+# CONFIG_SPL_MTD_SUPPORT is not set
+CONFIG_SPL_MUSB_NEW=n
+# CONFIG_SPL_NAND_SUPPORT is not set
+# CONFIG_SPL_NAND_DRIVERS is not set
+# CONFIG_SPL_NAND_ECC is not set
+# CONFIG_SPL_NAND_BASE is not set
+# CONFIG_SPL_NET is not set
+CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
+# CONFIG_SPL_OS_BOOT is not set
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
+CONFIG_SPL_FALCON_BOOT_MMCSD=n
+CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
+CONFIG_SPL_USB_GADGET=n
+CONFIG_SPL_USB_ETHER=n
+CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
+CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00080000
+CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_OF_CONTROL=y
+CONFIG_OF_LIST="am335x-pengwyn am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
+CONFIG_ENV_OVERWRITE=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+# CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_VERSION_VARIABLE=y
+CONFIG_NET_RETRY_COUNT=10
+CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
+CONFIG_CLK=y
+CONFIG_CLK_CDCE9XX=y
+CONFIG_CLK_TI_CTRL=y
+CONFIG_DFU_TFTP=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_NAND=y
+CONFIG_NAND_OMAP_ECCSCHEME_BCH16_CODE_HW=y
+CONFIG_DFU_RAM=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_I2C=y
+CONFIG_MISC=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x50
+# CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_SYS_NAND_BLOCK_SIZE=0x80000
+CONFIG_SYS_NAND_ONFI_DETECTION=y
+CONFIG_SYS_NAND_PAGE_COUNT=0x40
+CONFIG_SYS_NAND_PAGE_SIZE=0x1000
+CONFIG_SYS_NAND_OOBSIZE=0xe0
+CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
+CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_PHY_SMSC=y
+CONFIG_PHY_GIGE=y
+CONFIG_MII=y
+CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_OMAP3_SPI=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB_ETHER=y
+CONFIG_WDT=y
+# CONFIG_SPL_WDT is not set
+CONFIG_DYNAMIC_CRC_TABLE=y
+CONFIG_RSA=y
+CONFIG_LZO=y
+### for verified boot ###
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
+CONFIG_SHA512=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
diff --git a/recipes-bsp/u-boot/files2/defconfig/pengwyn_fit_uboot_defconfig b/recipes-bsp/u-boot/files2/defconfig/pengwyn_fit_uboot_defconfig
new file mode 100644
index 0000000..7f5bc40
--- /dev/null
+++ b/recipes-bsp/u-boot/files2/defconfig/pengwyn_fit_uboot_defconfig
@@ -0,0 +1,158 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_TI_COMMON_CMD_OPTIONS=y
+CONFIG_DEFAULT_DEVICE_TREE="am335x-pengwyn"
+CONFIG_AM33XX=y
+CONFIG_TARGET_PENGWYN=y
+CONFIG_TEXT_BASE=0x81000000
+CONFIG_CLOCK_SYNTHESIZER=y
+CONFIG_AM335X_USB0=y
+CONFIG_AM335X_USB0_PERIPHERAL=y
+CONFIG_AM335X_USB1=y
+CONFIG_SPL=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4030ff00
+CONFIG_TIMESTAMP=y
+CONFIG_SPL_LOAD_FIT=y
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_BOOTCOMMAND="run mmcboot;"
+CONFIG_LOGLEVEL=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_ARCH_MISC_INIT=y
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
+# CONFIG_SYS_SPL_MALLOC=y
+# CONFIG_SYS_SPL_MALLOC_SIZE=0x800000
+# CONFIG_SPL_FIT_IMAGE_TINY=y
+CONFIG_SPL_ETH=y
+# CONFIG_SPL_FS_EXT4 is not set
+CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
+# CONFIG_SPL_MTD_SUPPORT is not set
+CONFIG_SPL_MUSB_NEW=n
+# CONFIG_SPL_NAND_SUPPORT is not set
+# CONFIG_SPL_NAND_DRIVERS is not set
+# CONFIG_SPL_NAND_ECC is not set
+# CONFIG_SPL_NAND_BASE is not set
+# CONFIG_SPL_NET is not set
+CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
+# CONFIG_SPL_OS_BOOT is not set
+CONFIG_SYS_NAND_SPL_KERNEL_OFFS=0x200000
+CONFIG_SPL_FALCON_BOOT_MMCSD=n
+CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
+CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
+CONFIG_SPL_USB_GADGET=n
+CONFIG_SPL_USB_ETHER=n
+CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
+CONFIG_CMD_SPL=y
+CONFIG_CMD_SPL_NAND_OFS=0x00080000
+CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_BOOTP_DNS2=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_OF_CONTROL=y
+CONFIG_OF_LIST="am335x-pengwyn am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
+CONFIG_ENV_OVERWRITE=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+# CONFIG_SPL_ENV_IS_NOWHERE is not set
+CONFIG_VERSION_VARIABLE=y
+CONFIG_NET_RETRY_COUNT=10
+CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
+CONFIG_CLK=y
+CONFIG_CLK_CDCE9XX=y
+CONFIG_CLK_TI_CTRL=y
+CONFIG_DFU_TFTP=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_NAND=y
+CONFIG_NAND_OMAP_ECCSCHEME_BCH16_CODE_HW=y
+CONFIG_DFU_RAM=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_DM_I2C=y
+CONFIG_MISC=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x50
+# CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_SYS_NAND_BLOCK_SIZE=0x80000
+CONFIG_SYS_NAND_ONFI_DETECTION=y
+CONFIG_SYS_NAND_PAGE_COUNT=0x40
+CONFIG_SYS_NAND_PAGE_SIZE=0x1000
+CONFIG_SYS_NAND_OOBSIZE=0xe0
+CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
+CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_PHY_SMSC=y
+CONFIG_PHY_GIGE=y
+CONFIG_MII=y
+CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_OMAP3_SPI=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+#CONFIG_USB=y
+#CONFIG_DM_USB_GADGET=y
+#CONFIG_SPL_DM_USB_GADGET=n
+#CONFIG_USB_MUSB_HOST=y
+#CONFIG_USB_MUSB_GADGET=y
+#CONFIG_USB_MUSB_TI=y
+#CONFIG_USB_GADGET=y
+#CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+#CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+#CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
+CONFIG_WDT=y
+# CONFIG_SPL_WDT is not set
+CONFIG_DYNAMIC_CRC_TABLE=y
+CONFIG_RSA=y
+CONFIG_LZO=y
+### TEST ###
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
+# CONFIG_SPL_TINY_MEMSET is not set
+# CONFIG_BLK is not set
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS=""
+# CONFIG_SPL_OF_PLATDATA is not set
+CONFIG_SPL_OF_TRANSLATE=y
+### for verified boot ###
+CONFIG_SPL_CRYPTO=y
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_SHA1=y
+CONFIG_SHA256=y
+CONFIG_SHA512=y
+CONFIG_SPL_SHA1=y
+CONFIG_SPL_SHA256=y
+CONFIG_SPL_SHA512=y
+#CONFIG_FIT_SIGNATURE=y
+#CONFIG_FIT_SIGNATURE_MAX_SIZE=0x10000000
+#CONFIG_SPL_FIT_FULL_CHECK=y
+#CONFIG_SPL_FIT_SIGNATURE=y
+#CONFIG_SPL_FIT_SIGNATURE_MAX_SIZE=0x10000000
+CONFIG_SPL_LOAD_FIT_FULL=y
diff --git a/recipes-bsp/u-boot/files2/env/uEnv_fit_kern_verity.txt b/recipes-bsp/u-boot/files2/env/uEnv_fit_kern_verity.txt
new file mode 100644
index 0000000..a1836d4
--- /dev/null
+++ b/recipes-bsp/u-boot/files2/env/uEnv_fit_kern_verity.txt
@@ -0,0 +1,48 @@
+arch=arm
+baudrate=115200
+board=pengwyn
+board_name=pengwyn
+bootargs=console=ttyO0,115200n8 root=ubi0:rootfs rw ubi.mtd=7,2048 rootfstype=ubifs rootwait=1
+bootcmd=run mmcboot;run nandboot;
+bootdelay=2
+bootdir=/boot
+bootenv=uEnv.txt
+bootfile=fitImage
+bootpart=0:1
+console=ttyS0,115200n8
+cpu=armv7
+ethact=cpsw
+ethaddr=00:18:30:fc:c0:35
+fdtaddr=0x81200000
+fdtfile=am335x-pengwyn.dtb
+importbootenv=echo Importing environment from mmc ...; env import -t $loadaddr $filesize
+loadaddr=0x80200000
+loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
+loadfdt=fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}
+loadimage=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}
+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
+mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run mmcloados;fi;fi;
+mmcdev=0
+mmcloados=run mmcargs; bootm ${loadaddr};
+mmcroot=/dev/mmcblk0p2 ro
+mmcrootfstype=ext4 rootwait
+mtddevname=SPL
+mtddevnum=0
+mtdids=nand0=omap2-nand.0
+mtdparts=mtdparts=omap2-nand.0:512k(SPL),512k(SPL.backup1),512k(SPL.backup2),512k(SPL.backup3),1536k(u-boot),512k(u-boot-spl-os),512k(u-boot-env),5m(kernel),-(rootfs)
+nandargs=setenv bootargs console=${console} ${optargs} root=${nandroot} rootfstype=${nandrootfstype}
+nandboot=echo Booting from nand ...; run nandargs; nand read ${fdtaddr} u-boot-spl-os; nand read ${loadaddr} kernel; bootz ${loadaddr} - ${fdtaddr}
+nandroot=ubi0:rootfs rw ubi.mtd=7,2048
+nandrootfstype=ubifs rootwait=1
+netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
+netboot=echo Booting from network ...; setenv autoload no; dhcp; tftp ${loadaddr} ${bootfile}; tftp ${fdtaddr} ${fdtfile}; run netargs; bootz ${loadaddr} - ${fdtaddr}
+nfsopts=nolock
+partition=nand0,0
+rootpath=/export/rootfs
+soc=am33xx
+static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off
+stderr=serial@44e09000
+stdin=serial@44e09000
+stdout=serial@44e09000
+vendor=silica
+ver=U-Boot 2020.07-g2f5fbb5b39 (Jul 06 2020 - 19:22:53 +0000)
diff --git a/recipes-bsp/u-boot/files2/env/uEnv_fit_kernel.txt b/recipes-bsp/u-boot/files2/env/uEnv_fit_kernel.txt
new file mode 100644
index 0000000..b1c23e2
--- /dev/null
+++ b/recipes-bsp/u-boot/files2/env/uEnv_fit_kernel.txt
@@ -0,0 +1,48 @@
+arch=arm
+baudrate=115200
+board=pengwyn
+board_name=pengwyn
+bootargs=console=ttyO0,115200n8 root=ubi0:rootfs rw ubi.mtd=7,2048 rootfstype=ubifs rootwait=1
+bootcmd=run mmcboot;
+bootdelay=2
+bootdir=/boot
+bootenv=uEnv.txt
+bootfile=fitImage
+bootpart=0:1
+console=ttyS0,115200n8
+cpu=armv7
+ethact=cpsw
+ethaddr=00:18:30:fc:c0:35
+fdtaddr=0x80F80000
+fdtfile=am335x-pengwyn.dtb
+importbootenv=echo Importing environment from mmc ...; env import -t $loadaddr $filesize
+loadaddr=0x80600000
+loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
+loadfdt=fatload mmc ${mmcdev} ${fdtaddr} devicetree/${fdtfile}
+loadimage=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}
+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype} shell=before:dmverity
+mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run mmcloados;fi;fi;
+mmcdev=0
+mmcloados=run mmcargs; bootm ${loadaddr};
+mmcroot=/dev/mmcblk0p2 ro
+mmcrootfstype=ext4 rootwait
+mtddevname=SPL
+mtddevnum=0
+mtdids=nand0=omap2-nand.0
+mtdparts=mtdparts=omap2-nand.0:512k(SPL),512k(SPL.backup1),512k(SPL.backup2),512k(SPL.backup3),1536k(u-boot),512k(u-boot-spl-os),512k(u-boot-env),5m(kernel),-(rootfs)
+nandargs=setenv bootargs console=${console} ${optargs} root=${nandroot} rootfstype=${nandrootfstype}
+nandboot=echo Booting from nand ...; run nandargs; nand read ${fdtaddr} u-boot-spl-os; nand read ${loadaddr} kernel; bootz ${loadaddr} - ${fdtaddr}
+nandroot=ubi0:rootfs rw ubi.mtd=7,2048
+nandrootfstype=ubifs rootwait=1
+netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
+netboot=echo Booting from network ...; setenv autoload no; dhcp; tftp ${loadaddr} ${bootfile}; tftp ${fdtaddr} ${fdtfile}; run netargs; bootz ${loadaddr} - ${fdtaddr}
+nfsopts=nolock
+partition=nand0,0
+rootpath=/export/rootfs
+soc=am33xx
+static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off
+stderr=serial@44e09000
+stdin=serial@44e09000
+stdout=serial@44e09000
+vendor=silica
+ver=U-Boot 2020.07-g2f5fbb5b39 (Jul 06 2020 - 19:22:53 +0000)
diff --git a/recipes-bsp/u-boot/files2/env/uEnv_verity.txt b/recipes-bsp/u-boot/files2/env/uEnv_verity.txt
new file mode 100644
index 0000000..84e5e60
--- /dev/null
+++ b/recipes-bsp/u-boot/files2/env/uEnv_verity.txt
@@ -0,0 +1,48 @@
+arch=arm
+baudrate=115200
+board=pengwyn
+board_name=pengwyn
+bootargs=console=ttyO0,115200n8 root=ubi0:rootfs rw ubi.mtd=7,2048 rootfstype=ubifs rootwait=1
+bootcmd=run mmcboot;run nandboot;
+bootdelay=2
+bootdir=/boot
+bootenv=uEnv.txt
+bootfile=uImage-initramfs-pengwyn.bin
+bootpart=0:1
+console=ttyS0,115200n8
+cpu=armv7
+ethact=cpsw
+ethaddr=00:18:30:fc:c0:35
+fdtaddr=0x81200000
+fdtfile=am335x-pengwyn.dtb
+importbootenv=echo Importing environment from mmc ...; env import -t $loadaddr $filesize
+loadaddr=0x80200000
+loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}
+loadfdt=fatload mmc ${mmcdev} ${fdtaddr} devicetree/${fdtfile}
+loadimage=fatload mmc ${mmcdev} ${loadaddr} ${bootfile}
+mmcargs=setenv bootargs console=${console} ${optargs} root=${mmcroot} rootfstype=${mmcrootfstype}
+mmcboot=mmc dev ${mmcdev}; if mmc rescan; then echo SD/MMC found on device ${mmcdev};if run loadbootenv; then echo Loaded environment from ${bootenv};run importbootenv;fi;if test -n $uenvcmd; then echo Running uenvcmd ...;run uenvcmd;fi;if run loadimage; then run loadfdt;run mmcloados;fi;fi;
+mmcdev=0
+mmcloados=run mmcargs; bootm ${loadaddr} - ${fdtaddr};
+mmcroot=/dev/mmcblk0p2 ro
+mmcrootfstype=ext4 rootwait
+mtddevname=SPL
+mtddevnum=0
+mtdids=nand0=omap2-nand.0
+mtdparts=mtdparts=omap2-nand.0:512k(SPL),512k(SPL.backup1),512k(SPL.backup2),512k(SPL.backup3),1536k(u-boot),512k(u-boot-spl-os),512k(u-boot-env),5m(kernel),-(rootfs)
+nandargs=setenv bootargs console=${console} ${optargs} root=${nandroot} rootfstype=${nandrootfstype}
+nandboot=echo Booting from nand ...; run nandargs; nand read ${fdtaddr} u-boot-spl-os; nand read ${loadaddr} kernel; bootz ${loadaddr} - ${fdtaddr}
+nandroot=ubi0:rootfs rw ubi.mtd=7,2048
+nandrootfstype=ubifs rootwait=1
+netargs=setenv bootargs console=${console} ${optargs} root=/dev/nfs nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp
+netboot=echo Booting from network ...; setenv autoload no; dhcp; tftp ${loadaddr} ${bootfile}; tftp ${fdtaddr} ${fdtfile}; run netargs; bootz ${loadaddr} - ${fdtaddr}
+nfsopts=nolock
+partition=nand0,0
+rootpath=/export/rootfs
+soc=am33xx
+static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off
+stderr=serial@44e09000
+stdin=serial@44e09000
+stdout=serial@44e09000
+vendor=silica
+ver=U-Boot 2020.07-g2f5fbb5b39 (Jul 06 2020 - 19:22:53 +0000)
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb
index 0b31615..ea29219 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2023.01.bb
@@ -26,9 +26,22 @@ SRC_URI = " \
             file://0010-log-compile-err.patch \
           "
 
-SRC_URI += "${@ 'file://defconfig/pengwyn_fitimage_defconfig' if d.getVar('UBOOT_FITIMAGE_ENABLE') == '1' else 'file://defconfig/pengwyn_defconfig'}"
+# Pengwyn defconfig
+SRC_URI += " \
+             file://defconfig/pengwyn_fit_kern_defconfig \
+             file://defconfig/pengwyn_fit_uboot_defconfig \
+             file://defconfig/pengwyn_fitimage_defconfig \
+             file://defconfig/pengwyn_dmverity_defconfig \
+             file://defconfig/pengwyn_defconfig \
+           "
 
-SRC_URI += "${@ 'file://env/uEnv_fitimage.txt' if d.getVar('UBOOT_FITIMAGE_ENABLE') == '1' else 'file://env/uEnv.txt'}"
+# U-Boot environment variables file
+SRC_URI += " \
+             file://env/uEnv_fit_kern_verity.txt \
+             file://env/uEnv_fit_kernel.txt \
+             file://env/uEnv_verity.txt \
+             file://env/uEnv.txt \
+           "
 
 # Tag: v2023.01
 SRCREV = "62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9"
@@ -45,10 +58,18 @@ do_configure:prepend() {
 	install -m 0644 ${WORKDIR}/mux.c ${S}/board/silica/pengwyn
 
 	install -d ${S}/configs
-	if [ "${UBOOT_FITIMAGE_ENABLE}" = '1' ]; then
-		install -m 0644 ${WORKDIR}/defconfig/pengwyn_fitimage_defconfig ${S}/configs/pengwyn_defconfig
+	if [ "${SCLE_DM_VERITY}" = '1' ]; then
+		if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then
+			install -m 0644 ${WORKDIR}/defconfig/pengwyn_fitimage_defconfig ${S}/configs/pengwyn_defconfig
+		else
+			install -m 0644 ${WORKDIR}/defconfig/pengwyn_dmverity_defconfig ${S}/configs/pengwyn_defconfig
+		fi
 	else
-		install -m 0644 ${WORKDIR}/defconfig/pengwyn_defconfig ${S}/configs/pengwyn_defconfig
+		if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then
+			install -m 0644 ${WORKDIR}/defconfig/pengwyn_fitimage_defconfig ${S}/configs/pengwyn_defconfig
+		else
+			install -m 0644 ${WORKDIR}/defconfig/pengwyn_defconfig ${S}/configs/pengwyn_defconfig
+		fi
 	fi
 
 	install -d ${S}/include/configs/
@@ -60,9 +81,17 @@ do_configure:prepend() {
 }
 
 do_deploy:append() {
-	if [ "${UBOOT_FITIMAGE_ENABLE}" = '1' ]; then
-		install -m 0644 ${WORKDIR}/env/uEnv_fitimage.txt ${DEPLOY_DIR_IMAGE}/uEnv.txt
+	if [ "${SCLE_DM_VERITY}" = '1' ]; then
+		if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then
+			install -m 0644 ${WORKDIR}/env/uEnv_fit_kern_verity.txt ${DEPLOY_DIR_IMAGE}/uEnv.txt
+		else
+			install -m 0644 ${WORKDIR}/env/uEnv_verity.txt ${DEPLOY_DIR_IMAGE}/uEnv.txt
+		fi
 	else
-		install -m 0644 ${WORKDIR}/env/uEnv.txt ${DEPLOY_DIR_IMAGE}/uEnv.txt
+		if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then
+			install -m 0644 ${WORKDIR}/env/uEnv_fit_kernel.txt ${DEPLOY_DIR_IMAGE}/uEnv.txt
+		else
+			install -m 0644 ${WORKDIR}/env/uEnv.txt ${DEPLOY_DIR_IMAGE}/uEnv.txt
+		fi
 	fi
 }