From d14739ffe16092323f838b8d3f61796afe083810 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Fri, 17 Jun 2016 17:39:50 +0800 Subject: [PATCH] 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 Cc: Simon Glass Cc: Heiko Schocher Cc: Joe Hershberger Cc: Christophe Ricard Cc: Bin Meng Cc: Francois Retief Cc: Tom Rini Reviewed-by: Simon Glass --- 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 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 -- 2.39.5