diff --git a/patch.sh b/patch.sh
index 464a4ef5b5efa621103bd8776836b5fee64b4d22..9dcea499ef7a5b610b91be9683b497bfe6ea1a8c 100644
--- a/patch.sh
+++ b/patch.sh
@@ -524,7 +524,7 @@ drivers
soc
beaglebone
dir 'build/gcc'
-#sgx
+sgx
packaging () {
echo "dir: packaging"
diff --git a/patches/defconfig b/patches/defconfig
index 697a8f0938eb7cb4e82ccd9a8a78125f9cd26489..8adaefe88b46fbc355aa614d38e1f781240ad2b6 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -5667,21 +5667,7 @@ CONFIG_IRQCHIP=y
CONFIG_ARM_GIC_MAX_NR=1
CONFIG_OMAP_IRQCHIP=y
# CONFIG_IPACK_BUS is not set
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_ATH79 is not set
-# CONFIG_RESET_BERLIN is not set
-# CONFIG_RESET_HSDK_V1 is not set
-# CONFIG_RESET_IMX7 is not set
-# CONFIG_RESET_LANTIQ is not set
-# CONFIG_RESET_LPC18XX is not set
-# CONFIG_RESET_MESON is not set
-# CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
-# CONFIG_RESET_SUNXI is not set
-CONFIG_RESET_TI_SYSCON=y
-# CONFIG_RESET_ZYNQ is not set
-# CONFIG_RESET_TEGRA_BPMP is not set
+# CONFIG_RESET_CONTROLLER is not set
# CONFIG_FMC is not set
#
diff --git a/patches/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch b/patches/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch
index 0b52d3079eff1d7b6c61d63e5e89073d338381a7..1501e1ee76fc79a0037a45f028e6b88f068681a8 100644
--- a/patches/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch
+++ b/patches/sgx/0001-HACK-drm-fb_helper-enable-panning-support.patch
@@ -12,10 +12,10 @@ Signed-off-by: Darren Etheridge <detheridge@ti.com>
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
-index 596fabf18c3e..a4ec958b7a02 100644
+index f2ee88363015..7e12672e0205 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
-@@ -31,6 +31,12 @@
+@@ -27,6 +27,12 @@
#define DEFAULT_FBDEFIO_DELAY_MS 50
@@ -25,19 +25,19 @@ index 596fabf18c3e..a4ec958b7a02 100644
+ */
+#define DRM_NUM_FBDEV_BUFFERS 3
+
- struct drm_fb_cma {
- struct drm_framebuffer fb;
- struct drm_gem_cma_object *obj[4];
-@@ -421,7 +427,7 @@ drm_fbdev_cma_create(struct drm_fb_helper *helper,
- bytes_per_pixel = DIV_ROUND_UP(sizes->surface_bpp, 8);
+ struct drm_fbdev_cma {
+ struct drm_fb_helper fb_helper;
+ const struct drm_framebuffer_funcs *fb_funcs;
+@@ -327,7 +333,7 @@ drm_fbdev_cma_create(struct drm_fb_helper *helper,
+ sizes->surface_bpp);
- mode_cmd.width = sizes->surface_width;
-- mode_cmd.height = sizes->surface_height;
-+ mode_cmd.height = sizes->surface_height * DRM_NUM_FBDEV_BUFFERS;
- mode_cmd.pitches[0] = sizes->surface_width * bytes_per_pixel;
- mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
- sizes->surface_depth);
-@@ -453,7 +459,7 @@ drm_fbdev_cma_create(struct drm_fb_helper *helper,
+ bytes_per_pixel = DIV_ROUND_UP(sizes->surface_bpp, 8);
+- size = sizes->surface_width * sizes->surface_height * bytes_per_pixel;
++ size = sizes->surface_width * sizes->surface_height * bytes_per_pixel * DRM_NUM_FBDEV_BUFFERS;
+ obj = drm_gem_cma_create(dev, size);
+ if (IS_ERR(obj))
+ return -ENOMEM;
+@@ -353,7 +359,7 @@ drm_fbdev_cma_create(struct drm_fb_helper *helper,
fbi->fbops = &drm_fbdev_cma_ops;
drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth);
@@ -47,5 +47,5 @@ index 596fabf18c3e..a4ec958b7a02 100644
offset = fbi->var.xoffset * bytes_per_pixel;
offset += fbi->var.yoffset * fb->pitches[0];
--
-2.11.0
+2.14.1
diff --git a/version.sh b/version.sh
index 41a4b61b26f844adf358ac0b0026560a7dd67edd..20a9a8df6f26ff6353e2c330fd50cc93e4dcf0eb 100644
--- a/version.sh
+++ b/version.sh
@@ -33,7 +33,7 @@ KERNEL_REL=4.14
KERNEL_TAG=${KERNEL_REL}-rc1
kernel_rt=".X-rtY"
#Kernel Build
-BUILD=${build_prefix}0
+BUILD=${build_prefix}1
#v4.X-rcX + upto SHA
#prev_KERNEL_SHA=""