diff --git a/config/boards/odroidc1.conf b/config/boards/odroidc1.conf
index c99a79ce40..dbba3b6a59 100644
--- a/config/boards/odroidc1.conf
+++ b/config/boards/odroidc1.conf
@@ -1,5 +1,6 @@
 # S805 C1 quad core
 KERNEL_TARGET="default"
+TARGETS=uImage
 LINUXFAMILY=odroidc1
 BOOTSIZE=32
 BOOTCONFIG=odroidc_config
diff --git a/config/boards/odroidc2.conf b/config/boards/odroidc2.conf
index 04ff26fce5..a1879618f9 100644
--- a/config/boards/odroidc2.conf
+++ b/config/boards/odroidc2.conf
@@ -1,5 +1,6 @@
 # S905 C2 quad core
 ARCH=arm64
+TARGETS=Image
 LINUXFAMILY=odroidc2
 BOOTSIZE=32
 BOOTCONFIG=odroidc2_config
diff --git a/config/boot-odroid-c1.ini b/config/boot-odroid-c1.ini
index 09980d0d90..f8d5099c17 100644
--- a/config/boot-odroid-c1.ini
+++ b/config/boot-odroid-c1.ini
@@ -28,6 +28,6 @@ setenv m_bpp "32"
 setenv disableuhs "disableuhs"
 
 setenv bootargs "console=ttyS0,115200n8 console=tty0 root=${ROOT_DEV} rootwait rw no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs}"
-setenv bootcmd "fatload mmc 0:1 0x21000000 zImage; fatload mmc 0:1 0x22000000 uInitrd; fatload mmc 0:1 0x21800000 dtb/meson8b_odroidc.dtb; bootz 0x21000000 0x22000000 0x21800000"
+setenv bootcmd "fatload mmc 0:1 0x21000000 uImage; fatload mmc 0:1 0x22000000 uInitrd; fatload mmc 0:1 0x21800000 dtb/meson8b_odroidc.dtb; bootm 0x21000000 0x22000000 0x21800000"
 run bootcmd
 
diff --git a/config/linux-odroidc1-default.config b/config/linux-odroidc1-default.config
index 0ae5a556f2..c60efab366 100644
--- a/config/linux-odroidc1-default.config
+++ b/config/linux-odroidc1-default.config
@@ -113,7 +113,7 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_SWAP_ENABLED=y
-# CONFIG_MEMCG_KMEM is not set
+CONFIG_MEMCG_KMEM=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -198,6 +198,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -227,7 +228,7 @@ CONFIG_LBDAF=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
+CONFIG_BLK_DEV_THROTTLING=y
 
 #
 # Partition Types
@@ -469,7 +470,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
-# CONFIG_SECCOMP is not set
+CONFIG_SECCOMP=y
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_XEN is not set
 # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
@@ -1043,7 +1044,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-# CONFIG_NETPRIO_CGROUP is not set
+CONFIG_NETPRIO_CGROUP=y
 CONFIG_BQL=y
 # CONFIG_BPF_JIT is not set
 
@@ -1875,7 +1876,7 @@ CONFIG_MII=y
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_VXLAN is not set
+CONFIG_VXLAN=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
@@ -3923,12 +3924,18 @@ CONFIG_ODROID_AML_GPIO_LIB=m
 #
 CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_DEBUG=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -4279,25 +4286,15 @@ CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 CONFIG_SECURITY_PATH=y
-CONFIG_LSM_MMAP_MIN_ADDR=32768
-CONFIG_SECURITY_SELINUX=y
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+# CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
-CONFIG_SECURITY_APPARMOR=y
-CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+# CONFIG_SECURITY_APPARMOR is not set
 # CONFIG_SECURITY_YAMA is not set
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="apparmor"
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
diff --git a/configuration.sh b/configuration.sh
index 49b3d01506..a4c16d86a0 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -191,6 +191,7 @@ esac
 
 [[ -z $OFFSET ]] && OFFSET=1 # Bootloader space in MB (1 x 2048 = default)
 [[ -z $ARCH ]] && ARCH=armhf
+[[ -z $TARGETS ]] && TARGETS=zImage
 [[ -z $SERIALCON ]] && SERIALCON=ttyS0
 [[ -z $BOOTSIZE ]] && BOOTSIZE=0 # Mb size of boot partition
 
