diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2016-10-22 19:03:39 +1000 |
---|---|---|
committer | Nathan Rossi <nathan@nathanrossi.com> | 2016-10-29 22:01:53 +1000 |
commit | 8a4881a4bb91a2f0b77ecd8450bcae922d2c0911 (patch) | |
tree | a0ebd2cfe5665c333dc3f812132cf6934be15eb0 | |
parent | 3844d05d0d96f55076a1bad53784c3da4e81ce39 (diff) | |
download | meta-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>
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 | |||
26 | CONFIG_MTD_CFI_AMDSTD=y | 26 | CONFIG_MTD_CFI_AMDSTD=y |
27 | 27 | ||
28 | # Hardware monitors | 28 | # Hardware monitors |
29 | CONFIG_HWMON=y | ||
29 | CONFIG_PMBUS=y | 30 | CONFIG_PMBUS=y |
30 | CONFIG_SENSORS_PMBUS=y | 31 | CONFIG_SENSORS_PMBUS=y |
31 | CONFIG_REGULATOR=y | 32 | 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 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 |
2 | CONFIG_TTY=y | ||
3 | CONFIG_SERIAL_8250=y | 3 | CONFIG_SERIAL_8250=y |
4 | CONFIG_SERIAL_8250_CONSOLE=y | 4 | CONFIG_SERIAL_8250_CONSOLE=y |
5 | CONFIG_SERIAL_UARTLITE=y | 5 | CONFIG_SERIAL_UARTLITE=y |
@@ -15,6 +15,7 @@ CONFIG_WATCHDOG=y | |||
15 | CONFIG_XILINX_WATCHDOG=y | 15 | CONFIG_XILINX_WATCHDOG=y |
16 | 16 | ||
17 | # Ethernet | 17 | # Ethernet |
18 | CONFIG_NET_VENDOR_XILINX=y | ||
18 | CONFIG_XILINX_EMACLITE=y | 19 | CONFIG_XILINX_EMACLITE=y |
19 | CONFIG_XILINX_AXI_EMAC=y | 20 | CONFIG_XILINX_AXI_EMAC=y |
20 | 21 | ||
@@ -37,6 +38,7 @@ CONFIG_IIO=y | |||
37 | CONFIG_XILINX_XADC=y | 38 | CONFIG_XILINX_XADC=y |
38 | 39 | ||
39 | # Xilinx AXI USB2 Device | 40 | # Xilinx AXI USB2 Device |
41 | CONFIG_USB_SUPPORT=y | ||
40 | CONFIG_USB_GADGET=y | 42 | CONFIG_USB_GADGET=y |
41 | CONFIG_USB_GADGET_XILINX=y | 43 | CONFIG_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 @@ | |||
1 | define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers" | 1 | define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers" |
2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
3 | 3 | ||
4 | include features/net/net.scc | ||
5 | |||
4 | kconfig hardware xilinx.cfg | 6 | kconfig 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 |
3 | CONFIG_TTY=y | ||
3 | CONFIG_SERIAL_XILINX_PS_UART=y | 4 | CONFIG_SERIAL_XILINX_PS_UART=y |
4 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | 5 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y |
5 | 6 | ||
@@ -11,6 +12,7 @@ CONFIG_DMADEVICES=y | |||
11 | CONFIG_PL330_DMA=y | 12 | CONFIG_PL330_DMA=y |
12 | 13 | ||
13 | # PL310 | 14 | # PL310 |
15 | CONFIG_CACHE_L2X0=y | ||
14 | CONFIG_PL310_ERRATA_588369=y | 16 | CONFIG_PL310_ERRATA_588369=y |
15 | CONFIG_PL310_ERRATA_727915=y | 17 | CONFIG_PL310_ERRATA_727915=y |
16 | CONFIG_PL310_ERRATA_769419=y | 18 | CONFIG_PL310_ERRATA_769419=y |
@@ -20,6 +22,7 @@ CONFIG_WATCHDOG=y | |||
20 | CONFIG_CADENCE_WATCHDOG=y | 22 | CONFIG_CADENCE_WATCHDOG=y |
21 | 23 | ||
22 | # Ethernet | 24 | # Ethernet |
25 | CONFIG_NET_CADENCE=y | ||
23 | CONFIG_MACB=y | 26 | CONFIG_MACB=y |
24 | 27 | ||
25 | # GPIO | 28 | # GPIO |
@@ -36,6 +39,7 @@ CONFIG_SPI_CADENCE=y | |||
36 | 39 | ||
37 | # CAN | 40 | # CAN |
38 | CONFIG_CAN=y | 41 | CONFIG_CAN=y |
42 | CONFIG_CAN_DEV=y | ||
39 | CONFIG_CAN_XILINXCAN=y | 43 | CONFIG_CAN_XILINXCAN=y |
40 | 44 | ||
41 | # MMC/SD | 45 | # MMC/SD |
@@ -45,6 +49,7 @@ CONFIG_MMC_SDHCI_PLTFM=y | |||
45 | CONFIG_MMC_SDHCI_OF_ARASAN=y | 49 | CONFIG_MMC_SDHCI_OF_ARASAN=y |
46 | 50 | ||
47 | # USB | 51 | # USB |
52 | CONFIG_USB_SUPPORT=y | ||
48 | CONFIG_USB=y | 53 | CONFIG_USB=y |
49 | CONFIG_USB_EHCI_HCD=y | 54 | CONFIG_USB_EHCI_HCD=y |
50 | CONFIG_USB_CHIPIDEA=y | 55 | 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 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 @@ | |||
1 | define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers" | 1 | define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers" |
2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
3 | 3 | ||
4 | include features/net/net.scc | ||
5 | |||
4 | kconfig hardware zynq7.cfg | 6 | kconfig 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 |
3 | CONFIG_TTY=y | ||
3 | CONFIG_SERIAL_XILINX_PS_UART=y | 4 | CONFIG_SERIAL_XILINX_PS_UART=y |
4 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | 5 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y |
5 | 6 | ||
@@ -12,6 +13,7 @@ CONFIG_RTC_CLASS=y | |||
12 | CONFIG_RTC_DRV_ZYNQMP=y | 13 | CONFIG_RTC_DRV_ZYNQMP=y |
13 | 14 | ||
14 | # Ethernet | 15 | # Ethernet |
16 | CONFIG_NET_CADENCE=y | ||
15 | CONFIG_MACB=y | 17 | CONFIG_MACB=y |
16 | 18 | ||
17 | # GPIO | 19 | # GPIO |
@@ -30,6 +32,7 @@ CONFIG_SPI_ZYNQMP_GQSPI=y | |||
30 | 32 | ||
31 | # CAN | 33 | # CAN |
32 | CONFIG_CAN=y | 34 | CONFIG_CAN=y |
35 | CONFIG_CAN_DEV=y | ||
33 | CONFIG_CAN_XILINXCAN=y | 36 | CONFIG_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 |
46 | CONFIG_USB=y | 49 | CONFIG_USB=y |
50 | CONFIG_USB_SUPPORT=y | ||
47 | CONFIG_USB_XHCI_HCD=y | 51 | CONFIG_USB_XHCI_HCD=y |
48 | CONFIG_USB_DWC3=y | 52 | CONFIG_USB_DWC3=y |
49 | CONFIG_USB_GADGET=y | 53 | 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 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 @@ | |||
1 | define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers" | 1 | define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers" |
2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
3 | 3 | ||
4 | include features/net/net.scc | ||
5 | |||
4 | kconfig hardware zynqmp.cfg | 6 | kconfig 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 |
3 | CONFIG_MMU=y | ||
4 | CONFIG_ARCH_MULTI_V7=y | ||
3 | CONFIG_ARCH_VEXPRESS=y | 5 | CONFIG_ARCH_VEXPRESS=y |
4 | CONFIG_ARCH_ZYNQ=y | 6 | CONFIG_ARCH_ZYNQ=y |
5 | CONFIG_VFP=y | 7 | CONFIG_VFP=y |
@@ -14,6 +16,7 @@ CONFIG_ARM_ERRATA_775420=y | |||
14 | 16 | ||
15 | # SMP | 17 | # SMP |
16 | CONFIG_SMP=y | 18 | CONFIG_SMP=y |
19 | CONFIG_ARM_CPU_TOPOLOGY=y | ||
17 | CONFIG_SCHED_MC=y | 20 | CONFIG_SCHED_MC=y |
18 | CONFIG_SCHED_SMT=y | 21 | CONFIG_SCHED_SMT=y |
19 | 22 | ||
@@ -22,6 +25,7 @@ CONFIG_HIGHMEM=y | |||
22 | 25 | ||
23 | # Thermal | 26 | # Thermal |
24 | CONFIG_THERMAL=y | 27 | CONFIG_THERMAL=y |
28 | CONFIG_THERMAL_OF=y | ||
25 | CONFIG_CPU_THERMAL=y | 29 | CONFIG_CPU_THERMAL=y |
26 | 30 | ||
27 | # CPU Frequency | 31 | # CPU Frequency |