diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
| commit | 6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch) | |
| tree | 3c560d567a76e9850e0195fb892d7e1fbaeed198 /configs/omap4_panda_defconfig | |
| parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
| parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
| download | u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.gz u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.bz2 u-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.zip | |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'configs/omap4_panda_defconfig')
| -rw-r--r-- | configs/omap4_panda_defconfig | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 9e8fbed5e6..b21e79ceaf 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -3,11 +3,13 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_SPL_TEXT_BASE=0x40300000 CONFIG_OMAP44XX=y CONFIG_TARGET_OMAP4_PANDA=y +CONFIG_DEFAULT_DEVICE_TREE="omap4-panda" CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_DEFAULT_FDT_FILE="omap4-panda.dtb" CONFIG_VERSION_VARIABLE=y # CONFIG_SPL_FS_EXT4 is not set # CONFIG_SPL_I2C_SUPPORT is not set @@ -18,21 +20,23 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y +CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM=y +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y +# CONFIG_SPI is not set CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y @@ -40,3 +44,5 @@ CONFIG_USB_GADGET=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_OF_LIBFDT=y +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_DM_ETH=y |