summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-09-29 22:41:33 +1000
committerNathan Rossi <nathan@nathanrossi.com>2017-10-18 18:00:09 +1000
commit15f9678bbdc0a529f0fdce0b969482c0b96f0c86 (patch)
treed105173ae0211c197bf37a178d1cad7c494040d6
parent691754a8a67f82b72d9ed059f3a6d08cde198e8f (diff)
downloadmeta-xilinx-15f9678bbdc0a529f0fdce0b969482c0b96f0c86.tar.gz
linux/config: Rework kmeta based on kernel-cache merge
A large portion of the kmeta in xilinx-common and xilinx-machine was upstreamed into the linux-yocto kernel-cache and is no longer needed in the meta-xilinx layer. This change removes any fragments that are in the yocto-kernel-cache, and reworks remaining configs for use with linux-yocto. Compatibly with linux-xlnx is dropped due to favouring defconfigs. This includes Zynq and MicroBlaze machine configs (excluding kc705 and Zybo Linux-BD BSP), board common bsp/ fragments and a number of feature fragments that are already available in the yocto kernel cache. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg6
-rw-r--r--recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc6
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg75
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc13
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.cfg)0
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.scc)2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-zynqmp.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg)0
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg45
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg75
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg24
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc6
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg43
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc10
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc15
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc14
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-tiny.scc11
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.cfg5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.cfg11
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.scc4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg23
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/debug/debug.scc4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg3
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg14
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg48
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/xen/xen.scc4
-rw-r--r--recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg15
-rw-r--r--recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc4
-rw-r--r--recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg15
-rw-r--r--recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc4
41 files changed, 11 insertions, 552 deletions
diff --git a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg
deleted file mode 100644
index 7e408b4f..00000000
--- a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
1
2CONFIG_MICROBLAZE=y
3
4# Important for performance and code size optimization
5CONFIG_CC_OPTIMIZE_FOR_SIZE=y
6
diff --git a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc
deleted file mode 100644
index 2b3aba2c..00000000
--- a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc
+++ /dev/null
@@ -1,6 +0,0 @@
1
2if [ "$KARCH" = "microblaze" ]; then
3 kconf hardware microblaze.cfg
4 include cfg/timer/hz_100.scc
5fi
6
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
deleted file mode 100644
index efd17c30..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
1# Common Board Drivers
2
3# CONFIG_LEGACY_PTYS is not set
4
5# Ethernet PHYs
6CONFIG_PHYLIB=y
7CONFIG_AMD_PHY=y
8CONFIG_AT803X_PHY=y
9CONFIG_BCM7XXX_PHY=y
10CONFIG_BCM87XX_PHY=y
11CONFIG_BROADCOM_PHY=y
12CONFIG_CICADA_PHY=y
13CONFIG_DAVICOM_PHY=y
14CONFIG_DP83867_PHY=y
15CONFIG_FIXED_PHY=y
16CONFIG_ICPLUS_PHY=y
17CONFIG_LSI_ET1011C_PHY=y
18CONFIG_LXT_PHY=y
19CONFIG_MARVELL_PHY=y
20CONFIG_MICREL_PHY=y
21CONFIG_NATIONAL_PHY=y
22CONFIG_QSEMI_PHY=y
23CONFIG_REALTEK_PHY=y
24CONFIG_SMSC_PHY=y
25CONFIG_VITESSE_PHY=y
26
27# I2C
28CONFIG_I2C=y
29CONFIG_I2C_CHARDEV=y
30CONFIG_I2C_MUX=y
31CONFIG_I2C_MUX_PCA954x=y
32CONFIG_I2C_MUX_PCA9541=y
33CONFIG_GPIO_PCA953X=y
34CONFIG_GPIO_PCA953X_IRQ=y
35
36# EEPROM
37CONFIG_EEPROM_AT24=y
38CONFIG_EEPROM_AT25=y
39
40# MTD
41CONFIG_MTD=y
42CONFIG_MTD_SPI_NOR=y
43# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
44CONFIG_MTD_M25P80=y
45CONFIG_MTD_CFI=y
46CONFIG_MTD_CFI_AMDSTD=y
47
48# Hardware monitors
49CONFIG_HWMON=y
50CONFIG_PMBUS=y
51CONFIG_SENSORS_PMBUS=y
52# Power
53CONFIG_SENSORS_UCD9000=y
54CONFIG_SENSORS_UCD9200=y
55CONFIG_SENSORS_INA2XX=y
56CONFIG_SENSORS_MAX20751=y
57
58# Regulators
59CONFIG_REGULATOR=y
60CONFIG_REGULATOR_GPIO=y
61CONFIG_REGULATOR_FIXED_VOLTAGE=y
62
63# Reset/power-off GPIO
64CONFIG_POWER_RESET=y
65CONFIG_POWER_RESET_LTC2952=y
66
67# RTC drivers
68CONFIG_RTC_CLASS=y
69# CONFIG_RTC_HCTOSYS is not set
70# CONFIG_RTC_SYSTOHC is not set
71CONFIG_RTC_DRV_PCF8563=y
72
73# SI570 I2C Device
74CONFIG_COMMON_CLK_SI570=y
75
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
deleted file mode 100644
index d79417d6..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
+++ /dev/null
@@ -1,7 +0,0 @@
1define KFEATURE_DESCRIPTION "Xilinx Common Board Drivers"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware board-common.cfg
5
6include features/leds/leds.scc
7
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg
deleted file mode 100644
index 86914fbf..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
1
2# Debug
3CONFIG_PRINTK_TIME=y
4
5# Disable /dev/kmem
6# CONFIG_DEVKMEM is not set
7
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
deleted file mode 100644
index a17fd2cf..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
+++ /dev/null
@@ -1,13 +0,0 @@
1define KFEATURE_DESCRIPTION "Xilinx Common BSP fragments"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware common.cfg
5
6include features/scsi/scsi.scc
7include features/scsi/disk.scc
8
9include features/mtd/mtd.scc
10include features/uio/uio.scc
11
12include cfg/fs/debugfs.scc
13
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.cfg
index df88fce7..df88fce7 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.cfg
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.scc
index 8438b335..e60047ae 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.scc
@@ -1,5 +1,5 @@
1define KFEATURE_DESCRIPTION "Xilinx AXI PCIe Host Bridge" 1define KFEATURE_DESCRIPTION "Xilinx AXI PCIe Host Bridge"
2define KFEATURE_COMPATIBILITY board 2define KFEATURE_COMPATIBILITY board
3 3
4kconfig hardware xilinx-pcie.cfg 4kconfig hardware drivers-softip-pcie.cfg
5 5
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 dc69a659..dc69a659 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
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
deleted file mode 100644
index 5098d9b2..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
+++ /dev/null
@@ -1,45 +0,0 @@
1# Serial/UART
2CONFIG_TTY=y
3CONFIG_SERIAL_8250=y
4CONFIG_SERIAL_8250_CONSOLE=y
5CONFIG_SERIAL_UARTLITE=y
6CONFIG_SERIAL_UARTLITE_CONSOLE=y
7CONFIG_SERIAL_OF_PLATFORM=y
8
9# DMA
10CONFIG_DMADEVICES=y
11CONFIG_XILINX_DMA=y
12CONFIG_XILINX_VDMA=y
13
14# Watchdog
15CONFIG_WATCHDOG=y
16CONFIG_XILINX_WATCHDOG=y
17
18# Ethernet
19CONFIG_NET_VENDOR_XILINX=y
20CONFIG_XILINX_EMACLITE=y
21CONFIG_XILINX_AXI_EMAC=y
22
23# GPIO
24CONFIG_GPIOLIB=y
25CONFIG_OF_GPIO=y
26CONFIG_GPIO_SYSFS=y
27CONFIG_GPIO_XILINX=y
28
29# I2C
30CONFIG_I2C=y
31CONFIG_I2C_XILINX=y
32
33# SPI
34CONFIG_SPI=y
35CONFIG_SPI_XILINX=y
36
37# Xilinx XADC
38CONFIG_IIO=y
39CONFIG_XILINX_XADC=y
40
41# Xilinx AXI USB2 Device
42CONFIG_USB_SUPPORT=y
43CONFIG_USB_GADGET=y
44CONFIG_USB_GADGET_XILINX=y
45
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
deleted file mode 100644
index 78de5a16..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
+++ /dev/null
@@ -1,7 +0,0 @@
1define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers"
2define KFEATURE_COMPATIBILITY board
3
4include features/net/net.scc
5
6kconfig hardware xilinx.cfg
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
deleted file mode 100644
index daffe670..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
1
2# UART
3CONFIG_TTY=y
4CONFIG_SERIAL_EARLYCON=y
5CONFIG_SERIAL_XILINX_PS_UART=y
6CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
7
8# SRAM
9CONFIG_SRAM=y
10
11# EDAC
12CONFIG_EDAC=y
13CONFIG_EDAC_MM_EDAC=y
14CONFIG_EDAC_SYNOPSYS=y
15
16# DMA
17CONFIG_DMADEVICES=y
18CONFIG_PL330_DMA=y
19
20# PL310
21CONFIG_CACHE_L2X0=y
22CONFIG_PL310_ERRATA_588369=y
23CONFIG_PL310_ERRATA_727915=y
24CONFIG_PL310_ERRATA_769419=y
25
26# Watchdog
27CONFIG_WATCHDOG=y
28CONFIG_CADENCE_WATCHDOG=y
29
30# Ethernet
31CONFIG_NET_CADENCE=y
32CONFIG_MACB=y
33
34# GPIO
35CONFIG_GPIO_SYSFS=y
36CONFIG_GPIO_ZYNQ=y
37
38# I2C
39CONFIG_I2C=y
40CONFIG_I2C_CADENCE=y
41
42# SPI
43CONFIG_SPI=y
44CONFIG_SPI_CADENCE=y
45
46# CAN
47CONFIG_CAN=y
48CONFIG_CAN_DEV=y
49CONFIG_CAN_XILINXCAN=y
50
51# MMC/SD
52CONFIG_MMC=y
53CONFIG_MMC_BLOCK=y
54CONFIG_MMC_SDHCI=y
55CONFIG_MMC_SDHCI_PLTFM=y
56CONFIG_MMC_SDHCI_OF_ARASAN=y
57
58# USB
59CONFIG_USB_SUPPORT=y
60CONFIG_USB=y
61CONFIG_USB_EHCI_HCD=y
62CONFIG_USB_CHIPIDEA=y
63CONFIG_USB_CHIPIDEA_UDC=y
64CONFIG_USB_CHIPIDEA_HOST=y
65CONFIG_USB_ULPI=y
66CONFIG_NOP_USB_XCEIV=y
67CONFIG_USB_OTG=y
68CONFIG_USB_GADGET=y
69
70# FPGA
71CONFIG_FPGA=y
72CONFIG_FPGA_MGR_ZYNQ_FPGA=y
73CONFIG_FPGA_REGION=y
74CONFIG_FPGA_BRIDGE=y
75
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
deleted file mode 100644
index e6ef2a0e..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
+++ /dev/null
@@ -1,7 +0,0 @@
1define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers"
2define KFEATURE_COMPATIBILITY board
3
4include features/net/net.scc
5
6kconfig hardware zynq7.cfg
7
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
deleted file mode 100644
index 8d9f936d..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
+++ /dev/null
@@ -1,7 +0,0 @@
1define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers"
2define KFEATURE_COMPATIBILITY board
3
4include features/net/net.scc
5
6kconfig hardware zynqmp.cfg
7
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg
deleted file mode 100644
index 95a8701f..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
1
2# Arch Feature Selections
3CONFIG_MMU=y
4
5# Default Arch Configuration
6CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
7CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
8CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
9CONFIG_XILINX_MICROBLAZE0_USE_DIV=0
10CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=0
11CONFIG_XILINX_MICROBLAZE0_USE_FPU=0
12
13# Memory
14CONFIG_HIGHMEM=y
15
16# Xilinx SYSACE (MicroBlaze only)
17CONFIG_XILINX_SYSACE=y
18
19# Xilinx HW-ICAP (MicroBlaze only)
20CONFIG_XILINX_HWICAP=y
21
22# Disable FTRACE, does not work with MicroBlaze
23# CONFIG_FTRACE is not set
24
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
deleted file mode 100644
index e4dd77ae..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
+++ /dev/null
@@ -1,6 +0,0 @@
1include arch/microblaze/microblaze.scc
2
3kconf hardware microblaze.cfg
4include bsp/xilinx/common.scc
5include bsp/xilinx/soc/drivers/xilinx.scc
6
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
deleted file mode 100644
index bfc74460..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
1
2# Arch Feature Selections
3CONFIG_MMU=y
4CONFIG_ARCH_MULTI_V7=y
5CONFIG_ARCH_VEXPRESS=y
6CONFIG_ARCH_ZYNQ=y
7CONFIG_VFP=y
8CONFIG_NEON=y
9CONFIG_AEABI=y
10
11# CPU Erratas
12CONFIG_ARM_ERRATA_754322=y
13CONFIG_ARM_ERRATA_754327=y
14CONFIG_ARM_ERRATA_764369=y
15CONFIG_ARM_ERRATA_775420=y
16
17# SMP
18CONFIG_SMP=y
19CONFIG_ARM_CPU_TOPOLOGY=y
20CONFIG_SCHED_MC=y
21CONFIG_SCHED_SMT=y
22
23# Memory
24CONFIG_HIGHMEM=y
25
26# Thermal
27CONFIG_THERMAL=y
28CONFIG_THERMAL_OF=y
29CONFIG_CPU_THERMAL=y
30
31# CPU Frequency
32CONFIG_CPU_FREQ=y
33CONFIG_CPU_FREQ_STAT=y
34CONFIG_CPU_FREQ_STAT_DETAILS=y
35CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
36CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
37CONFIG_CPU_FREQ_GOV_POWERSAVE=y
38CONFIG_CPU_FREQ_GOV_ONDEMAND=y
39CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
40CONFIG_CPUFREQ_DT=y
41CONFIG_CPU_IDLE=y
42CONFIG_ARM_ZYNQ_CPUIDLE=y
43
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc
deleted file mode 100644
index 1cea7c3a..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc
+++ /dev/null
@@ -1,10 +0,0 @@
1
2kconf hardware zynq7.cfg
3include bsp/xilinx/soc/drivers/xilinx.scc
4include bsp/xilinx/soc/drivers/zynq7.scc
5include bsp/xilinx/common.scc
6
7include cfg/timer/no_hz.scc
8include cfg/usb-mass-storage.scc
9include features/blk/dev-ram-32mb.scc
10
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc
index 3c223894..8fcb8e62 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc
@@ -1,11 +1,10 @@
1# include arch/arm64/arm64.scc 1define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC"
2include cfg/timer/hz_100.scc 2define KFEATURE_COMPATIBILITY board
3
4kconf hardware zynqmp.cfg
5include bsp/xilinx/soc/drivers/xilinx.scc
6include bsp/xilinx/soc/drivers/zynqmp.scc
7include bsp/xilinx/common.scc
8 3
4include features/net/net.scc
9include cfg/timer/no_hz.scc 5include cfg/timer/no_hz.scc
10include cfg/usb-mass-storage.scc 6
7kconf hardware zynqmp.cfg
8kconf hardware drivers-zynqmp.cfg
9include bsp/xilinx/soc/drivers-softip.scc
11 10
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
deleted file mode 100644
index d0dedb1d..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
+++ /dev/null
@@ -1,14 +0,0 @@
1define KMACHINE zynq
2define KTYPE standard
3define KARCH arm
4
5include ktypes/standard/standard.scc
6
7include bsp/xilinx/soc/zynq7.scc
8
9# Common board drivers
10include bsp/xilinx/board-common.scc
11
12# default policy for standard kernels
13include features/latencytop/latencytop.scc
14include features/profiling/profiling.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-tiny.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-tiny.scc
deleted file mode 100644
index a0f67fc3..00000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-tiny.scc
+++ /dev/null
@@ -1,11 +0,0 @@
1define KMACHINE zynq
2define KTYPE tiny
3define KARCH arm
4
5include ktypes/tiny/tiny.scc
6
7include bsp/xilinx/soc/zynq7.scc
8
9# Common board drivers
10include bsp/xilinx/board-common.scc
11
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc
index bc4f6e8b..1c9a4f3d 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc
@@ -5,10 +5,11 @@ define KARCH arm64
5include ktypes/standard/standard.scc 5include ktypes/standard/standard.scc
6 6
7include bsp/xilinx/soc/zynqmp.scc 7include bsp/xilinx/soc/zynqmp.scc
8
9# Common board drivers
10include bsp/xilinx/board-common.scc 8include bsp/xilinx/board-common.scc
11 9
10include features/input/input.scc
11include cfg/usb-mass-storage.scc
12
12# default policy for standard kernels 13# default policy for standard kernels
13#include features/latencytop/latencytop.scc 14#include features/latencytop/latencytop.scc
14#include features/profiling/profiling.scc 15#include features/profiling/profiling.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc
index f5c0136d..6cdfc723 100644
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc
+++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc
@@ -5,7 +5,5 @@ define KARCH arm64
5include ktypes/tiny/tiny.scc 5include ktypes/tiny/tiny.scc
6 6
7include bsp/xilinx/soc/zynqmp.scc 7include bsp/xilinx/soc/zynqmp.scc
8
9# Common board drivers
10include bsp/xilinx/board-common.scc 8include bsp/xilinx/board-common.scc
11 9
diff --git a/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.cfg b/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.cfg
deleted file mode 100644
index aa2cc175..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
1
2CONFIG_BLK_DEV_RAM=y
3CONFIG_BLK_DEV_RAM_COUNT=4
4CONFIG_BLK_DEV_RAM_SIZE=32768
5
diff --git a/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.scc b/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.scc
deleted file mode 100644
index 892083bf..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.scc
+++ /dev/null
@@ -1,5 +0,0 @@
1define KFEATURE_DESCRIPTION "Increase size of /dev/ram Blocks"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware dev-ram-32mb.cfg
5
diff --git a/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.cfg b/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.cfg
deleted file mode 100644
index cd5b0f5a..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
1# This config fragment enables dynamic debug printk messages. Use this to debug
2# various modules/files in the kernel without needing to #define DEBUG.
3#
4# Can be enabled with bootargs. e.g report all driver debug messages, this is
5# very useful for debugging device probing during boot:
6#
7# debug dyndbg="file drivers/of/dd.c +pm"
8#
9
10CONFIG_DYNAMIC_DEBUG=y
11
diff --git a/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.scc b/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.scc
deleted file mode 100644
index de270d16..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Enable dynamic debug printk"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware debug-dyndbg.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg b/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
deleted file mode 100644
index 7b01ea0a..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
1# This config fragment is for verification and debug purposes
2
3CONFIG_DEBUG_INFO=y
4
5CONFIG_DEBUG_SPINLOCK=y
6CONFIG_DEBUG_RT_MUTEXES=y
7CONFIG_DEBUG_MUTEXES=y
8CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
9CONFIG_PROVE_LOCKING=y
10CONFIG_DEBUG_LOCKDEP=y
11CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
12# CONFIG_LOCK_TORTURE_TEST not test
13
14CONFIG_PROVE_RCU=y
15CONFIG_PROVE_RCU_REPEATEDLY=y
16CONFIG_SPARSE_RCU_POINTER=y
17# /proc/sys/kernel/rcutorture_runnable
18# CONFIG_RCU_TORTURE_TEST not set
19CONFIG_RCU_CPU_STALL_INFO=y
20
21# SYSRQ
22CONFIG_MAGIC_SYSRQ=y
23
diff --git a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.scc b/recipes-kernel/linux/config/xilinx-common/features/debug/debug.scc
deleted file mode 100644
index 2a09b4f2..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Debugging Setup"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware debug.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg b/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg
deleted file mode 100644
index 190c3bca..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
1CONFIG_TRANSPARENT_HUGEPAGE=y
2CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
3
diff --git a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc b/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc
deleted file mode 100644
index 395a1ca5..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Enable Huge Pages support"
2define KFEATURE_COMPATIBILITY arch
3
4kconf non-hardware hugepages.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg b/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg
deleted file mode 100644
index 17b4ece4..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
1
2# MTD
3CONFIG_MTD=y
4CONFIG_MTD_CMDLINE_PARTS=y
5CONFIG_MTD_BLOCK=y
6CONFIG_MTD_CFI=y
7CONFIG_MTD_CFI_AMDSTD=y
8CONFIG_MTD_CFI_INTELEXT=y
9CONFIG_MTD_CFI_STAA=y
10CONFIG_MTD_PHYSMAP=y
11CONFIG_MTD_PHYSMAP_OF=y
12CONFIG_MTD_M25P80=y
13CONFIG_MTD_NAND=y
14
diff --git a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc b/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc
deleted file mode 100644
index 48925c6b..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc
+++ /dev/null
@@ -1,5 +0,0 @@
1define KFEATURE_DESCRIPTION "Enable MTD Support"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware mtd.cfg
5
diff --git a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg b/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg
deleted file mode 100644
index d980c201..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
1
2CONFIG_RTC_HCTOSYS=y
3CONFIG_RTC_SYSTOHC=y
4
diff --git a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc b/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc
deleted file mode 100644
index cb1a0a3d..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Enable RTC Class Support"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware rtc.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg b/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg
deleted file mode 100644
index ee01563b..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
1###
2# linux 3.10
3CONFIG_HYPERVISOR_GUEST=y
4###
5
6CONFIG_PARAVIRT=y
7CONFIG_XEN=y
8CONFIG_XEN_DOM0=y
9CONFIG_XEN_PVHVM=y
10CONFIG_XEN_SAVE_RESTORE=y
11CONFIG_PARAVIRT_CLOCK=y
12CONFIG_HIBERNATE_CALLBACKS=y
13CONFIG_PCI_XEN=y
14CONFIG_XEN_PCIDEV_FRONTEND=y
15CONFIG_SYS_HYPERVISOR=y
16CONFIG_XEN_BLKDEV_FRONTEND=y
17CONFIG_XEN_BLKDEV_BACKEND=m
18CONFIG_XEN_NETDEV_FRONTEND=y
19CONFIG_XEN_NETDEV_BACKEND=m
20CONFIG_INPUT_MISC=y
21CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
22CONFIG_HVC_IRQ=y
23CONFIG_HVC_XEN=y
24CONFIG_HVC_XEN_FRONTEND=y
25CONFIG_WATCHDOG=y
26CONFIG_XEN_WDT=m
27CONFIG_FB_SYS_FILLRECT=y
28CONFIG_FB_SYS_COPYAREA=y
29CONFIG_FB_SYS_IMAGEBLIT=y
30CONFIG_FB_SYS_FOPS=y
31CONFIG_FB_DEFERRED_IO=y
32CONFIG_XEN_FBDEV_FRONTEND=y
33CONFIG_XEN_BALLOON=y
34CONFIG_XEN_SCRUB_PAGES=y
35CONFIG_XEN_DEV_EVTCHN=y
36CONFIG_XEN_BACKEND=y
37CONFIG_XENFS=y
38CONFIG_XEN_COMPAT_XENFS=y
39CONFIG_XEN_SYS_HYPERVISOR=y
40CONFIG_XEN_XENBUS_FRONTEND=y
41CONFIG_XEN_GNTDEV=m
42CONFIG_XEN_GRANT_DEV_ALLOC=m
43CONFIG_SWIOTLB_XEN=y
44CONFIG_XEN_PCIDEV_BACKEND=m
45CONFIG_XEN_PRIVCMD=y
46CONFIG_XEN_ACPI_PROCESSOR=m
47CONFIG_XEN_MCE_LOG=y
48CONFIG_XEN_HAVE_PVMMU=y
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.scc b/recipes-kernel/linux/config/xilinx-common/features/xen/xen.scc
deleted file mode 100644
index b588e5df..00000000
--- a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Xen Kernel Support"
2define KFEATURE_COMPATIBILITY arch
3
4kconf non-hardware xen.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg
deleted file mode 100644
index 771aec06..00000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
1
2CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex6"
3
4# CPU ISA Config
5CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
6CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
7CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
8CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
9CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
10CONFIG_XILINX_MICROBLAZE0_USE_FPU=1
11CONFIG_XILINX_MICROBLAZE0_HW_VER="8.50.a"
12
13# Memory Base Address
14CONFIG_KERNEL_BASE_ADDR=0x50000000
15
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
deleted file mode 100644
index ae3c3104..00000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Kernel Config for ml605-qemu-microblazeel specific setup"
2define KFEATURE_COMPATIBILITY board
3
4kconf hardware ml605-qemu-microblazeel.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg
deleted file mode 100644
index 0f635c16..00000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
1
2CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3"
3
4# CPU ISA Config
5CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
6CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
7CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
8CONFIG_XILINX_MICROBLAZE0_USE_DIV=0
9CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
10CONFIG_XILINX_MICROBLAZE0_USE_FPU=0
11CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d"
12
13# Memory Base Address
14CONFIG_KERNEL_BASE_ADDR=0x90000000
15
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
deleted file mode 100644
index aef8109f..00000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
+++ /dev/null
@@ -1,4 +0,0 @@
1define KFEATURE_DESCRIPTION "Kernel Config for s3adsp1800-qemu-microblazeeb specific setup"
2define KFEATURE_COMPATIBILITY board
3
4kconf hardware s3adsp1800-qemu-microblazeeb.cfg