diff --git a/arch/arm/configs/npi_v7_defconfig b/arch/arm/configs/npi_v7_defconfig
index cd3b8f6972cd2..971ab10546895 100644
--- a/arch/arm/configs/npi_v7_defconfig
+++ b/arch/arm/configs/npi_v7_defconfig
@@ -5442,7 +5442,7 @@ CONFIG_DYNAMIC_DEBUG=y
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
@@ -5580,7 +5580,8 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
diff --git a/make_deb.sh b/make_deb.sh
index 64c1ce4d14a20..d1b2414242175 100755
--- a/make_deb.sh
+++ b/make_deb.sh
@@ -1,13 +1,13 @@
 deb_distro=bionic
 DISTRO=stable
-build_opts="-j 16"
+build_opts="-j 8"
 build_opts="${build_opts} O=build_image/build"
 build_opts="${build_opts} ARCH=arm"
 build_opts="${build_opts} KBUILD_DEBARCH=${DEBARCH}"
 build_opts="${build_opts} LOCALVERSION=-imx6"
 build_opts="${build_opts} KDEB_CHANGELOG_DIST=${deb_distro}"
 build_opts="${build_opts} KDEB_PKGVERSION=1.$(date +%g%m)${DISTRO}"
-build_opts="${build_opts} CROSS_COMPILE=arm-linux-gnueabihf-" 	
+build_opts="${build_opts} CROSS_COMPILE=/opt/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-" 	
 build_opts="${build_opts} KDEB_SOURCENAME=linux-upstream"
 make ${build_opts}  npi_v7_defconfig
 make ${build_opts}  
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index 615b7ec6588f1..a26c7636c704f 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -38,7 +38,7 @@ LINECOMMENT	"//".*\n
 #include "srcpos.h"
 #include "dtc-parser.tab.h"
 
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
 extern bool treesource_error;
 
 /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0b31f4f1f92cf..7351c056c294a 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -31,7 +31,8 @@ create_package() {
 
 	# Create the package
 	dpkg-gencontrol -p$pname -P"$pdir"
-	dpkg --build "$pdir" ..
+	#dpkg --build "$pdir" ..
+	dpkg-deb -b -Zxz "$pdir" ..
 }
 
 version=$KERNELRELEASE