Skip to contentSkip to conversation

am335x_evm: Add NOR to Kconfig

PATCH New Tom Rini 1 participant 4 messages Oct 27, 2014 – Nov 5, 2014

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 am335x_evm: Add NOR to Kconfig

Make enabling support for NOR (and describe where it's seen) be done via Kconfig.

---
 board/ti/am335x/Kconfig              |    7 +++++++
 configs/am335x_evm_nor_defconfig     |    3 ++-
 configs/am335x_evm_norboot_defconfig |    3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)
board/ti/am335x/Kconfig +7 -0
index d8958ef..0ba00bf 100644
@@ -25,4 +25,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
configs/am335x_evm_nor_defconfig +2 -1
index 41f31cc02..be90163 100644
@@ -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
configs/am335x_evm_norboot_defconfig +2 -1
index 7dbfa27..d2d3ba2 100644
@@ -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
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/2 am335x_evm: Add NOR to Kconfig

Quoted 4 lines · Tom Rini

Make enabling support for NOR (and describe where it's seen) be done via Kconfig.

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141105/777b0562/attachment.pgp>
author
#2 lore raw

PATCH 2/2 am335x_evm: Convert NOR_BOOT to Kconfig

In reply to Tom Rini
---
 board/ti/am335x/Kconfig              |    8 ++++++++
 configs/am335x_evm_norboot_defconfig |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
board/ti/am335x/Kconfig +8 -0
index 0ba00bf..883ff45 100644
@@ -32,4 +32,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
configs/am335x_evm_norboot_defconfig +1 -1
index d2d3ba2..47ff6cd 100644
@@ -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
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 2/2 am335x_evm: Convert NOR_BOOT to Kconfig

Quoted 1 line · Tom Rini

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141105/a3bce919/attachment.pgp>