From 3da10e96e77fb487c14a3d68963b6027f600608c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sat, 14 Nov 2020 10:46:45 +0100 Subject: [PATCH] Point rockchip 32b legacy kernel sources to our repisitory (#2344) Branch was removed at main Rockchip repo. --- config/kernel/linux-rk322x-legacy.config | 20 +++++++++----------- config/kernel/linux-rockchip-legacy.config | 21 ++++++++++----------- config/sources/families/rk322x.conf | 2 +- config/sources/families/rockchip.conf | 2 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/config/kernel/linux-rk322x-legacy.config b/config/kernel/linux-rk322x-legacy.config index 6062bce053..a1bfdd4d47 100644 --- a/config/kernel/linux-rk322x-legacy.config +++ b/config/kernel/linux-rk322x-legacy.config @@ -274,8 +274,8 @@ CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CMDLINE_PARSER is not set @@ -1620,6 +1620,12 @@ CONFIG_DM_VERITY=y # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_ISCSI_TARGET=m CONFIG_NETDEVICES=y CONFIG_MII=y CONFIG_NET_CORE=y @@ -4134,6 +4140,7 @@ CONFIG_USB_CONFIGFS_F_FS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_GADGET_TARGET=m # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set @@ -5678,12 +5685,3 @@ CONFIG_FONT_8x16=y # CONFIG_SG_SPLIT is not set CONFIG_ARCH_HAS_SG_CHAIN=y # CONFIG_VIRTUALIZATION is not set - -## LinuxIO - iSCSI Target modules -CONFIG_TARGET_CORE=m -CONFIG_ISCSI_TARGET=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m - diff --git a/config/kernel/linux-rockchip-legacy.config b/config/kernel/linux-rockchip-legacy.config index edfd314ce4..617de505f2 100644 --- a/config/kernel/linux-rockchip-legacy.config +++ b/config/kernel/linux-rockchip-legacy.config @@ -272,8 +272,8 @@ CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CMDLINE_PARSER is not set @@ -1630,6 +1630,12 @@ CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1 # CONFIG_DM_LOG_WRITES is not set # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_ISCSI_TARGET=m CONFIG_NETDEVICES=y CONFIG_MII=y CONFIG_NET_CORE=y @@ -1936,6 +1942,7 @@ CONFIG_MVL88W8977=m CONFIG_RTL8822BU=m CONFIG_RTL8821CU=m CONFIG_88XXAU=m +CONFIG_RTL8192EU=m CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_MWIFIEX=y @@ -4043,6 +4050,7 @@ CONFIG_USB_CONFIGFS_F_FS=y # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FUNCTIONFS is not set # CONFIG_USB_MASS_STORAGE is not set +CONFIG_USB_GADGET_TARGET=m # CONFIG_USB_G_SERIAL is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_PRINTER is not set @@ -5547,12 +5555,3 @@ CONFIG_FONT_8x16=y # CONFIG_SG_SPLIT is not set CONFIG_ARCH_HAS_SG_CHAIN=y # CONFIG_VIRTUALIZATION is not set - -## LinuxIO - iSCSI Target modules -CONFIG_TARGET_CORE=m -CONFIG_ISCSI_TARGET=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m - diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf index efa73226d5..f76181ae4e 100644 --- a/config/sources/families/rk322x.conf +++ b/config/sources/families/rk322x.conf @@ -11,7 +11,7 @@ case $BRANCH in legacy) - KERNELSOURCE='https://github.com/rockchip-linux/kernel.git' + KERNELSOURCE='https://github.com/armbian/linux' KERNELBRANCH='branch:stable-4.4-rk3288-linux-v2.x' KERNELDIR='linux-rockchip' diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index ce9dbd626e..23481ac407 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -18,7 +18,7 @@ case $BRANCH in legacy) - KERNELSOURCE='https://github.com/rockchip-linux/kernel.git' + KERNELSOURCE='https://github.com/armbian/linux' KERNELBRANCH='branch:stable-4.4-rk3288-linux' KERNELDIR='linux-rockchip'