Browse Source

sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option

It's unfortunate that this needs to be present in both .config and spl/.config
since it makes it slightly hard to enable FEL mode for a regular defconfig. It
can be done with:
    echo CONFIG_SPL_FEL=y >> .config
    echo CONFIG_SPL_FEL=y >> spl/.config

Ideally only one of those would be needed.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Ian Campbell 10 years ago
parent
commit
4ce9941d2d
3 changed files with 9 additions and 2 deletions
  1. 5 0
      board/sunxi/Kconfig
  2. 2 1
      configs/Cubieboard2_FEL_defconfig
  3. 2 1
      configs/Cubietruck_FEL_defconfig

+ 5 - 0
board/sunxi/Kconfig

@@ -42,6 +42,11 @@ config SYS_BOARD
 config SYS_SOC
 config SYS_SOC
 	default "sunxi"
 	default "sunxi"
 
 
+config SPL_FEL
+	bool "SPL/FEL mode support"
+	depends on SPL
+	default n
+
 config FDTFILE
 config FDTFILE
 	string "Default fdtfile env setting for this board"
 	string "Default fdtfile env setting for this board"
 
 

+ 2 - 1
configs/Cubieboard2_FEL_defconfig

@@ -1,5 +1,6 @@
 CONFIG_SPL=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
++S:CONFIG_SPL_FEL=y
+CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_ARCH_SUNXI=y

+ 2 - 1
configs/Cubietruck_FEL_defconfig

@@ -1,5 +1,6 @@
 CONFIG_SPL=y
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
++S:CONFIG_SPL_FEL=y
+CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_ARCH_SUNXI=y