axolotl: sync defconfig setup with kernel repo

Change-Id: I6d94d1ee596c1bef80d1ba4ad07788cdb098a7c2
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/BoardConfig.mk b/BoardConfig.mk
index fbecc24..95f44b3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -47,14 +47,11 @@
 TARGET_ENABLE_MEDIADRM_64 := true
 
 # Kernel
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-    TARGET_KERNEL_CONFIG := axolotl_eng_defconfig
-else
-    ifeq ($(TARGET_BUILD_VARIANT),userdebug)
-        TARGET_KERNEL_CONFIG := axolotl_userdebug_defconfig
-    else
-        TARGET_KERNEL_CONFIG := axolotl_user_defconfig
-    endif
+ifeq ($(TARGET_BUILD_VARIANT),userdebug)
+    TARGET_KERNEL_CONFIG += vendor/shift/debug.config
+
+    # Enable console for userdebug
+    BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200n8 earlycon=msm_geni_serial,0xA84000
 endif
 
 # Security patch level