[U-Boot] [PATCH v2 0/8] Update and sync HS configs
Hello all,
This series is a consolidation of several past series and patches. We first sync the current HS and non-HS defconfigs. Then we merge in two AM43xx defconfigs into the HS defconfig. Lastly we add a defconfig for AM335x UART boot, we cannot add UART boot to the regular defconfig due to SPL size limitations.
Thanks, Andrew
Andrew F. Davis (8): defconfigs: am335x_hs_evm: Sync HS and non-HS defconfigs defconfigs: am43xx_hs_evm: Sync HS and non-HS defconfigs defconfigs: am57xx_hs_evm: Sync HS and non-HS defconfigs defconfigs: dra7xx_hs_evm: Sync HS and non-HS defconfigs defconfigs: am43xx_hs_evm: Add Net boot mode support defconfigs: am43xx_hs_evm: Add USB client boot mode support defconfigs: am43xx_hs_evm: Add USB Host boot mode support defconfigs: Add a config for AM335x High Security EVM with UART Boot support
configs/am335x_hs_evm_defconfig | 6 ++++++ ...35x_hs_evm_defconfig => am335x_hs_evm_uart_defconfig} | 16 ++++++++++++---- configs/am43xx_hs_evm_defconfig | 12 ++++++++++-- configs/am57xx_hs_evm_defconfig | 7 +++++++ configs/dra7xx_hs_evm_defconfig | 1 + 5 files changed, 36 insertions(+), 6 deletions(-) copy configs/{am335x_hs_evm_defconfig => am335x_hs_evm_uart_defconfig} (78%)
Sync new additions to non-HS defconfig with HS defconfig. Also add SPL NAND support, this was disabled before due to size constraints, enable this now at the expense of the less used GPT partition support.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am335x_hs_evm_defconfig | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index ff5bf64c68..8ab86535b6 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_SYS_EXTRA_OPTIONS="NAND" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y @@ -32,12 +33,15 @@ CONFIG_CMD_DFU=y CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_EXT4_WRITE=y +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_DM_I2C=y +CONFIG_MISC=y CONFIG_DM_MMC=y # CONFIG_DM_MMC_OPS is not set CONFIG_MMC_OMAP_HS=y @@ -48,8 +52,10 @@ CONFIG_SYS_NS16550=y CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_TI=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y
On Fri, Apr 07, 2017 at 10:11:19AM -0500, Andrew F. Davis wrote:
Sync new additions to non-HS defconfig with HS defconfig. Also add SPL NAND support, this was disabled before due to size constraints, enable this now at the expense of the less used GPT partition support.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Additions have been made to the non-HS defconfig without the same being made to the HS defconfig, sync them.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am43xx_hs_evm_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 17217e9051..7a39d38499 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -10,7 +10,7 @@ CONFIG_FIT=y CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y @@ -41,6 +41,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y +CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y @@ -53,6 +54,7 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y
On Fri, Apr 07, 2017 at 10:11:20AM -0500, Andrew F. Davis wrote:
Additions have been made to the non-HS defconfig without the same being made to the HS defconfig, sync them.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Additions have been made to the non-HS defconfig without the same being made to the HS defconfig, sync them.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am57xx_hs_evm_defconfig | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 956e39f1f8..e96601dc44 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -9,6 +9,7 @@ CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000 # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" CONFIG_FIT=y @@ -51,6 +52,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y @@ -59,6 +61,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk" CONFIG_DM=y CONFIG_SPL_DM=y # CONFIG_BLK is not set @@ -73,6 +76,10 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_PALMAS=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PALMAS=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y
On Fri, Apr 07, 2017 at 10:11:21AM -0500, Andrew F. Davis wrote:
Additions have been made to the non-HS defconfig without the same being made to the HS defconfig, sync them.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Additions have been made to the non-HS defconfig without the same being made to the HS defconfig, sync them.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/dra7xx_hs_evm_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index f3a9c68008..158a91560e 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -9,6 +9,7 @@ CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000 # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y +CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="dra7-evm" CONFIG_FIT=y
On Fri, Apr 07, 2017 at 10:11:22AM -0500, Andrew F. Davis wrote:
Additions have been made to the non-HS defconfig without the same being made to the HS defconfig, sync them.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Enable Eth/Net boot support in the default defconfig to allow network booting.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am43xx_hs_evm_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 7a39d38499..3b1a411519 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -15,7 +15,10 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -56,7 +59,6 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y
On Fri, Apr 07, 2017 at 10:11:23AM -0500, Andrew F. Davis wrote:
Enable Eth/Net boot support in the default defconfig to allow network booting.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Enable CONFIG_SPL_USBETH_SUPPORT in the default defconfig to allow booting as a USB RNDIS peripheral.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am43xx_hs_evm_defconfig | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 3b1a411519..7a27678ad0 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -19,6 +19,9 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" +CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USBETH_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set
On Fri, Apr 07, 2017 at 10:11:24AM -0500, Andrew F. Davis wrote:
Enable CONFIG_SPL_USBETH_SUPPORT in the default defconfig to allow booting as a USB RNDIS peripheral.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Enable SPL_USB_HOST_SUPPORT in the default defconfig to allow booting from USB peripherals. Unlike the non-HS boards, we already load SPL to a 0x4030_0000+ address, so no other changes are needed.
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am43xx_hs_evm_defconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 7a27678ad0..795dfd717b 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -19,6 +19,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" +CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USBETH_SUPPORT=y
On Fri, Apr 07, 2017 at 10:11:25AM -0500, Andrew F. Davis wrote:
Enable SPL_USB_HOST_SUPPORT in the default defconfig to allow booting from USB peripherals. Unlike the non-HS boards, we already load SPL to a 0x4030_0000+ address, so no other changes are needed.
Signed-off-by: Andrew F. Davis afd@ti.com
Applied to u-boot/master, thanks!
Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of UART booting
Signed-off-by: Andrew F. Davis afd@ti.com --- configs/am335x_hs_evm_uart_defconfig | 69 ++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 configs/am335x_hs_evm_uart_defconfig
diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig new file mode 100644 index 0000000000..713bc61534 --- /dev/null +++ b/configs/am335x_hs_evm_uart_defconfig @@ -0,0 +1,69 @@ +CONFIG_ARM=y +CONFIG_AM33XX=y +CONFIG_TI_SECURE_DEVICE=y +CONFIG_TARGET_AM335X_EVM=y +CONFIG_ISW_ENTRY_ADDR=0x40301750 +# CONFIG_SPL_MMC_SUPPORT is not set +# CONFIG_SPL_LIBDISK_SUPPORT is not set +# CONFIG_SPL_NAND_SUPPORT is not set +# CONFIG_SPL_EXT_SUPPORT is not set +# CONFIG_SPL_FAT_SUPPORT is not set +CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT=y +CONFIG_FIT_IMAGE_POST_PROCESS=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y +CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_STACK_R=y +CONFIG_SPL_MUSB_NEW_SUPPORT=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_EXT4_WRITE=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" +# CONFIG_BLK is not set +CONFIG_DFU_MMC=y +CONFIG_DFU_NAND=y +CONFIG_DFU_RAM=y +CONFIG_DM_I2C=y +CONFIG_MISC=y +CONFIG_DM_MMC=y +# CONFIG_DM_MMC_OPS is not set +CONFIG_MMC_OMAP_HS=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_ETH=y +CONFIG_SYS_NS16550=y +CONFIG_TIMER=y +CONFIG_OMAP_TIMER=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_TI=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_USE_TINY_PRINTF=y +CONFIG_RSA=y +CONFIG_SPL_OF_LIBFDT=y
On Fri, Apr 07, 2017 at 10:11:26AM -0500, Andrew F. Davis wrote:
Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of UART booting
Signed-off-by: Andrew F. Davis afd@ti.com
Please note that with gcc-4.9 and gcc-5.x this does not link, only with gcc-6.x. This particular config might need to stay in the TI SDKs only for now as we're not ready to go with gcc-6.x as a minimum and I'm not sure you can get another ~2144 bytes back.
On 04/09/2017 05:16 PM, Tom Rini wrote:
On Fri, Apr 07, 2017 at 10:11:26AM -0500, Andrew F. Davis wrote:
Add a new defconfig file for the AM335x High Security EVM. This config is specific for the case of UART booting
Signed-off-by: Andrew F. Davis afd@ti.com
Please note that with gcc-4.9 and gcc-5.x this does not link, only with gcc-6.x. This particular config might need to stay in the TI SDKs only for now as we're not ready to go with gcc-6.x as a minimum and I'm not sure you can get another ~2144 bytes back.
That's fine, this patch can be ignored if it helps get the other patches taken in a timely manner, some have been waiting for months on the list and these platforms have been very broken without these fixes.
participants (2)
-
Andrew F. Davis -
Tom Rini