summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-27 16:15:07 -0400
committerTom Rini <trini@ti.com>2014-11-05 11:57:04 -0500
commit40aca036c89153d04230f2ae617f57d5390bb603 (patch)
tree8b4380d720cee49714df0392d3c0d9f51e7ca3d6
parentd5325eff10922acb11c39efece6d5f24de5b1998 (diff)
downloadblackbird-obmc-uboot-40aca036c89153d04230f2ae617f57d5390bb603.tar.gz
blackbird-obmc-uboot-40aca036c89153d04230f2ae617f57d5390bb603.zip
am335x_evm: Add NOR to Kconfig
Make enabling support for NOR (and describe where it's seen) be done via Kconfig. Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--board/ti/am335x/Kconfig7
-rw-r--r--configs/am335x_evm_nor_defconfig3
-rw-r--r--configs/am335x_evm_norboot_defconfig3
3 files changed, 11 insertions, 2 deletions
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index b9f6bd7122..1878e362a9 100644
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -22,4 +22,11 @@ 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.
+
endif
diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig
index 41f31cc02e..be901633ac 100644
--- a/configs/am335x_evm_nor_defconfig
+++ b/configs/am335x_evm_nor_defconfig
@@ -1,5 +1,6 @@
CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="NAND,NOR"
+CONFIG_SYS_EXTRA_OPTIONS="NAND"
CONFIG_CONS_INDEX=1
+S:CONFIG_ARM=y
+S:CONFIG_TARGET_AM335X_EVM=y
+CONFIG_NOR=y
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index 7dbfa277e0..d2d3ba2603 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -1,4 +1,5 @@
-CONFIG_SYS_EXTRA_OPTIONS="NOR,NOR_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="NOR_BOOT"
CONFIG_CONS_INDEX=1
CONFIG_ARM=y
CONFIG_TARGET_AM335X_EVM=y
+CONFIG_NOR=y
OpenPOWER on IntegriCloud