[meta-xilinx] [PATCH 1/7] linux/config: Rework kmeta based on kernel-cache merge
Nathan Rossi
nathan at nathanrossi.com
Thu Oct 5 05:20:51 PDT 2017
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 at nathanrossi.com>
---
.../xilinx-common/arch/microblaze/microblaze.cfg | 6 --
.../xilinx-common/arch/microblaze/microblaze.scc | 6 --
.../xilinx-common/bsp/xilinx/board-common.cfg | 75 ----------------------
.../xilinx-common/bsp/xilinx/board-common.scc | 7 --
.../config/xilinx-common/bsp/xilinx/common.cfg | 7 --
.../config/xilinx-common/bsp/xilinx/common.scc | 13 ----
.../xilinx-pcie.cfg => drivers-softip-pcie.cfg} | 0
.../xilinx-pcie.scc => drivers-softip-pcie.scc} | 2 +-
.../soc/{drivers/zynqmp.cfg => drivers-zynqmp.cfg} | 0
.../bsp/xilinx/soc/drivers/xilinx.cfg | 45 -------------
.../bsp/xilinx/soc/drivers/xilinx.scc | 7 --
.../xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg | 75 ----------------------
.../xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc | 7 --
.../bsp/xilinx/soc/drivers/zynqmp.scc | 7 --
.../xilinx-common/bsp/xilinx/soc/microblaze.cfg | 24 -------
.../xilinx-common/bsp/xilinx/soc/microblaze.scc | 6 --
.../config/xilinx-common/bsp/xilinx/soc/zynq7.cfg | 43 -------------
.../config/xilinx-common/bsp/xilinx/soc/zynq7.scc | 10 ---
.../config/xilinx-common/bsp/xilinx/soc/zynqmp.scc | 15 ++---
.../xilinx-common/bsp/xilinx/zynq-standard.scc | 14 ----
.../config/xilinx-common/bsp/xilinx/zynq-tiny.scc | 11 ----
.../xilinx-common/bsp/xilinx/zynqmp-standard.scc | 5 +-
.../xilinx-common/bsp/xilinx/zynqmp-tiny.scc | 2 -
.../xilinx-common/features/blk/dev-ram-32mb.cfg | 5 --
.../xilinx-common/features/blk/dev-ram-32mb.scc | 5 --
.../xilinx-common/features/debug/debug-dyndbg.cfg | 11 ----
.../xilinx-common/features/debug/debug-dyndbg.scc | 4 --
.../config/xilinx-common/features/debug/debug.cfg | 23 -------
.../config/xilinx-common/features/debug/debug.scc | 4 --
.../xilinx-common/features/hugetlb/hugepages.cfg | 3 -
.../xilinx-common/features/hugetlb/hugepages.scc | 4 --
.../config/xilinx-common/features/mtd/mtd.cfg | 14 ----
.../config/xilinx-common/features/mtd/mtd.scc | 5 --
.../config/xilinx-common/features/rtc/rtc.cfg | 4 --
.../config/xilinx-common/features/rtc/rtc.scc | 4 --
.../config/xilinx-common/features/xen/xen.cfg | 48 --------------
.../config/xilinx-common/features/xen/xen.scc | 4 --
.../xilinx-machine/bsp/ml605-qemu-microblazeel.cfg | 15 -----
.../xilinx-machine/bsp/ml605-qemu-microblazeel.scc | 4 --
.../bsp/s3adsp1800-qemu-microblazeeb.cfg | 15 -----
.../bsp/s3adsp1800-qemu-microblazeeb.scc | 4 --
41 files changed, 11 insertions(+), 552 deletions(-)
delete mode 100644 recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
rename recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/{drivers/xilinx-pcie.cfg => drivers-softip-pcie.cfg} (100%)
rename recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/{drivers/xilinx-pcie.scc => drivers-softip-pcie.scc} (70%)
rename recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/{drivers/zynqmp.cfg => drivers-zynqmp.cfg} (100%)
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-tiny.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/debug/debug.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/xen/xen.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
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 7e408b4fb6..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-CONFIG_MICROBLAZE=y
-
-# Important for performance and code size optimization
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-
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 2b3aba2c08..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/arch/microblaze/microblaze.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-if [ "$KARCH" = "microblaze" ]; then
- kconf hardware microblaze.cfg
- include cfg/timer/hz_100.scc
-fi
-
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 efd17c30e8..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-# Common Board Drivers
-
-# CONFIG_LEGACY_PTYS is not set
-
-# Ethernet PHYs
-CONFIG_PHYLIB=y
-CONFIG_AMD_PHY=y
-CONFIG_AT803X_PHY=y
-CONFIG_BCM7XXX_PHY=y
-CONFIG_BCM87XX_PHY=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_CICADA_PHY=y
-CONFIG_DAVICOM_PHY=y
-CONFIG_DP83867_PHY=y
-CONFIG_FIXED_PHY=y
-CONFIG_ICPLUS_PHY=y
-CONFIG_LSI_ET1011C_PHY=y
-CONFIG_LXT_PHY=y
-CONFIG_MARVELL_PHY=y
-CONFIG_MICREL_PHY=y
-CONFIG_NATIONAL_PHY=y
-CONFIG_QSEMI_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_SMSC_PHY=y
-CONFIG_VITESSE_PHY=y
-
-# I2C
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_MUX_PCA954x=y
-CONFIG_I2C_MUX_PCA9541=y
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_PCA953X_IRQ=y
-
-# EEPROM
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-
-# MTD
-CONFIG_MTD=y
-CONFIG_MTD_SPI_NOR=y
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-
-# Hardware monitors
-CONFIG_HWMON=y
-CONFIG_PMBUS=y
-CONFIG_SENSORS_PMBUS=y
-# Power
-CONFIG_SENSORS_UCD9000=y
-CONFIG_SENSORS_UCD9200=y
-CONFIG_SENSORS_INA2XX=y
-CONFIG_SENSORS_MAX20751=y
-
-# Regulators
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-
-# Reset/power-off GPIO
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_LTC2952=y
-
-# RTC drivers
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_HCTOSYS is not set
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_PCF8563=y
-
-# SI570 I2C Device
-CONFIG_COMMON_CLK_SI570=y
-
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 d79417d69a..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KFEATURE_DESCRIPTION "Xilinx Common Board Drivers"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware board-common.cfg
-
-include features/leds/leds.scc
-
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 86914fbff3..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Debug
-CONFIG_PRINTK_TIME=y
-
-# Disable /dev/kmem
-# CONFIG_DEVKMEM is not set
-
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 a17fd2cf7b..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc
+++ /dev/null
@@ -1,13 +0,0 @@
-define KFEATURE_DESCRIPTION "Xilinx Common BSP fragments"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware common.cfg
-
-include features/scsi/scsi.scc
-include features/scsi/disk.scc
-
-include features/mtd/mtd.scc
-include features/uio/uio.scc
-
-include cfg/fs/debugfs.scc
-
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
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.cfg
rename to 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
similarity index 70%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.scc
rename to recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.scc
index 8438b3358e..e60047ae18 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 @@
define KFEATURE_DESCRIPTION "Xilinx AXI PCIe Host Bridge"
define KFEATURE_COMPATIBILITY board
-kconfig hardware xilinx-pcie.cfg
+kconfig hardware drivers-softip-pcie.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
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.cfg
rename to 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 5098d9b2b9..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.cfg
+++ /dev/null
@@ -1,45 +0,0 @@
-# Serial/UART
-CONFIG_TTY=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_UARTLITE=y
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
-
-# DMA
-CONFIG_DMADEVICES=y
-CONFIG_XILINX_DMA=y
-CONFIG_XILINX_VDMA=y
-
-# Watchdog
-CONFIG_WATCHDOG=y
-CONFIG_XILINX_WATCHDOG=y
-
-# Ethernet
-CONFIG_NET_VENDOR_XILINX=y
-CONFIG_XILINX_EMACLITE=y
-CONFIG_XILINX_AXI_EMAC=y
-
-# GPIO
-CONFIG_GPIOLIB=y
-CONFIG_OF_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_XILINX=y
-
-# I2C
-CONFIG_I2C=y
-CONFIG_I2C_XILINX=y
-
-# SPI
-CONFIG_SPI=y
-CONFIG_SPI_XILINX=y
-
-# Xilinx XADC
-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
deleted file mode 100644
index 78de5a169b..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/xilinx.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index daffe670b3..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-
-# UART
-CONFIG_TTY=y
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_XILINX_PS_UART=y
-CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
-
-# SRAM
-CONFIG_SRAM=y
-
-# EDAC
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=y
-CONFIG_EDAC_SYNOPSYS=y
-
-# DMA
-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
-
-# Watchdog
-CONFIG_WATCHDOG=y
-CONFIG_CADENCE_WATCHDOG=y
-
-# Ethernet
-CONFIG_NET_CADENCE=y
-CONFIG_MACB=y
-
-# GPIO
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_ZYNQ=y
-
-# I2C
-CONFIG_I2C=y
-CONFIG_I2C_CADENCE=y
-
-# SPI
-CONFIG_SPI=y
-CONFIG_SPI_CADENCE=y
-
-# CAN
-CONFIG_CAN=y
-CONFIG_CAN_DEV=y
-CONFIG_CAN_XILINXCAN=y
-
-# MMC/SD
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_SDHCI=y
-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
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_ULPI=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_OTG=y
-CONFIG_USB_GADGET=y
-
-# FPGA
-CONFIG_FPGA=y
-CONFIG_FPGA_MGR_ZYNQ_FPGA=y
-CONFIG_FPGA_REGION=y
-CONFIG_FPGA_BRIDGE=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
deleted file mode 100644
index e6ef2a0ee6..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynq7.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-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.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
deleted file mode 100644
index 8d9f936d7e..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers/zynqmp.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-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/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg
deleted file mode 100644
index 95a8701fde..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# Arch Feature Selections
-CONFIG_MMU=y
-
-# Default Arch Configuration
-CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
-CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
-CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
-CONFIG_XILINX_MICROBLAZE0_USE_DIV=0
-CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=0
-CONFIG_XILINX_MICROBLAZE0_USE_FPU=0
-
-# Memory
-CONFIG_HIGHMEM=y
-
-# Xilinx SYSACE (MicroBlaze only)
-CONFIG_XILINX_SYSACE=y
-
-# Xilinx HW-ICAP (MicroBlaze only)
-CONFIG_XILINX_HWICAP=y
-
-# Disable FTRACE, does not work with MicroBlaze
-# CONFIG_FTRACE is not set
-
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 e4dd77ae4f..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-include arch/microblaze/microblaze.scc
-
-kconf hardware microblaze.cfg
-include bsp/xilinx/common.scc
-include bsp/xilinx/soc/drivers/xilinx.scc
-
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 bfc74460fb..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# Arch Feature Selections
-CONFIG_MMU=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_ZYNQ=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_AEABI=y
-
-# CPU Erratas
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_ARM_ERRATA_754327=y
-CONFIG_ARM_ERRATA_764369=y
-CONFIG_ARM_ERRATA_775420=y
-
-# SMP
-CONFIG_SMP=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-
-# Memory
-CONFIG_HIGHMEM=y
-
-# Thermal
-CONFIG_THERMAL=y
-CONFIG_THERMAL_OF=y
-CONFIG_CPU_THERMAL=y
-
-# CPU Frequency
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPU_IDLE=y
-CONFIG_ARM_ZYNQ_CPUIDLE=y
-
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 1cea7c3ab2..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7.scc
+++ /dev/null
@@ -1,10 +0,0 @@
-
-kconf hardware zynq7.cfg
-include bsp/xilinx/soc/drivers/xilinx.scc
-include bsp/xilinx/soc/drivers/zynq7.scc
-include bsp/xilinx/common.scc
-
-include cfg/timer/no_hz.scc
-include cfg/usb-mass-storage.scc
-include features/blk/dev-ram-32mb.scc
-
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 3c2238949a..8fcb8e6292 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 @@
-# include arch/arm64/arm64.scc
-include cfg/timer/hz_100.scc
-
-kconf hardware zynqmp.cfg
-include bsp/xilinx/soc/drivers/xilinx.scc
-include bsp/xilinx/soc/drivers/zynqmp.scc
-include bsp/xilinx/common.scc
+define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC"
+define KFEATURE_COMPATIBILITY board
+include features/net/net.scc
include cfg/timer/no_hz.scc
-include cfg/usb-mass-storage.scc
+
+kconf hardware zynqmp.cfg
+kconf hardware drivers-zynqmp.cfg
+include bsp/xilinx/soc/drivers-softip.scc
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 d0dedb1d99..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc
+++ /dev/null
@@ -1,14 +0,0 @@
-define KMACHINE zynq
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include bsp/xilinx/soc/zynq7.scc
-
-# Common board drivers
-include bsp/xilinx/board-common.scc
-
-# default policy for standard kernels
-include features/latencytop/latencytop.scc
-include 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 a0f67fc3ef..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-tiny.scc
+++ /dev/null
@@ -1,11 +0,0 @@
-define KMACHINE zynq
-define KTYPE tiny
-define KARCH arm
-
-include ktypes/tiny/tiny.scc
-
-include bsp/xilinx/soc/zynq7.scc
-
-# Common board drivers
-include bsp/xilinx/board-common.scc
-
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 bc4f6e8be3..1c9a4f3d8d 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
include ktypes/standard/standard.scc
include bsp/xilinx/soc/zynqmp.scc
-
-# Common board drivers
include bsp/xilinx/board-common.scc
+include features/input/input.scc
+include cfg/usb-mass-storage.scc
+
# default policy for standard kernels
#include features/latencytop/latencytop.scc
#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 f5c0136d4c..6cdfc72366 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
include ktypes/tiny/tiny.scc
include bsp/xilinx/soc/zynqmp.scc
-
-# Common board drivers
include bsp/xilinx/board-common.scc
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 aa2cc17505..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=4
-CONFIG_BLK_DEV_RAM_SIZE=32768
-
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 892083bf45..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/blk/dev-ram-32mb.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Increase size of /dev/ram Blocks"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware dev-ram-32mb.cfg
-
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 cd5b0f5a0d..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# This config fragment enables dynamic debug printk messages. Use this to debug
-# various modules/files in the kernel without needing to #define DEBUG.
-#
-# Can be enabled with bootargs. e.g report all driver debug messages, this is
-# very useful for debugging device probing during boot:
-#
-# debug dyndbg="file drivers/of/dd.c +pm"
-#
-
-CONFIG_DYNAMIC_DEBUG=y
-
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 de270d168e..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug-dyndbg.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable dynamic debug printk"
-define KFEATURE_COMPATIBILITY board
-
-kconfig 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 7b01ea0a0e..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
-# This config fragment is for verification and debug purposes
-
-CONFIG_DEBUG_INFO=y
-
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_LOCKDEP=y
-CONFIG_DEBUG_LOCKING_API_SELFTESTS=y
-# CONFIG_LOCK_TORTURE_TEST not test
-
-CONFIG_PROVE_RCU=y
-CONFIG_PROVE_RCU_REPEATEDLY=y
-CONFIG_SPARSE_RCU_POINTER=y
-# /proc/sys/kernel/rcutorture_runnable
-# CONFIG_RCU_TORTURE_TEST not set
-CONFIG_RCU_CPU_STALL_INFO=y
-
-# SYSRQ
-CONFIG_MAGIC_SYSRQ=y
-
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 2a09b4f24f..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/debug/debug.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Debugging Setup"
-define KFEATURE_COMPATIBILITY board
-
-kconfig 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 190c3bca98..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
-
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 395a1ca560..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/hugetlb/hugepages.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable Huge Pages support"
-define KFEATURE_COMPATIBILITY arch
-
-kconf 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 17b4ece415..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# MTD
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND=y
-
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 48925c6b78..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/mtd/mtd.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable MTD Support"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware mtd.cfg
-
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 d980c20186..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_SYSTOHC=y
-
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 cb1a0a3d47..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/rtc/rtc.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable RTC Class Support"
-define KFEATURE_COMPATIBILITY board
-
-kconfig 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 ee01563b98..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-###
-# linux 3.10
-CONFIG_HYPERVISOR_GUEST=y
-###
-
-CONFIG_PARAVIRT=y
-CONFIG_XEN=y
-CONFIG_XEN_DOM0=y
-CONFIG_XEN_PVHVM=y
-CONFIG_XEN_SAVE_RESTORE=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_HIBERNATE_CALLBACKS=y
-CONFIG_PCI_XEN=y
-CONFIG_XEN_PCIDEV_FRONTEND=y
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_WATCHDOG=y
-CONFIG_XEN_WDT=m
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
-CONFIG_FB_SYS_FOPS=y
-CONFIG_FB_DEFERRED_IO=y
-CONFIG_XEN_FBDEV_FRONTEND=y
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_XENBUS_FRONTEND=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_ACPI_PROCESSOR=m
-CONFIG_XEN_MCE_LOG=y
-CONFIG_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 b588e5df94..0000000000
--- a/recipes-kernel/linux/config/xilinx-common/features/xen/xen.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Xen Kernel Support"
-define KFEATURE_COMPATIBILITY arch
-
-kconf 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 771aec069c..0000000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex6"
-
-# CPU ISA Config
-CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
-CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
-CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
-CONFIG_XILINX_MICROBLAZE0_USE_DIV=1
-CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2
-CONFIG_XILINX_MICROBLAZE0_USE_FPU=1
-CONFIG_XILINX_MICROBLAZE0_HW_VER="8.50.a"
-
-# Memory Base Address
-CONFIG_KERNEL_BASE_ADDR=0x50000000
-
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 ae3c3104f8..0000000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Kernel Config for ml605-qemu-microblazeel specific setup"
-define KFEATURE_COMPATIBILITY board
-
-kconf 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 0f635c1652..0000000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-CONFIG_XILINX_MICROBLAZE0_FAMILY="spartan3"
-
-# CPU ISA Config
-CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1
-CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1
-CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1
-CONFIG_XILINX_MICROBLAZE0_USE_DIV=0
-CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1
-CONFIG_XILINX_MICROBLAZE0_USE_FPU=0
-CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d"
-
-# Memory Base Address
-CONFIG_KERNEL_BASE_ADDR=0x90000000
-
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 aef8109fea..0000000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Kernel Config for s3adsp1800-qemu-microblazeeb specific setup"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware s3adsp1800-qemu-microblazeeb.cfg
--
2.14.2
More information about the meta-xilinx
mailing list