summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2016-10-22 19:03:39 +1000
committerNathan Rossi <nathan@nathanrossi.com>2016-10-29 22:01:53 +1000
commit8a4881a4bb91a2f0b77ecd8450bcae922d2c0911 (patch)
treea0ebd2cfe5665c333dc3f812132cf6934be15eb0
parent3844d05d0d96f55076a1bad53784c3da4e81ce39 (diff)
downloadmeta-xilinx-8a4881a4bb91a2f0b77ecd8450bcae922d2c0911.tar.gz
linux/config: Add specific dependencies that are defaulted to yes
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@nathanrossi.com>
-rw-r--r--recipes-kernel/linux/config/xilinx-base/features/net/net.scc1
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg1
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg4
9 files changed, 24 insertions, 1 deletions
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 00000000..8b137891
--- /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 53ba3e36..5adfca85 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
26CONFIG_MTD_CFI_AMDSTD=y 26CONFIG_MTD_CFI_AMDSTD=y
27 27
28# Hardware monitors 28# Hardware monitors
29CONFIG_HWMON=y
29CONFIG_PMBUS=y 30CONFIG_PMBUS=y
30CONFIG_SENSORS_PMBUS=y 31CONFIG_SENSORS_PMBUS=y
31CONFIG_REGULATOR=y 32CONFIG_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 54ba4b73..3d03f180 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 @@
1
2# Serial/UART 1# Serial/UART
2CONFIG_TTY=y
3CONFIG_SERIAL_8250=y 3CONFIG_SERIAL_8250=y
4CONFIG_SERIAL_8250_CONSOLE=y 4CONFIG_SERIAL_8250_CONSOLE=y
5CONFIG_SERIAL_UARTLITE=y 5CONFIG_SERIAL_UARTLITE=y
@@ -15,6 +15,7 @@ CONFIG_WATCHDOG=y
15CONFIG_XILINX_WATCHDOG=y 15CONFIG_XILINX_WATCHDOG=y
16 16
17# Ethernet 17# Ethernet
18CONFIG_NET_VENDOR_XILINX=y
18CONFIG_XILINX_EMACLITE=y 19CONFIG_XILINX_EMACLITE=y
19CONFIG_XILINX_AXI_EMAC=y 20CONFIG_XILINX_AXI_EMAC=y
20 21
@@ -37,6 +38,7 @@ CONFIG_IIO=y
37CONFIG_XILINX_XADC=y 38CONFIG_XILINX_XADC=y
38 39
39# Xilinx AXI USB2 Device 40# Xilinx AXI USB2 Device
41CONFIG_USB_SUPPORT=y
40CONFIG_USB_GADGET=y 42CONFIG_USB_GADGET=y
41CONFIG_USB_GADGET_XILINX=y 43CONFIG_USB_GADGET_XILINX=y
42 44
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 7d5b75e9..78de5a16 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 @@
1define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers" 1define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers"
2define KFEATURE_COMPATIBILITY board 2define KFEATURE_COMPATIBILITY board
3 3
4include features/net/net.scc
5
4kconfig hardware xilinx.cfg 6kconfig hardware xilinx.cfg
5 7
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 6a554f81..6db1341e 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 @@
1 1
2# UART 2# UART
3CONFIG_TTY=y
3CONFIG_SERIAL_XILINX_PS_UART=y 4CONFIG_SERIAL_XILINX_PS_UART=y
4CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y 5CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
5 6
@@ -11,6 +12,7 @@ CONFIG_DMADEVICES=y
11CONFIG_PL330_DMA=y 12CONFIG_PL330_DMA=y
12 13
13# PL310 14# PL310
15CONFIG_CACHE_L2X0=y
14CONFIG_PL310_ERRATA_588369=y 16CONFIG_PL310_ERRATA_588369=y
15CONFIG_PL310_ERRATA_727915=y 17CONFIG_PL310_ERRATA_727915=y
16CONFIG_PL310_ERRATA_769419=y 18CONFIG_PL310_ERRATA_769419=y
@@ -20,6 +22,7 @@ CONFIG_WATCHDOG=y
20CONFIG_CADENCE_WATCHDOG=y 22CONFIG_CADENCE_WATCHDOG=y
21 23
22# Ethernet 24# Ethernet
25CONFIG_NET_CADENCE=y
23CONFIG_MACB=y 26CONFIG_MACB=y
24 27
25# GPIO 28# GPIO
@@ -36,6 +39,7 @@ CONFIG_SPI_CADENCE=y
36 39
37# CAN 40# CAN
38CONFIG_CAN=y 41CONFIG_CAN=y
42CONFIG_CAN_DEV=y
39CONFIG_CAN_XILINXCAN=y 43CONFIG_CAN_XILINXCAN=y
40 44
41# MMC/SD 45# MMC/SD
@@ -45,6 +49,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
45CONFIG_MMC_SDHCI_OF_ARASAN=y 49CONFIG_MMC_SDHCI_OF_ARASAN=y
46 50
47# USB 51# USB
52CONFIG_USB_SUPPORT=y
48CONFIG_USB=y 53CONFIG_USB=y
49CONFIG_USB_EHCI_HCD=y 54CONFIG_USB_EHCI_HCD=y
50CONFIG_USB_CHIPIDEA=y 55CONFIG_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 07c0daf6..e6ef2a0e 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 @@
1define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers" 1define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers"
2define KFEATURE_COMPATIBILITY board 2define KFEATURE_COMPATIBILITY board
3 3
4include features/net/net.scc
5
4kconfig hardware zynq7.cfg 6kconfig hardware zynq7.cfg
5 7
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 ae562fa7..0ed616c3 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 @@
1 1
2# Serial 2# Serial
3CONFIG_TTY=y
3CONFIG_SERIAL_XILINX_PS_UART=y 4CONFIG_SERIAL_XILINX_PS_UART=y
4CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y 5CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
5 6
@@ -12,6 +13,7 @@ CONFIG_RTC_CLASS=y
12CONFIG_RTC_DRV_ZYNQMP=y 13CONFIG_RTC_DRV_ZYNQMP=y
13 14
14# Ethernet 15# Ethernet
16CONFIG_NET_CADENCE=y
15CONFIG_MACB=y 17CONFIG_MACB=y
16 18
17# GPIO 19# GPIO
@@ -30,6 +32,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=y
30 32
31# CAN 33# CAN
32CONFIG_CAN=y 34CONFIG_CAN=y
35CONFIG_CAN_DEV=y
33CONFIG_CAN_XILINXCAN=y 36CONFIG_CAN_XILINXCAN=y
34 37
35# SATA 38# SATA
@@ -44,6 +47,7 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y
44 47
45# USB 48# USB
46CONFIG_USB=y 49CONFIG_USB=y
50CONFIG_USB_SUPPORT=y
47CONFIG_USB_XHCI_HCD=y 51CONFIG_USB_XHCI_HCD=y
48CONFIG_USB_DWC3=y 52CONFIG_USB_DWC3=y
49CONFIG_USB_GADGET=y 53CONFIG_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 70474078..8d9f936d 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 @@
1define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers" 1define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers"
2define KFEATURE_COMPATIBILITY board 2define KFEATURE_COMPATIBILITY board
3 3
4include features/net/net.scc
5
4kconfig hardware zynqmp.cfg 6kconfig hardware zynqmp.cfg
5 7
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 61a6c174..93584875 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 @@
1 1
2# Arch Feature Selections 2# Arch Feature Selections
3CONFIG_MMU=y
4CONFIG_ARCH_MULTI_V7=y
3CONFIG_ARCH_VEXPRESS=y 5CONFIG_ARCH_VEXPRESS=y
4CONFIG_ARCH_ZYNQ=y 6CONFIG_ARCH_ZYNQ=y
5CONFIG_VFP=y 7CONFIG_VFP=y
@@ -14,6 +16,7 @@ CONFIG_ARM_ERRATA_775420=y
14 16
15# SMP 17# SMP
16CONFIG_SMP=y 18CONFIG_SMP=y
19CONFIG_ARM_CPU_TOPOLOGY=y
17CONFIG_SCHED_MC=y 20CONFIG_SCHED_MC=y
18CONFIG_SCHED_SMT=y 21CONFIG_SCHED_SMT=y
19 22
@@ -22,6 +25,7 @@ CONFIG_HIGHMEM=y
22 25
23# Thermal 26# Thermal
24CONFIG_THERMAL=y 27CONFIG_THERMAL=y
28CONFIG_THERMAL_OF=y
25CONFIG_CPU_THERMAL=y 29CONFIG_CPU_THERMAL=y
26 30
27# CPU Frequency 31# CPU Frequency