summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-27 16:15:08 -0400
committerTom Rini <trini@ti.com>2014-11-05 11:57:04 -0500
commitae2133693008a8b4e9f5ba68713e8252ec3aa240 (patch)
tree33b5453f55daae9eab85cc2c0936c2440fc813ac
parent40aca036c89153d04230f2ae617f57d5390bb603 (diff)
downloadblackbird-obmc-uboot-ae2133693008a8b4e9f5ba68713e8252ec3aa240.tar.gz
blackbird-obmc-uboot-ae2133693008a8b4e9f5ba68713e8252ec3aa240.zip
am335x_evm: Convert NOR_BOOT to Kconfig
Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--board/ti/am335x/Kconfig8
-rw-r--r--configs/am335x_evm_norboot_defconfig2
2 files changed, 9 insertions, 1 deletions
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index 1878e362a9..1ddbb2c67c 100644
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -29,4 +29,12 @@ config NOR
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.
endif
diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig
index d2d3ba2603..47ff6cdb16 100644
--- a/configs/am335x_evm_norboot_defconfig
+++ b/configs/am335x_evm_norboot_defconfig
@@ -1,5 +1,5 @@
-CONFIG_SYS_EXTRA_OPTIONS="NOR_BOOT"
CONFIG_CONS_INDEX=1
CONFIG_ARM=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_NOR=y
+CONFIG_NOR_BOOT=y
OpenPOWER on IntegriCloud