Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d14739ffe16092323f838b8d3f61796afe083810

Authored by Peng Fan
Committed by Tom Rini
1 parent 4a9a329277
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 2 changed files with 13 additions and 9 deletions Side-by-side Diff

board/ti/am335x/Kconfig
Diff comments   View file @ d14739f
... ... @@ -29,15 +29,6 @@
29 29 In practice this is seen as a NOR flash module connected to the
30 30 "memory cape" for the BeagleBone family.
31 31  
32   -config NOR_BOOT
33   - bool "Support for booting from NOR flash"
34   - depends on NOR
35   - help
36   - Enabling this will make a U-Boot binary that is capable of being
37   - booted via NOR. In this case we will enable certain pinmux early
38   - as the ROM only partially sets up pinmux. We also default to using
39   - NOR for environment.
40   -
41 32 source "board/ti/common/Kconfig"
42 33  
43 34 endif
... ... @@ -97,6 +97,19 @@
97 97  
98 98 endmenu
99 99  
  100 +menu "Boot media"
  101 +
  102 +config NOR_BOOT
  103 + bool "Support for booting from NOR flash"
  104 + depends on NOR
  105 + help
  106 + Enabling this will make a U-Boot binary that is capable of being
  107 + booted via NOR. In this case we will enable certain pinmux early
  108 + as the ROM only partially sets up pinmux. We also default to using
  109 + NOR for environment.
  110 +
  111 +endmenu
  112 +
100 113 config BOOTDELAY
101 114 int "delay in seconds before automatically booting"
102 115 default 2