@@ -204,6 +205,7 @@ esac
 [[ -z $CPUMIN && $LINUXFAMILY == sun*i ]] && CPUMIN="480000" && CPUMAX="1010000" && GOVERNOR="interactive"
 [[ $BRANCH != "default" && $LINUXFAMILY == sun*i ]] && GOVERNOR="ondemand"
 [[ -z $CPUMIN && $LINUXFAMILY == odroidxu4 ]] && CPUMIN="600000" && CPUMAX="2000000" && GOVERNOR="conservative"
+[[ -z $CPUMIN && $LINUXFAMILY == odroidc1 ]] && CPUMIN="600000" && CPUMAX="1600000" && GOVERNOR="interactive"
 [[ -z $CPUMIN && $LINUXFAMILY == cubox ]] && CPUMIN="396000" && CPUMAX="996000" && GOVERNOR="interactive"
 [[ -z $CPUMIN && $LINUXFAMILY == s500 ]] && CPUMIN="408000" && CPUMAX="1104000" && GOVERNOR="interactive"
 [[ -z $CPUMIN && $LINUXFAMILY == marvell ]] && CPUMIN="800000" && CPUMAX="1600000" && GOVERNOR="ondemand"
@@ -215,7 +217,6 @@ if [[ $RELEASE == trusty || $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; e
 
 case $ARCH in
 	arm64)
-	TARGETS=Image
 	CROSS_COMPILE="$CCACHE aarch64-linux-gnu-"
 	COMPILER="aarch64-linux-gnu-"
 	ARCHITECTURE=arm64
@@ -223,7 +224,6 @@ case $ARCH in
 	;;
 
 	armhf)
-	TARGETS=zImage
 	CROSS_COMPILE="$CCACHE arm-linux-gnueabihf-"
 	COMPILER="arm-linux-gnueabihf-"
 	ARCHITECTURE=arm
diff --git a/patch/kernel/odroidc1-default/packaging-odroid.patch b/patch/kernel/odroidc1-default/packaging-odroid.patch
new file mode 100644
index 0000000000..0e27b3ec37
--- /dev/null
+++ b/patch/kernel/odroidc1-default/packaging-odroid.patch
@@ -0,0 +1,49 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -126,7 +126,7 @@
+ 	installed_image_path="boot/vmlinux-$version"
+ 	;;
+ *)
+-	installed_image_path="boot/vmlinuz-$version"
++	installed_image_path="boot/uImage-$version"
+ esac
+ 
+ BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
+@@ -164,12 +164,8 @@
+ 	cp System.map "$tmpdir/boot/System.map-$version"
+ 	cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
+ fi
+-# Not all arches include the boot path in KBUILD_IMAGE
+-if [ -e $KBUILD_IMAGE ]; then
+-	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
+-else
+-	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
+-fi
++# odroid c1 need uimage
++cp arch/$ARCH/boot/uImage "$tmpdir/$installed_image_path"
+ 
+ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+ 	INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
+@@ -243,10 +239,10 @@
+ sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
+ sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
+ cat >> $tmpdir/DEBIAN/postinst <<EOT 
+-ln -sf $(basename $kernel_tmp_version) /boot/zImage > /dev/null 2>&1 || mv /$kernel_tmp_version /boot/zImage
++ln -sf $(basename $kernel_tmp_version) /boot/uImage > /dev/null 2>&1 || mv /$kernel_tmp_version /boot/uImage
+ 
+ if [ -f "/boot/initrd.img-$version" ]; then 
+-mkimage -A $UTS_MACHINE -O linux -T ramdisk -C gzip -a 0 -e 0 -n uInitrd -d /boot/initrd.img-$version /boot/uInitrd > /dev/null 2>&1
++mkimage -A $UTS_MACHINE -O linux -T ramdisk -C none -a 0 -e 0 -n uInitrd -d /boot/initrd.img-$version /boot/uInitrd > /dev/null 2>&1
+ rm /boot/initrd.img-$version
+ fi
+ 
+@@ -274,7 +270,7 @@
+ 
+ bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
+ if [ "\$bootfstype" = "vfat" ]; then 
+-rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage /boot/*nitrd*
++rm -f /boot/System.map* /boot/config* /boot/uImage* /boot/*nitrd*
+ fi
+ }
+ mountpoint -q /boot && check_and_unmount