[meta-xilinx] [PATCH 0/7] Kernel config changes
Nathan Rossi
nathan at nathanrossi.com
Thu Oct 5 05:20:51 PDT 2017
This series contains a number of changes related to how the linux-xlnx
and linux-yocto kernels are configured and the kmeta fragments used to
configure them.
For linux-yocto since the merge of a number of fragments into the
upstream yocto-kernel-cache a large portion of the meta-xilinx config
fragments are no longer needed, within this series duplicate configs are
removed and the associated setup of config (KMACHINE/etc) is switched to
the upstream yocto-kernel-cache values/fragments.
With the removal of a large portion of kmeta fragments, the three
directories 'xilinx-base', 'xilinx-common', and 'xilinx-machine' have
been consolidated into 'xilinx-kmeta' in the root of the
recipes-kernel/linux/ directory.
The most significant functional change in this series is the change for
linux-xlnx which removes the use of the kmeta for the baseline config in
favour of defconfigs (as has been done for zcu102). The main reason for
this change is to make linux-xlnx config directly align with the same
config used when manually building linux-xlnx, without needing to
maintain the kmeta fragments.
This change to linux-xlnx removes the need for the kmeta to define the
baseline linux-xlnx config to match that of the vendor config. However
since linux-xlnx still includes linux-yocto.inc it is able to use kmeta
fragments as well as SRC_URI fragments (.scc/.cfg). This allows for the
kc705/zybo-linux-bd configuration fragments to live in the xilinx-kmeta
and be enabled by the linux-xlnx kernel.
Nathan Rossi (7):
linux/config: Rework kmeta based on kernel-cache merge
linux/xilinx-kmeta: Collapse xilinx-* kmeta directories into one
linux-yocto: Rework kmeta/config for linux-yocto bbappends
linux-xlnx: Rework kernel config setup
tune-*.inc: Remove KMACHINE
linux/xilinx-kmeta: Consolidate zybo-linux-bd-zynq7 configs
linux-yocto_4.4.bbappend: Drop patches for 4.4
conf/machine/include/tune-microblaze.inc | 3 -
conf/machine/include/tune-zynq.inc | 3 -
conf/machine/include/tune-zynqmp.inc | 4 -
conf/machine/zybo-linux-bd-zynq7.conf | 4 +-
.../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 --
.../xilinx-common/arch/microblaze/microblaze.cfg | 6 --
.../xilinx-common/arch/microblaze/microblaze.scc | 6 --
.../xilinx-common/bsp/digilent/drm-digilent.cfg | 8 --
.../xilinx-common/bsp/digilent/drm-digilent.scc | 5 --
.../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 ---
.../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 | 11 ---
.../xilinx-common/bsp/xilinx/zynq-standard.scc | 14 ----
.../config/xilinx-common/bsp/xilinx/zynq-tiny.scc | 11 ---
.../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 -
.../config/xilinx-common/features/gpio/kb-gpio.cfg | 3 -
.../config/xilinx-common/features/gpio/kb-gpio.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 -
.../bsp/zybo-linux-bd-zynq7/zybo-snd.cfg | 10 ---
.../bsp/zybo-linux-bd-zynq7/zybo-snd.scc | 4 -
recipes-kernel/linux/linux-microblaze.inc | 5 ++
recipes-kernel/linux/linux-xilinx-configs.inc | 11 ---
recipes-kernel/linux/linux-xilinx-machines.inc | 17 ----
recipes-kernel/linux/linux-xlnx.inc | 45 ++++++-----
recipes-kernel/linux/linux-yocto-dev.bbappend | 5 +-
recipes-kernel/linux/linux-yocto-tiny_%.bbappend | 5 +-
recipes-kernel/linux/linux-yocto-xilinx.inc | 25 ++++++
recipes-kernel/linux/linux-yocto_%.bbappend | 5 +-
recipes-kernel/linux/linux-yocto_4.4.bbappend | 6 --
...-dts-zynq-Enable-USB-and-USB-PHY-for-ZYBO.patch | 52 ------------
.../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-drm.cfg} | 0
.../bsp/xilinx/soc/drivers-drm.scc} | 2 +-
.../bsp/xilinx/soc/drivers-softip-pcie.cfg} | 0
.../bsp/xilinx/soc/drivers-softip-pcie.scc} | 2 +-
.../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
.../linux/xilinx-kmeta/bsp/xilinx/soc/zynqmp.scc | 10 +++
.../bsp/xilinx/zynqmp-standard.scc | 5 +-
.../bsp/xilinx/zynqmp-tiny.scc | 2 -
.../zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg | 19 +++++
.../zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc | 7 ++
.../features/uio/uio.cfg | 0
.../features/uio/uio.scc | 0
.../features/v4l2/v4l2-xilinx.cfg | 0
.../features/v4l2/v4l2-xilinx.scc | 0
111 files changed, 102 insertions(+), 943 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
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/digilent/drm-digilent.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/bsp/digilent/drm-digilent.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
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/soc/zynqmp.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/gpio/kb-gpio.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-common/features/gpio/kb-gpio.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
delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.cfg
delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/zybo-linux-bd-zynq7/zybo-snd.scc
create mode 100644 recipes-kernel/linux/linux-microblaze.inc
delete mode 100644 recipes-kernel/linux/linux-xilinx-configs.inc
delete mode 100644 recipes-kernel/linux/linux-xilinx-machines.inc
create mode 100644 recipes-kernel/linux/linux-yocto-xilinx.inc
delete mode 100644 recipes-kernel/linux/linux-yocto_4.4.bbappend
delete mode 100644 recipes-kernel/linux/linux/ARM-dts-zynq-Enable-USB-and-USB-PHY-for-ZYBO.patch
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/features/drm/drm-xilinx.cfg => xilinx-kmeta/bsp/xilinx/soc/drivers-drm.cfg} (100%)
rename recipes-kernel/linux/{config/xilinx-common/features/drm/drm-xilinx.scc => xilinx-kmeta/bsp/xilinx/soc/drivers-drm.scc} (73%)
rename recipes-kernel/linux/{config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.cfg => xilinx-kmeta/bsp/xilinx/soc/drivers-softip-pcie.cfg} (100%)
rename recipes-kernel/linux/{config/xilinx-common/bsp/xilinx/soc/drivers/xilinx-pcie.scc => xilinx-kmeta/bsp/xilinx/soc/drivers-softip-pcie.scc} (70%)
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/bsp/xilinx/soc/drivers/zynqmp.cfg => xilinx-kmeta/bsp/xilinx/soc/drivers-zynqmp.cfg} (100%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/soc/zynqmp.cfg (100%)
create mode 100644 recipes-kernel/linux/xilinx-kmeta/bsp/xilinx/soc/zynqmp.scc
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/zynqmp-standard.scc (81%)
rename recipes-kernel/linux/{config/xilinx-common => xilinx-kmeta}/bsp/xilinx/zynqmp-tiny.scc (87%)
create mode 100644 recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg
create mode 100644 recipes-kernel/linux/xilinx-kmeta/bsp/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc
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%)
--
2.14.2
More information about the meta-xilinx
mailing list