Skip to contentSkip to conversation

ARM: omap3: evm: Enable CONFIG_BLK and misc. cleanup

PATCH In review Derald D. Woods 2 participants 2 messages Aug 6, 2018 – Aug 13, 2018

lore
Share & tools
lore

Derald D. Woods

author
#0 lore raw

PATCH 1/1 ARM: omap3: evm: Enable CONFIG_BLK and misc. cleanup

This commit enables CONFIG_BLK and removes USB_STORAGE which is awaiting proper implementation for current U-Boot interfaces. Additionally the console selection is now handled by Kconfig and no longer needs to be in the config header. CONFIG_SYS_MALLOC_F_LEN=0x2000 was added to sync with other boards. CONFIG_SPL_BLK and CONFIG_SPL_DM_MMC are disabled because they currently do not allow the OMAP3-EVM (OMAP34XX) to actually boot.

Signed-off-by Derald D. Woods <[email protected]>
---
 configs/omap3_evm_defconfig | 9 +++++++--
 include/configs/omap3_evm.h | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)
configs/omap3_evm_defconfig +7 -2
index cd517b418d..c53f439618 100644
@@ -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
include/configs/omap3_evm.h +0 -3
index 34418309cb..6e5c3005ce 100644
@@ -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
Signature · 1 line
2.18.0
#1 lore raw
Quoted 8 lines · Derald D. Woods

This commit enables CONFIG_BLK and removes USB_STORAGE which is awaiting proper implementation for current U-Boot interfaces. Additionally the console selection is now handled by Kconfig and no longer needs to be in the config header. CONFIG_SYS_MALLOC_F_LEN=0x2000 was added to sync with other boards. CONFIG_SPL_BLK and CONFIG_SPL_DM_MMC are disabled because they currently do not allow the OMAP3-EVM (OMAP34XX) to actually boot.

Signed-off-by Derald D. Woods <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180813/68b25321/attachment.sig>