| Message ID | 1414440908-30260-2-git-send-email-trini@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Oct 27, 2014 at 04:15:08PM -0400, Tom Rini wrote:
> 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 0ba00bf..883ff45 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -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 diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index d2d3ba2..47ff6cd 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
Signed-off-by: Tom Rini <trini@ti.com> --- board/ti/am335x/Kconfig | 8 ++++++++ configs/am335x_evm_norboot_defconfig | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)