diff --git a/config/boards/renegade.wip b/config/boards/renegade.wip
index eefeaafc2..5fe391212 100644
--- a/config/boards/renegade.wip
+++ b/config/boards/renegade.wip
@@ -6,7 +6,7 @@ BOOTCONFIG="roc-rk3328-cc_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default,dev"
+KERNEL_TARGET="default"
 CLI_TARGET=""
 DESKTOP_TARGET=""
 
diff --git a/config/boards/z28pro.csc b/config/boards/z28pro.csc
index afe0ec04f..528c4c061 100644
--- a/config/boards/z28pro.csc
+++ b/config/boards/z28pro.csc
@@ -6,7 +6,7 @@ BOOTCONFIG="rock64-rk3328_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default,dev"
+KERNEL_TARGET="default"
 CLI_TARGET=""
 DESKTOP_TARGET="stretch:default"
 #
diff --git a/config/sources/rk3328.conf b/config/sources/rk3328.conf
index 0e0b008cb..c7b7b6850 100644
--- a/config/sources/rk3328.conf
+++ b/config/sources/rk3328.conf
@@ -37,7 +37,7 @@ case $BRANCH in
 	BOOTBRANCH='branch:mainline-master'
 
 	KERNELSOURCE='https://github.com/ayufan-rock64/linux-mainline-kernel'
-	KERNELBRANCH='branch:linux-4.17.y'
+	KERNELBRANCH='tag:4.17.0-rc6-1019-ayufan'
 	KERNELDIR='linux-rk3328-mainline'
 	KERNEL_USE_GCC='> 7.0'
 
diff --git a/lib/configuration.sh b/lib/configuration.sh
index 4468cee52..51c535f06 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -10,7 +10,7 @@
 # common options
 # daily beta build contains date in subrevision
 if [[ $BETA == yes && -z $SUBREVISION ]]; then SUBREVISION="."$(date --date="tomorrow" +"%y%m%d"); fi
-REVISION="5.50$SUBREVISION" # all boards have same revision
+REVISION="5.51$SUBREVISION" # all boards have same revision
 ROOTPWD="1234" # Must be changed @first login
 MAINTAINER="Igor Pecovnik" # deb signature
 MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature
diff --git a/patch/u-boot/u-boot-rk3328-default/board_z28pro/use_sdmmc_ext.patch b/patch/u-boot/u-boot-rk3328-default/board_z28pro/use_sdmmc_ext.patch
index 429479948..cb10769e2 100644
--- a/patch/u-boot/u-boot-rk3328-default/board_z28pro/use_sdmmc_ext.patch
+++ b/patch/u-boot/u-boot-rk3328-default/board_z28pro/use_sdmmc_ext.patch
@@ -4,12 +4,12 @@ index d19d609..5c72488 100644
 +++ b/arch/arm/dts/rk3328-rock64.dts
 @@ -17,7 +17,7 @@
  	};
- 
+
  	aliases {
 -		spi0 = &spi0;
 +		mmc1 = &sdmmc_ext;
  	};
- 
+
  	gmac_clkin: external-gmac-clock {
 @@ -37,7 +37,7 @@
  	vcc3v3_sdmmc: sdmmc-pwren {
@@ -20,17 +20,16 @@ index d19d609..5c72488 100644
  		regulator-always-on;
  		regulator-boot-on;
  	};
-@@ -75,17 +75,17 @@
+@@ -75,16 +75,16 @@
  	status = "okay";
  };
- 
+
 -&sdmmc {
 +&sdmmc_ext {
  	u-boot,dm-spl;
  	bus-width = <4>;
  	cap-mmc-highspeed;
  	cap-sd-highspeed;
- 	fifo-mode;
 -	card-detect-delay = <200>;
 +	cd-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
  	disable-wp;
@@ -40,11 +39,11 @@ index d19d609..5c72488 100644
 +	pinctrl-0 = <&sdmmc0ext_clk>, <&sdmmc0ext_cmd>, <&sdmmc0ext_dectn>, <&sdmmc0ext_bus4>;
  	status = "okay";
  };
- 
-@@ -270,58 +270,6 @@
+
+@@ -268,42 +268,6 @@
  	status = "okay";
  };
- 
+
 -&spi0 {
 -	u-boot,dm-spl;
 -	status = "okay";
@@ -63,43 +62,27 @@ index d19d609..5c72488 100644
 -			#address-cells = <1>;
 -			#size-cells = <1>;
 -
--			system@0 {
--				label = "system";
--				reg = <0x0 0x8000>;
--				read-only;
--			};
--
 -			loader@8000 {
 -				label = "loader";
--				reg = <0x8000 0x3F8000>;
+-				reg = <0x8000 0x3F0000>;
 -			};
 -
--			reserved@400000 {
--				label = "reserved";
--				reg = <0x400000 0x3C0000>;
--				read-only;
+-			env@3f8000 {
+-				label = "env";
+-				reg = <0x3F8000 0x8000>;
 -			};
 -
 -			vendor@7c0000 {
 -				label = "vendor";
 -				reg = <0x7C0000 0x40000>;
 -			};
--
--			uboot@800000 {
--				label = "uboot";
--				reg = <0x800000 0x400000>;
--			};
--
--			atf@c00000 {
--				label = "atf";
--				reg = <0xC00000 0x400000>;
--			};
 -		};
 -	};
 -};
- 
+-
  &pinctrl {
  	pmic {
+ 		pmic_int_l: pmic-int-l {
 diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h b/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
 index a396510..260117b 100644
 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3328.h
@@ -107,7 +90,7 @@ index a396510..260117b 100644
 @@ -361,6 +361,17 @@ enum {
  	GPIO2D4_SEL_MASK	= 0xff << GPIO2D4_SEL_SHIFT,
  	GPIO2D4_EMMC_DATA1234	= 0xaa,
- 
+
 +        /* GPIO3AL_IOMUX */
 +        GPIO3A0_SEL_SHIFT       = 0,
 +        GPIO3A0_SEL_MASK        = 0x71ff << GPIO3A0_SEL_SHIFT,
@@ -129,7 +112,7 @@ index f1db5bf..b627083 100644
 @@ -96,11 +96,10 @@ int board_init(void)
  #define GRF_BASE	0xff100000
  	struct rk3328_grf_regs * const grf = (void *)GRF_BASE;
- 
+
 -	/* uart2 select m1, sdcard select m1*/
 +	/* uart2 select m1, no sdcard select, because we use sdmmc_ext */
  	rk_clrsetreg(&grf->com_iomux,
@@ -138,7 +121,7 @@ index f1db5bf..b627083 100644
 -		     IOMUX_SEL_SDMMC_M1 << IOMUX_SEL_SDMMC_SHIFT);
 +		     IOMUX_SEL_UART2_MASK,
 +		     IOMUX_SEL_UART2_M1 << IOMUX_SEL_UART2_SHIFT);
- 
+
  	ret = regulators_enable_boot_on(false);
  	if (ret)
 diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c