[meta-xilinx] [PATCH 2/3] linux/config: Add specific dependencies that are defaulted to yes

Nathan Rossi nathan at nathanrossi.com
Sat Oct 29 06:52:12 PDT 2016 

Add specific config options that are normally defaulted to yes when the
kernel is configured with defaulting to yes. This allows for kernels
that default no to be correctly configured.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
 recipes-kernel/linux/config/xilinx-base/features/net/net.scc         | 1 +
 .../linux/config/xilinx-common/bsp/xilinx/board-common.cfg           | 1 +
 .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg     | 4 +++-
 .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc     | 2 ++
 .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg      | 5 +++++
 .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc      | 2 ++
 .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg     | 4 ++++
 .../linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc     | 2 ++
 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg   | 4 ++++
 9 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/config/xilinx-base/features/net/net.scc

diff --git a/recipes-kernel/linux/config/xilinx-base/features/net/net.scc b/recipes-kernel/linux/config/xilinx-base/features/net/net.scc
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-base/features/net/net.scc
@@ -0,0 +1 @@
+
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
index 53ba3e369f..5adfca8588 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
@@ -26,6 +26,7 @@ CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_AMDSTD=y
 
 # Hardware monitors
+CONFIG_HWMON=y
 CONFIG_PMBUS=y
 CONFIG_SENSORS_PMBUS=y
 CONFIG_REGULATOR=y
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
index 54ba4b734d..3d03f1806d 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
@@ -1,5 +1,5 @@
-
 # Serial/UART
+CONFIG_TTY=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_UARTLITE=y
@@ -15,6 +15,7 @@ CONFIG_WATCHDOG=y
 CONFIG_XILINX_WATCHDOG=y
 
 # Ethernet
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=y
 CONFIG_XILINX_AXI_EMAC=y
 
@@ -37,6 +38,7 @@ CONFIG_IIO=y
 CONFIG_XILINX_XADC=y
 
 # Xilinx AXI USB2 Device
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_XILINX=y
 
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
index 7d5b75e91e..78de5a169b 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
@@ -1,5 +1,7 @@
 define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers"
 define KFEATURE_COMPATIBILITY board
 
+include features/net/net.scc
+
 kconfig hardware xilinx.cfg
 
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
index 6a554f81cf..6db1341eca 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
@@ -1,5 +1,6 @@
 
 # UART
+CONFIG_TTY=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 
@@ -11,6 +12,7 @@ CONFIG_DMADEVICES=y
 CONFIG_PL330_DMA=y
 
 # PL310
+CONFIG_CACHE_L2X0=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_PL310_ERRATA_769419=y
@@ -20,6 +22,7 @@ CONFIG_WATCHDOG=y
 CONFIG_CADENCE_WATCHDOG=y
 
 # Ethernet
+CONFIG_NET_CADENCE=y
 CONFIG_MACB=y
 
 # GPIO
@@ -36,6 +39,7 @@ CONFIG_SPI_CADENCE=y
 
 # CAN
 CONFIG_CAN=y
+CONFIG_CAN_DEV=y
 CONFIG_CAN_XILINXCAN=y
 
 # MMC/SD
@@ -45,6 +49,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
 
 # USB
+CONFIG_USB_SUPPORT=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_CHIPIDEA=y
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
index 07c0daf65b..e6ef2a0ee6 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
@@ -1,5 +1,7 @@
 define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers"
 define KFEATURE_COMPATIBILITY board
 
+include features/net/net.scc
+
 kconfig hardware zynq7.cfg
 
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg
index ae562fa746..0ed616c3cd 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg
@@ -1,5 +1,6 @@
 
 # Serial
+CONFIG_TTY=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 
@@ -12,6 +13,7 @@ CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ZYNQMP=y
 
 # Ethernet
+CONFIG_NET_CADENCE=y
 CONFIG_MACB=y
 
 # GPIO
@@ -30,6 +32,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=y
 
 # CAN
 CONFIG_CAN=y
+CONFIG_CAN_DEV=y
 CONFIG_CAN_XILINXCAN=y
 
 # SATA
@@ -44,6 +47,7 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y
 
 # USB
 CONFIG_USB=y
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_GADGET=y
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
index 70474078fd..8d9f936d7e 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
@@ -1,5 +1,7 @@
 define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers"
 define KFEATURE_COMPATIBILITY board
 
+include features/net/net.scc
+
 kconfig hardware zynqmp.cfg
 
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
index 61a6c174f2..935848758c 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
@@ -1,5 +1,7 @@
 
 # Arch Feature Selections
+CONFIG_MMU=y
+CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_VFP=y
@@ -14,6 +16,7 @@ CONFIG_ARM_ERRATA_775420=y
 
 # SMP
 CONFIG_SMP=y
+CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 
@@ -22,6 +25,7 @@ CONFIG_HIGHMEM=y
 
 # Thermal
 CONFIG_THERMAL=y
+CONFIG_THERMAL_OF=y
 CONFIG_CPU_THERMAL=y
 
 # CPU Frequency
-- 
2.10.1

More information about the meta-xilinx mailing list