summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/zynqmp_defconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-12-10 05:41:46 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2019-12-10 05:41:46 +0100
commit86d711f394f0449f4420819d7df000fd5f2f769b (patch)
treea81c0473d4b230a7686eac1a8a5f668762f5108a /arch/arm/configs/zynqmp_defconfig
parent28e374e062aede65b6bb6f341376f196e5ac4fc7 (diff)
parent55246d3136115b18133e6df8e90e0c2056893888 (diff)
downloadbarebox-86d711f394f0449f4420819d7df000fd5f2f769b.tar.gz
barebox-86d711f394f0449f4420819d7df000fd5f2f769b.tar.xz
Merge branch 'for-next/zynq'
Diffstat (limited to 'arch/arm/configs/zynqmp_defconfig')
-rw-r--r--arch/arm/configs/zynqmp_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/zynqmp_defconfig b/arch/arm/configs/zynqmp_defconfig
index 834212e30f..762103c541 100644
--- a/arch/arm/configs/zynqmp_defconfig
+++ b/arch/arm/configs/zynqmp_defconfig
@@ -33,7 +33,9 @@ CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CLK=y
CONFIG_CMD_OFTREE=y
CONFIG_CMD_TIME=y
+CONFIG_NET=y
CONFIG_DRIVER_SERIAL_CADENCE=y
+CONFIG_DRIVER_NET_MACB=y
# CONFIG_SPI is not set
-CONFIG_FIRMWARE_ZYNQMP_PL=y
+CONFIG_FIRMWARE_ZYNQMP_FPGA=y
CONFIG_DIGEST=y