From ed74e6b7ac90b9b21e0b83f635e8d9f34e17aece Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 22 Sep 2017 08:57:51 +0200 Subject: [PATCH] Meson64 DEV patches adjust and moving to proper kernel source. --- config/sources/meson64.conf | 2 +- patch/kernel/meson64-dev/1005_USB_Adjust_for_4.13.patch | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/sources/meson64.conf b/config/sources/meson64.conf index 06f5c47c7..288031e18 100644 --- a/config/sources/meson64.conf +++ b/config/sources/meson64.conf @@ -27,7 +27,7 @@ case $BRANCH in ;; dev) - KERNELSOURCE='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' + KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELBRANCH='branch:master' KERNELDIR=$MAINLINE_KERNEL_DIR diff --git a/patch/kernel/meson64-dev/1005_USB_Adjust_for_4.13.patch b/patch/kernel/meson64-dev/1005_USB_Adjust_for_4.13.patch index aff63c948..4ee08e787 100644 --- a/patch/kernel/meson64-dev/1005_USB_Adjust_for_4.13.patch +++ b/patch/kernel/meson64-dev/1005_USB_Adjust_for_4.13.patch @@ -17,12 +17,11 @@ diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile index f252201..10b2165 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile -@@ -7,7 +7,7 @@ obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o - obj-$(CONFIG_PHY_MT65XX_USB3) += phy-mt65xx-usb3.o +@@ -6,6 +6,7 @@ obj-$(CONFIG_GENERIC_PHY) += phy-core.o + obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o obj-$(CONFIG_PHY_XGENE) += phy-xgene.o obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o -- -+obj-$(CONFIG_PHY_MESON_GXL_USB) += phy-meson-gxl-usb2.o ++obj-$(CONFIG_PHY_MESON_GXL_USB) += phy-meson-gxl-usb2.o obj-$(CONFIG_ARCH_SUNXI) += allwinner/ obj-$(CONFIG_ARCH_MESON) += amlogic/ - obj-$(CONFIG_ARCH_RENESAS) += renesas/ + obj-$(CONFIG_LANTIQ) += lantiq/