[PATCH v4 16/16] Drop the special am335x_boneblack_vboot target

Mon Jun 24 10:25:30 CEST 2024

Hi Simon,

On 6/23/24 7:53 PM, Simon Glass wrote:
> Now that am335x_evm boots OK on the Beaglebone black, drop the latter
> and update the docs to cover the change.
> 
> Also add a few updates about 'make fit' and drop the note about the
> security review, as U-Boot's verified boot has had quite extensive
> review now.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
> 
> Changes in v4:
> - Move Binman size feature to a separate series
> 
> Changes in v2:
> - Drop patch "regulator: rk8xx: Fix incorrect parameter"
> - Rewrite boneblack patch to onstead drop the target and update docs
> 
>   board/ti/am335x/MAINTAINERS              |  1 -
>   configs/am335x_boneblack_vboot_defconfig | 94 ------------------------
>   configs/am335x_evm_defconfig             |  3 +-
>   doc/usage/fit/beaglebone_vboot.rst       | 21 +++---
>   4 files changed, 12 insertions(+), 107 deletions(-)
>   delete mode 100644 configs/am335x_boneblack_vboot_defconfig
> 
> diff --git a/board/ti/am335x/MAINTAINERS b/board/ti/am335x/MAINTAINERS
> index 219c8715bf1..ed8800a2663 100644
> --- a/board/ti/am335x/MAINTAINERS
> +++ b/board/ti/am335x/MAINTAINERS
> @@ -3,6 +3,5 @@ M:	Tom Rini <trini at konsulko.com>
>   S:	Maintained
>   F:	board/ti/am335x/
>   F:	include/configs/am335x_evm.h
> -F:	configs/am335x_boneblack_vboot_defconfig
>   F:	configs/am335x_evm_defconfig
>   F:	configs/am335x_evm_spiboot_defconfig
> diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
> deleted file mode 100644
> index d473a1a793b..00000000000
> --- a/configs/am335x_boneblack_vboot_defconfig
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_CPU_INIT=y
> -# CONFIG_SPL_USE_ARCH_MEMCPY is not set
> -# CONFIG_SPL_USE_ARCH_MEMSET is not set
> -CONFIG_ARCH_OMAP2PLUS=y
> -CONFIG_TI_COMMON_CMD_OPTIONS=y
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4030ff00
> -CONFIG_SF_DEFAULT_SPEED=24000000
> -CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
> -CONFIG_AM33XX=y
> -CONFIG_CLOCK_SYNTHESIZER=y
> -CONFIG_SPL=y
> -CONFIG_ENV_OFFSET_REDUND=0x280000
> -CONFIG_TIMESTAMP=y
> -CONFIG_FIT_SIGNATURE=y
> -CONFIG_FIT_VERBOSE=y
> -CONFIG_SYS_BOOTM_LEN=0x1000000
> -CONFIG_DISTRO_DEFAULTS=y
> -CONFIG_AUTOBOOT_KEYED=y
> -CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
> -CONFIG_AUTOBOOT_DELAY_STR="d"
> -CONFIG_AUTOBOOT_STOP_STR=" "
> -CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
> -CONFIG_SYS_CONSOLE_INFO_QUIET=y
> -CONFIG_ARCH_MISC_INIT=y
> -CONFIG_SPL_SYS_MALLOC=y
> -CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
> -CONFIG_SPL_MUSB_NEW=y
> -# CONFIG_SPL_NAND_SUPPORT is not set
> -CONFIG_SPL_NET=y
> -CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL"
> -CONFIG_SPL_OS_BOOT=y
> -CONFIG_SPL_FALCON_BOOT_MMCSD=y
> -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_CMD_SPL=y
> -CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
> -# CONFIG_CMD_SETEXPR is not set
> -CONFIG_BOOTP_DNS2=y
> -CONFIG_OF_CONTROL=y
> -CONFIG_SPL_OF_CONTROL=y
> -CONFIG_ENV_OVERWRITE=y
> -CONFIG_ENV_IS_IN_MMC=y
> -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
> -CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SYS_MMC_ENV_DEV=1
> -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -CONFIG_VERSION_VARIABLE=y
> -CONFIG_NET_RETRY_COUNT=10
> -CONFIG_BOOTP_SEND_HOSTNAME=y
> -# CONFIG_SPL_BLK is not set
> -CONFIG_BOOTCOUNT_LIMIT=y
> -CONFIG_SYS_BOOTCOUNT_BE=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_RAM=y
> -CONFIG_USB_FUNCTION_FASTBOOT=y
> -CONFIG_DM_I2C=y
> -CONFIG_MISC=y
> -CONFIG_SYS_I2C_EEPROM_ADDR=0x50
> -# CONFIG_SPL_DM_MMC is not set
> -CONFIG_MMC_OMAP_HS=y
> -CONFIG_MTD=y
> -CONFIG_DM_SPI_FLASH=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_SPL_POWER_TPS65910=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=y
> -CONFIG_USB_MUSB_HOST=y
> -CONFIG_USB_MUSB_GADGET=y
> -CONFIG_USB_MUSB_TI=y
> -CONFIG_USB_GADGET=y
> -CONFIG_SPL_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_SPL_USB_ETHER=y
> -CONFIG_LZO=y
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index d243cb16e72..cabc181460a 100644
> --- a/configs/am335x_evm_defconfig
> +++ b/configs/am335x_evm_defconfig
> @@ -13,6 +13,8 @@ CONFIG_AM335X_USB0_PERIPHERAL=y
>   CONFIG_AM335X_USB1=y
>   CONFIG_SPL=y
>   CONFIG_TIMESTAMP=y
> +CONFIG_FIT_SIGNATURE=y
> +CONFIG_FIT_VERBOSE=y
>   CONFIG_SPL_LOAD_FIT=y
>   CONFIG_SYS_BOOTM_LEN=0x1000000
>   CONFIG_DISTRO_DEFAULTS=y
> @@ -119,5 +121,4 @@ CONFIG_SPL_USB_ETHER=y
>   CONFIG_WDT=y
>   # CONFIG_SPL_WDT is not set
>   CONFIG_DYNAMIC_CRC_TABLE=y
> -CONFIG_RSA=y
>   CONFIG_LZO=y
> diff --git a/doc/usage/fit/beaglebone_vboot.rst b/doc/usage/fit/beaglebone_vboot.rst
> index cd6bb141910..1360c71803c 100644
> --- a/doc/usage/fit/beaglebone_vboot.rst
> +++ b/doc/usage/fit/beaglebone_vboot.rst
> @@ -67,18 +67,20 @@ a. Set up the environment variable to point to your toolchain. You will need
>   
>          export CROSS_COMPILE=arm-linux-gnueabi-
>   
> -b. Configure and build U-Boot with verified boot enabled::
> +b. Configure and build U-Boot with verified boot enabled. Note that we use the
> +am335x_evm target since it covers all boards based on the AM335x evaluation
> +board::
>   
>       export UBOOT=/path/to/u-boot
>       cd $UBOOT
>       # You can add -j10 if you have 10 CPUs to make it faster
> -    make O=b/am335x_boneblack_vboot am335x_boneblack_vboot_config all
> -    export UOUT=$UBOOT/b/am335x_boneblack_vboot
> +    make O=b/am335x_evm am335x_evm_config all
> +    export UOUT=$UBOOT/b/am335x_evm
>   
>   c. You will now have a U-Boot image::
>   
> -    file b/am335x_boneblack_vboot/u-boot-dtb.img
> -    b/am335x_boneblack_vboot/u-boot-dtb.img: u-boot legacy uImage,
> +    file b/am335x_evm/u-boot-dtb.img
> +    b/am335x_evm/u-boot-dtb.img: u-boot legacy uImage,
>         U-Boot 2014.07-rc2-00065-g2f69f8, Firmware/ARM, Firmware Image
>         (Not compressed), 395375 bytes, Sat May 31 16:19:04 2014,
>         Load Address: 0x80800000, Entry Point: 0x00000000,
> @@ -466,7 +468,7 @@ the private key that you signed with so that it can verify any kernels that
>   you sign::
>   
>       cd $UBOOT
> -    make O=b/am335x_boneblack_vboot EXT_DTB=${WORK}/am335x-boneblack-pubkey.dtb
> +    make O=b/am335x_evm EXT_DTB=${WORK}/am335x-boneblack-pubkey.dtb
>   
>   Here we are overriding the normal device tree file with our one, which
>   contains the public key.
> @@ -597,14 +599,11 @@ Further Improvements
>   
>   Several of the steps here can be easily automated. In particular it would be
>   capital if signing and packaging a kernel were easy, perhaps a simple make
> -target in the kernel.
> +target in the kernel. A stating point for this is the 'make image.fit' target

s/stating/starting/ I believe?

Cheers,
Quentin