
Not only am335x supports booting from NOR, i.MX6 SoCs also supports booting from NOR. Make NOR_BOOT a common option to let different SoCs share it.
Signed-off-by: Peng Fan peng.fan@nxp.com Cc: Simon Glass sjg@chromium.org Cc: Heiko Schocher hs@denx.de Cc: Joe Hershberger joe.hershberger@ni.com Cc: Christophe Ricard christophe-h.ricard@st.com Cc: Bin Meng bmeng.cn@gmail.com Cc: Francois Retief fgretief@spaceteq.co.za Cc: Tom Rini trini@konsulko.com ---
V2: New patch
board/ti/am335x/Kconfig | 9 --------- common/Kconfig | 13 +++++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index 11ef3ca..97374bd 100644 --- a/board/ti/am335x/Kconfig +++ b/board/ti/am335x/Kconfig @@ -29,15 +29,6 @@ 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. - source "board/ti/common/Kconfig"
endif diff --git a/common/Kconfig b/common/Kconfig index 4d17b10..04d092c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -97,6 +97,19 @@ config BOOTSTAGE_STASH_SIZE
endmenu
+menu "Boot media" + +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. + +endmenu + config BOOTDELAY int "delay in seconds before automatically booting" default 0