diff --git a/projects/Odroid_C2/filesystem/usr/lib/systemd/system/serial-console.service b/projects/Odroid_C2/filesystem/usr/lib/systemd/system/serial-console.service
index 5dffa1a843..29aef1d0a9 100644
--- a/projects/Odroid_C2/filesystem/usr/lib/systemd/system/serial-console.service
+++ b/projects/Odroid_C2/filesystem/usr/lib/systemd/system/serial-console.service
@@ -1,18 +1,17 @@
 [Unit]
-Description=Debug Shell on /dev/console
+Description=Debug Shell on /dev/ttyS0
 DefaultDependencies=no
-ConditionKernelCommandLine=console
+ConditionKernelCommandLine=console=ttyS0,115200n8
 
 [Service]
 WorkingDirectory=/storage
 Environment="ENV=/etc/profile"
+ExecStartPre=/bin/sh -c 'echo -en "\033[?25h"'
 ExecStart=/bin/sh
 Restart=always
 RestartSec=0
 StandardInput=tty
-TTYPath=/dev/console
-TTYReset=yes
-TTYVHangup=yes
+TTYPath=/dev/ttyS0
 KillMode=process
 IgnoreSIGPIPE=no
 # bash ignores SIGTERM
diff --git a/projects/Odroid_C2/linux/linux.aarch64.conf b/projects/Odroid_C2/linux/linux.aarch64.conf
index ec56034143..5ae9d67260 100644
--- a/projects/Odroid_C2/linux/linux.aarch64.conf
+++ b/projects/Odroid_C2/linux/linux.aarch64.conf
@@ -967,7 +967,7 @@ CONFIG_AM_VDEC_AVS=y
 CONFIG_AM_TIMESYNC=y
 CONFIG_AM_STREAMING=y
 CONFIG_AM_SUBTITLE=y
-# CONFIG_AM_VIDEOCAPTURE is not set
+CONFIG_AM_VIDEOCAPTURE=y
 # CONFIG_AM_HEVCENC is not set
 
 #
@@ -1026,8 +1026,8 @@ CONFIG_GXBB_POWER_RESET=y
 #
 # Amlogic ion video support
 #
-CONFIG_VIDEOBUF2_ION=y
-CONFIG_AMLOGIC_IONVIDEO=y
+# CONFIG_VIDEOBUF2_ION is not set
+# CONFIG_AMLOGIC_IONVIDEO is not set
 
 #
 # V4L2 Video Support
@@ -1054,12 +1054,8 @@ CONFIG_TVIN_HDMI=y
 #
 # Amlogic amvecm Driver
 #
-CONFIG_AM_VECM=y
-CONFIG_AML_NAND=y
-CONFIG_AML_NEXT_GEN_NAND=y
-CONFIG_AML_NFTL_NEW=m
-CONFIG_AML_NAND_KEY=y
-# CONFIG_SECURE_NAND is not set
+# CONFIG_AM_VECM is not set
+# CONFIG_AML_NAND is not set
 CONFIG_AM_INPUT=y
 CONFIG_AM_SARADC=y
 CONFIG_MESON_NEW_INPUT_REMOTE=y
diff --git a/projects/Odroid_C2/options b/projects/Odroid_C2/options
index 148de3f5d7..f2a592e635 100644
--- a/projects/Odroid_C2/options
+++ b/projects/Odroid_C2/options
@@ -17,6 +17,7 @@
         # arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
         # arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
         # cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
+        #
         TARGET_CPU="cortex-a53"
         TARGET_CPU_FLAGS="+crc+fp+simd"
         ;;
@@ -47,6 +48,7 @@
   # default:  default mainline kernel
     LINUX="amlogic-3.14"
 
+
 ################################################################################
 # setup build defaults
 ################################################################################
@@ -127,7 +129,3 @@
 
   # kernel image name
     KERNEL_NAME="KERNEL"
-
-  # set the addon dirs
-    ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
-    ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"