diff options
| author | Peng Fan <van.freenix@gmail.com> | 2016-06-17 17:39:50 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-27 22:32:07 -0400 |
| commit | d14739ffe16092323f838b8d3f61796afe083810 (patch) | |
| tree | 86440bac2af2572951dcb9a95605714cf4f24db3 | |
| parent | 4a9a3292771e80a9be37af147f4efcd2fd99e8d7 (diff) | |
| download | blackbird-obmc-uboot-d14739ffe16092323f838b8d3f61796afe083810.tar.gz blackbird-obmc-uboot-d14739ffe16092323f838b8d3f61796afe083810.zip | |
Kconfig: make NOR_BOOT a common option
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>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | board/ti/am335x/Kconfig | 9 | ||||
| -rw-r--r-- | common/Kconfig | 13 |
2 files changed, 13 insertions, 9 deletions
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig index 11ef3caf39..97374bdc12 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 ada4ddbe2c..6f301e7cd9 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 2 |
