| Message ID | 1414440908-30260-1-git-send-email-trini@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Oct 27, 2014 at 04:15:07PM -0400, Tom Rini wrote: > Make enabling support for NOR (and describe where it's seen) be done via > Kconfig. > > Signed-off-by: Tom Rini <trini@ti.com> Applied to u-boot-ti/master, thanks!
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index d8958ef..0ba00bf 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -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 diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 41f31cc02..be90163 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 7dbfa27..d2d3ba2 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
Make enabling support for NOR (and describe where it's seen) be done via Kconfig. Signed-off-by: Tom Rini <trini@ti.com> --- board/ti/am335x/Kconfig | 7 +++++++ configs/am335x_evm_nor_defconfig | 3 ++- configs/am335x_evm_norboot_defconfig | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-)