Merge branch 'master' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / board / ti / am335x / Kconfig

diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index 0e5149c69c63ef0c36712d7a384423505d4b80a2..722f9d57c4d388ae6f08dad20bbfbff8357b1e5d 100644 (file)
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -1,27 +1,20 @@
 if TARGET_AM335X_EVM
 
-config SYS_CPU
-       string
-       default "armv7"
-
 config SYS_BOARD
-       string
        default "am335x"
 
 config SYS_VENDOR
-       string
        default "ti"
 
 config SYS_SOC
-       string
        default "am33xx"
 
 config SYS_CONFIG_NAME
-       string
        default "am335x_evm"
 
 config CONS_INDEX
        int "UART used for console"
+       range 1 6
        default 1
        help
          The AM335x SoC has a total of 6 UARTs (UART0 to UART5 as referenced
@@ -29,4 +22,35 @@ config CONS_INDEX
          board you may want something other than UART0 as for example the IDK
          uses UART3 so enter 4 here.
 
+config NOR
+       bool "Support for NOR flash"
+       help
+         The AM335x SoC supports having a NOR flash connected to the GPMC.
+         In practice this is seen as a NOR flash module connected to the
+         "memory cape" for the BeagleBone family.
+
+config NOR_BOOT
+       bool "Support for booting from NOR flash"
+       depends on NOR
+       help
+         Enabling this will make a U-Boot binary that is capable of being
+         booted via NOR.  In this case we will enable certain pinmux early
+         as the ROM only partially sets up pinmux.  We also default to using
+         NOR for environment.
+
+config DM
+       default y
+
+config DM_GPIO
+       default y if DM
+
+config DM_SERIAL
+       default y if DM
+
+config SYS_MALLOC_F
+       default y if DM
+
+config SYS_MALLOC_F_LEN
+       default 0x400 if DM
+
 endif