[meta-xilinx] [PATCH 2/7] linux/xilinx-kmeta: Collapse xilinx-* kmeta directories into one
Nathan Rossi
nathan at nathanrossi.com
Thu Oct 5 05:20:51 PDT 2017
Collapse the existing xilinx-* kmeta directories into a single kmeta
directory.
At the same time remove all linux-xlnx specific kmeta, it is no longer
required as linux-xlnx is using defconfigs as baseline kernel
configuration.
Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
---
.../config/xilinx-base/bsp/xilinx/disable-macb.cfg | 2 -
.../config/xilinx-base/bsp/xilinx/disable-macb.scc | 5 --
.../bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc | 5 --
.../bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc | 5 --
.../bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc | 5 --
.../bsp/xilinx/xilinx-drivers-linux-xlnx.scc | 5 --
.../linux/config/xilinx-base/cfg/fs/debugfs.cfg | 1 -
.../linux/config/xilinx-base/cfg/fs/debugfs.scc | 4 -
.../linux/config/xilinx-base/cfg/timer/hz_100.cfg | 5 --
.../linux/config/xilinx-base/cfg/timer/hz_100.scc | 4 -
.../linux/config/xilinx-base/cfg/timer/hz_1000.cfg | 5 --
.../linux/config/xilinx-base/cfg/timer/hz_1000.scc | 4 -
.../linux/config/xilinx-base/cfg/timer/hz_250.cfg | 5 --
.../linux/config/xilinx-base/cfg/timer/hz_250.scc | 4 -
.../linux/config/xilinx-base/cfg/timer/no_hz.cfg | 1 -
.../linux/config/xilinx-base/cfg/timer/no_hz.scc | 4 -
.../config/xilinx-base/cfg/usb-mass-storage.cfg | 5 --
.../config/xilinx-base/cfg/usb-mass-storage.scc | 4 -
.../xilinx-base/features/hugetlb/hugepages.cfg | 3 -
.../xilinx-base/features/hugetlb/hugepages.scc | 4 -
.../xilinx-base/features/hugetlb/hugetlb.cfg | 2 -
.../xilinx-base/features/hugetlb/hugetlb.scc | 4 -
.../xilinx-base/features/latencytop/latencytop.scc | 0
.../config/xilinx-base/features/leds/leds.cfg | 19 -----
.../config/xilinx-base/features/leds/leds.scc | 4 -
.../linux/config/xilinx-base/features/net/net.scc | 1 -
.../xilinx-base/features/profiling/profiling.scc | 0
.../config/xilinx-base/features/scsi/disk.cfg | 1 -
.../config/xilinx-base/features/scsi/disk.scc | 6 --
.../config/xilinx-base/features/scsi/scsi.cfg | 1 -
.../config/xilinx-base/features/scsi/scsi.scc | 4 -
.../xilinx-base/ktypes/standard/standard.cfg | 92 ----------------------
.../xilinx-base/ktypes/standard/standard.scc | 7 --
.../bsp/digilent/drm-digilent.cfg | 0
.../bsp/digilent/drm-digilent.scc | 0
.../bsp/kc705-microblazeel/kc705-microblazeel.cfg | 0
.../bsp/kc705-microblazeel/kc705-microblazeel.scc | 0
.../bsp/xilinx/microblaze-standard.scc | 0
.../bsp/xilinx/microblaze-tiny.scc | 0
.../bsp/xilinx/soc/drivers-softip-pcie.cfg | 0
.../bsp/xilinx/soc/drivers-softip-pcie.scc | 0
.../bsp/xilinx/soc/drivers-xlnx-softip.cfg} | 1 -
.../bsp/xilinx/soc/drivers-xlnx-zynq.cfg} | 1 -
.../bsp/xilinx/soc/drivers-xlnx-zynqmp.cfg} | 1 -
.../bsp/xilinx/soc/drivers-zynqmp.cfg | 0
.../bsp/xilinx/soc/zynqmp.cfg | 0
.../bsp/xilinx/soc/zynqmp.scc | 0
.../bsp/xilinx/zynqmp-standard.scc | 0
.../bsp/xilinx/zynqmp-tiny.scc | 0
.../bsp/zybo-linux-bd-zynq7/zybo-snd.cfg | 0
.../bsp/zybo-linux-bd-zynq7/zybo-snd.scc | 0
.../features/drm/drm-xilinx.cfg | 0
.../features/drm/drm-xilinx.scc | 0
.../features/gpio/kb-gpio.cfg | 0
.../features/gpio/kb-gpio.scc | 0
.../features/uio/uio.cfg | 0
.../features/uio/uio.scc | 0
.../features/v4l2/v4l2-xilinx.cfg | 0
.../features/v4l2/v4l2-xilinx.scc | 0
59 files changed, 224 deletions(-)
delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/latencytop/latencytop.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/net/net.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/profiling/profiling.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/scsi/disk.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/scsi/disk.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.scc
delete mode 100644 recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/digilent/drm-digilent.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/digilent/drm-digilent.scc (100%)
rename recipes-kernel/linux/{config/xilinx-machine => xilinx-kmeta}/bsp/kc705-microblazeel/kc705-microblazeel.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-machine => xilinx-kmeta}/bsp/kc705-microblazeel/kc705-microblazeel.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/microblaze-standard.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/microblaze-tiny.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/soc/drivers-softip-pcie.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/soc/drivers-softip-pcie.scc (100%)
rename recipes-kernel/linux/{config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg => xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-softip.cfg} (99%)
rename recipes-kernel/linux/{config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg => xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynq.cfg} (99%)
rename recipes-kernel/linux/{config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg => xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynqmp.cfg} (99%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/soc/drivers-zynqmp.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/soc/zynqmp.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/soc/zynqmp.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/zynqmp-standard.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/zynqmp-tiny.scc (100%)
rename recipes-kernel/linux/{config/xilinx-machine => xilinx-kmeta}/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-machine => xilinx-kmeta}/bsp/zybo-linux-bd-zynq7/zybo-snd.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/drm/drm-xilinx.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/drm/drm-xilinx.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/gpio/kb-gpio.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/gpio/kb-gpio.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/uio/uio.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/uio/uio.scc (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/v4l2/v4l2-xilinx.cfg (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/features/v4l2/v4l2-xilinx.scc (100%)
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.cfg
deleted file mode 100644
index 536c8e0d55..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_MACB=n
-
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.scc
deleted file mode 100644
index e44196bc08..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-macb.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Disable the MACB Ethernet Driver"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware disable-macb.cfg
-
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
deleted file mode 100644
index 9fc0c02847..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers (From linux-xlnx kernels)"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware xilinx.cfg
-
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc
deleted file mode 100644
index 66f3c67593..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 Drivers (From linux-xlnx kernels)"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware zynq7.cfg
-
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc
deleted file mode 100644
index 4bd73e4c9c..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Xilinx Zynq UltraScale+ MPSoC Drivers (From linux-xlnx kernels)"
-define KFEATURE_COMPATIBILITY board
-
-kconfig hardware zynqmp.cfg
-
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc
deleted file mode 100644
index 9e12d2fa27..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc
+++ /dev/null
@@ -1,5 +0,0 @@
-define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support (For linux-xlnx kernels)"
-define KFEATURE_COMPATIBILITY board
-
-include bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc
-
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.cfg b/recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.cfg
deleted file mode 100644
index 39c2d26805..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEBUG_FS=y
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.scc b/recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.scc
deleted file mode 100644
index 560aa8dc53..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/fs/debugfs.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable debugfs support"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware debugfs.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.cfg b/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.cfg
deleted file mode 100644
index 92ffacc77b..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.scc b/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.scc
deleted file mode 100644
index a4403c08b0..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_100.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable 100Hz Timer frequency"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware hz_100.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.cfg b/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.cfg
deleted file mode 100644
index b8795b956b..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_HZ_1000=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-CONFIG_HZ=1000
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.scc b/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.scc
deleted file mode 100644
index 8792da75d9..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_1000.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable 1000Hz Timer frequency"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware hz_1000.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.cfg b/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.cfg
deleted file mode 100644
index 146bb949ae..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_HZ_250=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=250
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.scc b/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.scc
deleted file mode 100644
index 51f5790209..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/hz_250.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable 250Hz Timer frequency"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware hz_250.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.cfg b/recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.cfg
deleted file mode 100644
index 8c68dcd51e..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NO_HZ=y
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.scc b/recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.scc
deleted file mode 100644
index 9409b93f6b..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/timer/no_hz.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable CONFIG_NO_HZ"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware no_hz.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.cfg b/recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.cfg
deleted file mode 100644
index 19306b8298..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_USB_STORAGE=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-
diff --git a/recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.scc b/recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.scc
deleted file mode 100644
index 882e3936fe..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/cfg/usb-mass-storage.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable options required for USB mass storage devices"
-define KFEATURE_COMPATIBILITY all
-
-kconf non-hardware usb-mass-storage.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.cfg b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.cfg
deleted file mode 100644
index 190c3bca98..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/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-base/features/hugetlb/hugepages.scc b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugepages.scc
deleted file mode 100644
index 395a1ca560..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/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-base/features/hugetlb/hugetlb.cfg b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.cfg
deleted file mode 100644
index 6f48ed18b8..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_HUGETLB_PAGE=y
-CONFIG_HUGETLBFS=y
diff --git a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc b/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc
deleted file mode 100644
index 1d0df3ce26..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/hugetlb/hugetlb.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable Huge TLB support"
-define KFEATURE_COMPATIBILITY arch
-
-kconf non-hardware hugetlb.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/latencytop/latencytop.scc b/recipes-kernel/linux/config/xilinx-base/features/latencytop/latencytop.scc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg b/recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg
deleted file mode 100644
index 5b4fb2d56f..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/leds/leds.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGERS=y
-
-CONFIG_LEDS_TRIGGER_CPU=y
-
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_CAMERA=y
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-
-# GPIO features requires GPIOLIB
-# Include them here, but they won't be enabled unless GPIO is explicitly
-# enabled as well.
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGER_GPIO=y
diff --git a/recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc b/recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc
deleted file mode 100644
index 69992a4fc6..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/leds/leds.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable LED class and triggers"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware leds.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/net/net.scc b/recipes-kernel/linux/config/xilinx-base/features/net/net.scc
deleted file mode 100644
index 8b13789179..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/net/net.scc
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/recipes-kernel/linux/config/xilinx-base/features/profiling/profiling.scc b/recipes-kernel/linux/config/xilinx-base/features/profiling/profiling.scc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/recipes-kernel/linux/config/xilinx-base/features/scsi/disk.cfg b/recipes-kernel/linux/config/xilinx-base/features/scsi/disk.cfg
deleted file mode 100644
index e71b9a47a6..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/scsi/disk.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BLK_DEV_SD=y
diff --git a/recipes-kernel/linux/config/xilinx-base/features/scsi/disk.scc b/recipes-kernel/linux/config/xilinx-base/features/scsi/disk.scc
deleted file mode 100644
index fdda548d25..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/scsi/disk.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable options for SCSI disk support"
-define KFEATURE_COMPATIBILITY board
-
-include scsi.scc
-
-kconf hardware disk.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg b/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg
deleted file mode 100644
index 2e9142f106..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCSI=y
diff --git a/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.scc b/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.scc
deleted file mode 100644
index bd739e81f0..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/features/scsi/scsi.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Enable options for SCSI support"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware scsi.cfg
diff --git a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg b/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg
deleted file mode 100644
index c707f968ae..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.cfg
+++ /dev/null
@@ -1,92 +0,0 @@
-CONFIG_LOCALVERSION="-xilinx"
-
-CONFIG_PRINTK=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_LOG_BUF_SHIFT=14
-
-CONFIG_SYSVIPC=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_FHANDLE=y
-CONFIG_AUDIT=y
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-
-CONFIG_EMBEDDED=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PERF_EVENTS=y
-CONFIG_SLAB=y
-CONFIG_SWAP=y
-CONFIG_TIMER_STATS=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-
-CONFIG_PREEMPT=y
-CONFIG_CGROUPS=y
-
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
-CONFIG_VLAN_8021Q=m
-
-CONFIG_NETDEVICES=y
-CONFIG_MDIO_BITBANG=y
-
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_TMPFS_POSIX_ACL=y
-
-CONFIG_CONNECTOR=y
-
-CONFIG_MEMORY=y
-
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_NAND=y
-
-CONFIG_RD_XZ=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-
-CONFIG_TMPFS=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT2=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_XATTR=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-
-CONFIG_NLS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_INPUT=y
-CONFIG_INPUT_SPARSEKMAP=y
-CONFIG_INPUT_EVDEV=y
-
-CONFIG_USB_ZERO=m
-
diff --git a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc b/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc
deleted file mode 100644
index 288b869670..0000000000
--- a/recipes-kernel/linux/config/xilinx-base/ktypes/standard/standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Standard linux-xlnx base configuration
-
-kconf non-hardware standard.cfg
-
-include features/hugetlb/hugetlb.scc
-include features/hugetlb/hugepages.scc
-
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/digilent/drm-digilent.scc
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/kc705-microblazeel/kc705-microblazeel.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/kc705-microblazeel/kc705-microblazeel.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/kc705-microblazeel/kc705-microblazeel.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-machine/bsp/kc705-microblazeel/kc705-microblazeel.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/kc705-microblazeel/kc705-microblazeel.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/microblaze-standard.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/microblaze-standard.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-tiny.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/microblaze-tiny.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-tiny.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/microblaze-tiny.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-softip-pcie.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-softip-pcie.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-softip-pcie.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-softip-pcie.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-softip-pcie.scc
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-softip.cfg
similarity index 99%
rename from recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-softip.cfg
index 1c8b2f5008..5c2529a2d1 100644
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/xilinx.cfg
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-softip.cfg
@@ -1,4 +1,3 @@
-
# Xilinx DMA engines
CONFIG_XILINX_DMA_ENGINES=y
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynq.cfg
similarity index 99%
rename from recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynq.cfg
index 2d34814ba1..9b70ac4ea7 100644
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynq7.cfg
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynq.cfg
@@ -1,4 +1,3 @@
-
# Devcfg
CONFIG_XILINX_DEVCFG=y
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynqmp.cfg
similarity index 99%
rename from recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynqmp.cfg
index 62858ae87e..4cbb2050af 100644
--- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.cfg
+++ b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/drivers-xlnx-zynqmp.cfg
@@ -1,4 +1,3 @@
-
CONFIG_SOC_XILINX_ZYNQMP=y
# PMU Firmware API
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/drivers-zynqmp.cfg b/recipes-kernel/linux/xilinx-kmeta/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/xilinx-kmeta/bsp/xilinx/soc/drivers-zynqmp.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/zynqmp.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/zynqmp.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/zynqmp.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/zynqmp.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/zynqmp-standard.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/zynqmp-standard.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/zynqmp-tiny.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-tiny.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/zynqmp-tiny.scc
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
rename to recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.scc b/recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.scc
rename to recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-snd.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.cfg b/recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.cfg
rename to recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.scc b/recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/drm/drm-xilinx.scc
rename to recipes-kernel/linux/xilinx-kmeta/features/drm/drm-xilinx.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/features/gpio/kb-gpio.cfg b/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/gpio/kb-gpio.cfg
rename to recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/gpio/kb-gpio.scc b/recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/gpio/kb-gpio.scc
rename to recipes-kernel/linux/xilinx-kmeta/features/gpio/kb-gpio.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg b/recipes-kernel/linux/xilinx-kmeta/features/uio/uio.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/uio/uio.cfg
rename to recipes-kernel/linux/xilinx-kmeta/features/uio/uio.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/uio/uio.scc b/recipes-kernel/linux/xilinx-kmeta/features/uio/uio.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/uio/uio.scc
rename to recipes-kernel/linux/xilinx-kmeta/features/uio/uio.scc
diff --git a/recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.cfg b/recipes-kernel/linux/xilinx-kmeta/features/v4l2/v4l2-xilinx.cfg
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.cfg
rename to recipes-kernel/linux/xilinx-kmeta/features/v4l2/v4l2-xilinx.cfg
diff --git a/recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.scc b/recipes-kernel/linux/xilinx-kmeta/features/v4l2/v4l2-xilinx.scc
similarity index 100%
rename from recipes-kernel/linux/config/xilinx-common/features/v4l2/v4l2-xilinx.scc
rename to recipes-kernel/linux/xilinx-kmeta/features/v4l2/v4l2-xilinx.scc
--
2.14.2
More information about the meta-xilinx
mailing list