diff --git a/conf/machine/olinuxino-a20som204.conf b/conf/machine/olinuxino-a20som204.conf
new file mode 100644
index 0000000..dbd90c7
--- /dev/null
+++ b/conf/machine/olinuxino-a20som204.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: Olimex A20-SOM204
+#@DESCRIPTION: Machine configuration for the Olimex A20-SOM204 Evaluation Board, based on Allwinner A20 CPU
+#https://github.com/OLIMEX/SOM204
+
+require conf/machine/include/sun7i.inc
+
+KERNEL_DEVICETREE = "allwinner/sun7i-a20-olimex-som204-evb.dtb"
+UBOOT_MACHINE = "A20-Olimex-SOM204-EVB_defconfig"