summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/omap3_evm_defconfig9
-rw-r--r--include/configs/omap3_evm.h3
2 files changed, 7 insertions, 5 deletions
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index cd517b418d6..c53f4396185 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000
+CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_OMAP3_EVM=y
CONFIG_SPL=y
CONFIG_DEFAULT_DEVICE_TREE="omap3-evm"
@@ -38,6 +39,10 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_SPL_DM=y
CONFIG_USB_FUNCTION_FASTBOOT=y
CONFIG_FASTBOOT_BUF_ADDR=0x82000000
+CONFIG_BLK=y
+# CONFIG_SPL_BLK is not set
+CONFIG_DM_MMC=y
+# CONFIG_SPL_DM_MMC is not set
CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y
CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
@@ -48,15 +53,15 @@ CONFIG_NETDEVICES=y
CONFIG_SMC911X=y
CONFIG_SMC911X_BASE=0x2C000000
CONFIG_SMC911X_32_BIT=y
+CONFIG_CONS_INDEX=1
CONFIG_SYS_NS16550=y
CONFIG_SPI=y
+CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_OMAP3=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
CONFIG_USB_GADGET_VENDOR_NUM=0x0451
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 34418309cb2..6e5c3005ced 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -33,9 +33,6 @@
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
-/* Override OMAP3 serial console configuration */
-#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
-
/* NAND */
#if defined(CONFIG_NAND)
#define CONFIG_SYS_FLASH_BASE NAND_BASE