summaryrefslogtreecommitdiff
path: root/configs/Colombus_defconfig
diff options
context:
space:
mode:
authorMylène Josserand <mylene.josserand@free-electrons.com>2017-04-02 12:59:03 +0200
committerMaxime Ripard <maxime.ripard@free-electrons.com>2017-04-20 13:19:56 +0200
commit4d43d065db3262f9a9918ba72457bf36dfb8e0bb (patch)
treec55997bc1d2f2cf00095be592e10a50ce094062e /configs/Colombus_defconfig
parent27f31aac1579fe7506bde26d45d082cb18f9228a (diff)
downloadu-boot-4d43d065db3262f9a9918ba72457bf36dfb8e0bb.tar.gz
sunxi: Move SUNXI_GMAC to Kconfig
Move the SUNXI_GMAC config option to Kconfig, remove it from SYS_EXTRA_OPTIONS and rename it into SUN7I_GMAC. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'configs/Colombus_defconfig')
-rw-r--r--configs/Colombus_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index ac283a2070..1e7d4982c0 100644
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -16,7 +16,7 @@ CONFIG_VIDEO_LCD_PANEL_I2C_SCL="PA24"
CONFIG_VIDEO_LCD_PANEL_EDP_4_LANE_1620M_VIA_ANX9804=y
CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
+CONFIG_SYS_EXTRA_OPTIONS="RGMII"
CONFIG_SPL=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
@@ -25,5 +25,6 @@ CONFIG_SPL=y
# CONFIG_SPL_ISO_PARTITION is not set
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_ETH_DESIGNWARE=y
+CONFIG_SUN7I_GMAC=y
CONFIG_AXP_ALDO1_VOLT=3300
CONFIG_USB_EHCI_HCD=y