4.19.4-2

3 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4d1d9ecdf6a..e47dc43b5a3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-phicomm-n1-armbian-git
 	pkgver = 4.19.4
-	pkgrel = 1
-	url = https://github.com/Jerry981028/Amlogic_s905-kernel
+	pkgrel = 2
+	url = https://github.com/isjerryxiao/Amlogic_s905-kernel
 	arch = aarch64
 	license = GPL2
 	makedepends = xmlto
@@ -14,12 +14,12 @@ pkgbase = linux-phicomm-n1-armbian-git
 	makedepends = vboot-utils
 	makedepends = dtc
 	options = !strip
-	source = git+https://github.com/Jerry981028/Amlogic_s905-kernel.git
+	source = git+https://github.com/isjerryxiao/Amlogic_s905-kernel.git#branch=linux-4.19.y
 	source = config
 	source = linux.preset
 	source = 99-linux.hook
 	md5sums = SKIP
-	md5sums = 2c6a2fd7cf6791a851eafd3d51eeaebf
+	md5sums = 3a0668c93071d08bed6228d269d1dff4
 	md5sums = f6ee374f560e1b9df6a7de2399027d1b
 	md5sums = d1c40c7367a7081f3b4c03264780f9d4
 
diff --git a/PKGBUILD b/PKGBUILD
index f3567d8052d8..89369470c6a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,28 +6,26 @@
 buildarch=8
 
 pkgbase=linux-phicomm-n1-armbian-git
-_srcname=linux-4.19
+_srcname=Amlogic_s905-kernel
 _kernelname=${pkgbase#linux}
 _desc="AArch64 kernel for Phicomm N1, Armbian source"
 pkgver=4.19.4
-pkgrel=1
+pkgrel=2
 arch=('aarch64')
-url="https://github.com/Jerry981028/Amlogic_s905-kernel"
+url="https://github.com/isjerryxiao/Amlogic_s905-kernel"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc')
 options=('!strip')
-source=("git+https://github.com/Jerry981028/Amlogic_s905-kernel.git"
+source=("git+https://github.com/isjerryxiao/Amlogic_s905-kernel.git#branch=linux-4.19.y"
         'config'
         'linux.preset'
         '99-linux.hook')
 md5sums=('SKIP'
-         '2c6a2fd7cf6791a851eafd3d51eeaebf'
+         '3a0668c93071d08bed6228d269d1dff4'
          'f6ee374f560e1b9df6a7de2399027d1b'
          'd1c40c7367a7081f3b4c03264780f9d4')
 
 prepare() {
-  cd "${srcdir}"
-  ln -sf "Amlogic_s905-kernel" "${_srcname}"
   cd "${srcdir}/${_srcname}"
 
   # reset to a certain version
diff --git a/config b/config
index e9ad772b8f7b..27a9fef0ce60 100644
--- a/config
+++ b/config
@@ -20,7 +20,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-ARCH"
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="n"
+CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -1809,7 +1809,7 @@ CONFIG_REALTEK_PHY=m
 # CONFIG_MICREL_KS8995MA is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
-CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_NET_DRIVERS=m
 # CONFIG_USB_CATC is not set
 # CONFIG_USB_KAWETH is not set
 CONFIG_USB_PEGASUS=m
@@ -1820,7 +1820,7 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
 CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_CDC_EEM is not set
+CONFIG_USB_NET_CDC_EEM=m
 CONFIG_USB_NET_CDC_NCM=m
 # CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
 # CONFIG_USB_NET_CDC_MBIM is not set
@@ -1833,7 +1833,7 @@ CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_MCS7830=m
-# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_RNDIS_HOST=m
 CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
 CONFIG_USB_NET_CDC_SUBSET=m
 # CONFIG_USB_ALI_M5632 is not set
@@ -1909,9 +1909,12 @@ CONFIG_WLAN_VENDOR_MARVELL=y
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_MWIFIEX is not set
 CONFIG_WLAN_VENDOR_MEDIATEK=y
-# CONFIG_MT7601U is not set
-# CONFIG_MT76x0U is not set
-# CONFIG_MT76x2U is not set
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_USB=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x2U=m
 CONFIG_WLAN_VENDOR_RALINK=y
 # CONFIG_RT2X00 is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
@@ -2931,7 +2934,7 @@ CONFIG_VIDEO_MESON_VDEC=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
 CONFIG_CEC_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_CROS_EC_CEC=y
+# CONFIG_VIDEO_CROS_EC_CEC is not set
 CONFIG_VIDEO_MESON_AO_CEC=m
 # CONFIG_CEC_GPIO is not set
 
@@ -4691,7 +4694,7 @@ CONFIG_MESON_IRQ_GPIO=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_MESON=y
-CONFIG_RESET_MESON_AUDIO_ARB=y
+# CONFIG_RESET_MESON_AUDIO_ARB is not set
 # CONFIG_RESET_TI_SYSCON is not set
 # CONFIG_FMC is not set
 
@@ -4976,10 +4979,11 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=y
 CONFIG_CIFS_STATS2=y
-CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_ALLOW_INSECURE_LEGACY is not set
 # CONFIG_CIFS_UPCALL is not set
-# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y