From 1b8c4b2050f19c2d72691b57c0a505d4b7960640 Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Mon, 18 Nov 2019 19:48:08 +0100 Subject: ARM: zynqmp: defconfig: fix FIRMWARE_ZYNQMP_FPGA The config item has been renamed from FIRMWARE_ZYNQMP_PL to FIRMWARE_ZYNQMP_FPGA, but the defconfig has not been updated. Update it now. Signed-off-by: Michael Tretter Signed-off-by: Sascha Hauer --- arch/arm/configs/zynqmp_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/configs/zynqmp_defconfig') diff --git a/arch/arm/configs/zynqmp_defconfig b/arch/arm/configs/zynqmp_defconfig index 834212e30f..50b7556081 100644 --- a/arch/arm/configs/zynqmp_defconfig +++ b/arch/arm/configs/zynqmp_defconfig @@ -35,5 +35,5 @@ CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_DRIVER_SERIAL_CADENCE=y # CONFIG_SPI is not set -CONFIG_FIRMWARE_ZYNQMP_PL=y +CONFIG_FIRMWARE_ZYNQMP_FPGA=y CONFIG_DIGEST=y -- cgit v1.2.3 From 55246d3136115b18133e6df8e90e0c2056893888 Mon Sep 17 00:00:00 2001 From: Michael Tretter Date: Mon, 18 Nov 2019 19:48:09 +0100 Subject: ARM: zynqmp: defconfig: reenable DRIVER_NET_MACB Commit d952a0eeba37 ("Regenerate defconfig files") disabled the macb driver in the ZynqMP defconfig, because CONFIG_NET was not enabled in the defconfig. While not strictly required, you probably want to enable the macb driver on the ZynqMP. Enable CONFIG_NET and reenable CONFIG_DRIVER_NET_MACB. Signed-off-by: Michael Tretter Signed-off-by: Sascha Hauer --- arch/arm/configs/zynqmp_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/configs/zynqmp_defconfig') diff --git a/arch/arm/configs/zynqmp_defconfig b/arch/arm/configs/zynqmp_defconfig index 50b7556081..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_FPGA=y CONFIG_DIGEST=y -- cgit v1.2.3