From 7c7bc3ccbae2c7d01c866eb8633a553d64ddecd7 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 7 Dec 2015 22:59:24 +1000 Subject: linux/configs: base: Refactor linux-xlnx 3.14 Zynq USB driver config Move the associated config fragments that are specific for this driver in this version of the kernel to a single config fragment that the linux-xlnx_3.14 recipe adds by default to Zynq kernel features. Signed-off-by: Nathan Rossi --- .../config/xilinx-base/bsp/xilinx/disable-usb-phy.cfg | 1 - .../config/xilinx-base/bsp/xilinx/disable-usb-phy.scc | 5 ----- .../bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg | 14 ++++++++++++++ .../bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc | 5 +++++ recipes-kernel/linux/linux-xlnx_3.14.bb | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.cfg delete mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.scc create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg create mode 100644 recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.cfg deleted file mode 100644 index db6873ec..00000000 --- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NOP_USB_XCEIV=n diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.scc deleted file mode 100644 index ff4d7f3e..00000000 --- a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/disable-usb-phy.scc +++ /dev/null @@ -1,5 +0,0 @@ -define KFEATURE_DESCRIPTION "Disable the USB PHY driver" -define KFEATURE_COMPATIBILITY board - -kconfig hardware disable-usb-phy.cfg - diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg new file mode 100644 index 00000000..624cca9b --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.cfg @@ -0,0 +1,14 @@ + +# USB (+otg) +CONFIG_USB=y +CONFIG_USB_ZYNQ=y +CONFIG_USB_ZYNQ_PHY=y +CONFIG_USB_ZYNQ_ERRATA_DT654401=y +CONFIG_USB_ZYNQ_DR_OF=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_ZYNQ=y +CONFIG_USB_GADGET=y + +# Disable the phy driver +CONFIG_NOP_USB_XCEIV=n + diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc new file mode 100644 index 00000000..10020ddf --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Configuration for the linux-xlnx 3.14 Zynq USB driver" +define KFEATURE_COMPATIBILITY board + +kconfig hardware xlnx-3.14-usb.cfg + diff --git a/recipes-kernel/linux/linux-xlnx_3.14.bb b/recipes-kernel/linux/linux-xlnx_3.14.bb index 572047f7..c93997e4 100644 --- a/recipes-kernel/linux/linux-xlnx_3.14.bb +++ b/recipes-kernel/linux/linux-xlnx_3.14.bb @@ -12,6 +12,6 @@ SRC_URI_append = " \ file://kernel-use-the-gnu89-standard-explicitly.patch \ " -# This kernel's Zynq USB driver cannot handle a seperate USB PHY device. -KERNEL_FEATURES_append_zynq = " bsp/xilinx/disable-usb-phy.scc" +# This kernel's Zynq USB driver is different to the newer kernels. +KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/xlnx-3.14-usb.scc" -- cgit v1.2.3-54-g00ecf