10 files changed, 34 insertions, 44 deletions
diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf
index 58d752b..0fbac06 100644
--- a/conf/machine/firefly-rk3288.conf
+++ b/conf/machine/firefly-rk3288.conf
@@ -6,6 +6,7 @@
 #@DESCRIPTION: Firefly-RK3288 is a high-performance platform, with strong computing power, graphic processing and video decoding ability.
 #http://www.t-firefly.com/en/
 
-include conf/machine/include/rk3288.inc
+require conf/machine/include/rk3288.inc
+
 KERNEL_DEVICETREE = "rk3288-firefly.dtb"
 UBOOT_MACHINE = "firefly-rk3288_defconfig"
diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc
index 4039034..91fbbaa 100644
--- a/conf/machine/include/rk3066.inc
+++ b/conf/machine/include/rk3066.inc
@@ -5,19 +5,4 @@ SOC_FAMILY = "rk3066"
 
 require conf/machine/include/tune-cortexa9.inc
 require conf/machine/include/soc-family.inc
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-XSERVER = "xserver-xorg \
-           xf86-video-fbturbo \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-keyboard"
-
-KERNEL_IMAGETYPE = "zImage"
-
-IMAGE_FSTYPES += "ext4"
-
-SERIAL_CONSOLES ?= "115200;ttyFIQ0"
-KBUILD_DEFCONFIG = "multi_v7_defconfig"
-
+require conf/machine/include/rockchip-defaults.inc
diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc
index 73f9dbd..bd36837 100644
--- a/conf/machine/include/rk3188.inc
+++ b/conf/machine/include/rk3188.inc
@@ -5,17 +5,4 @@ SOC_FAMILY  = "rk3188"
 
 require conf/machine/include/tune-cortexa9.inc
 require conf/machine/include/soc-family.inc
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-
-XSERVER = "xserver-xorg \
-           xf86-video-fbturbo \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-keyboard"
-
-KERNEL_IMAGETYPE = "zImage"
-
-IMAGE_FSTYPES += "ext4"
-
-SERIAL_CONSOLES ?= "115200;ttyFIQ0"
-KBUILD_DEFCONFIG = "multi_v7_defconfig"
+require conf/machine/include/rockchip-defaults.inc
diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
index 88acbbf..4dd0250 100644
--- a/conf/machine/include/rk3288.inc
+++ b/conf/machine/include/rk3288.inc
@@ -5,14 +5,12 @@ SOC_FAMILY = "rk3288"
 
 require conf/machine/include/tune-cortexa17.inc
 require conf/machine/include/soc-family.inc
+require conf/machine/include/rockchip-defaults.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux"
 SERIAL_CONSOLES = "115200;ttyS2"
-KERNEL_IMAGETYPE = "zImage"
-KBUILD_DEFCONFIG = "multi_v7_defconfig"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-rockchip"
 SPL_BINARY ?= "u-boot-spl-dtb.bin"
 
-IMAGE_FSTYPES = "ext4 rockchip-gpt-img"
+IMAGE_FSTYPES = "rockchip-gpt-img"
 IMAGE_CLASSES += "rockchip-gpt-img"
diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc
new file mode 100644
index 0000000..deab8d8
--- /dev/null
+++ b/conf/machine/include/rockchip-defaults.inc
@@ -0,0 +1,20 @@
+# meta-rockchip default settings
+
+# kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+LINUX_VERSION_EXTENSION ?= "-rockchip"
+KBUILD_DEFCONFIG = "multi_v7_defconfig"
+KERNEL_IMAGETYPE = "zImage"
+
+# xserver
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = " \
+	xserver-xorg \
+	xf86-video-fbturbo \
+	xf86-input-evdev \
+	xf86-input-mouse \
+	xf86-input-keyboard \
+	"
+
+# misc
+IMAGE_FSTYPES += "ext4"
diff --git a/conf/machine/marsboard-rk3066.conf b/conf/machine/marsboard-rk3066.conf
index 3a8c7b8..09414bc 100644
--- a/conf/machine/marsboard-rk3066.conf
+++ b/conf/machine/marsboard-rk3066.conf
@@ -8,6 +8,5 @@
 
 require conf/machine/include/rk3066.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
 SERIAL_CONSOLES = "115200;ttyS2"
 KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"
diff --git a/conf/machine/radxarock.conf b/conf/machine/radxarock.conf
index c89b7c3..2036f6a 100644
--- a/conf/machine/radxarock.conf
+++ b/conf/machine/radxarock.conf
@@ -9,7 +9,5 @@
 
 require conf/machine/include/rk3188.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-SERIAL_CONSOLES ?= "115200;ttyFIQ0"
-KERNEL_DEVICETREE ?= "rk3188-radxarock.dtb"
-OLDEST_KERNEL ?= "3.0"
+SERIAL_CONSOLES = "115200;ttyFIQ0"
+KERNEL_DEVICETREE = "rk3188-radxarock.dtb"
diff --git a/conf/machine/rock2-square.conf b/conf/machine/rock2-square.conf
index a896d50..1f4e938 100644
--- a/conf/machine/rock2-square.conf
+++ b/conf/machine/rock2-square.conf
@@ -6,7 +6,7 @@
 #@DESCRIPTION: Radxa Rock2 is a series of the second single board computer from Radxa. This is the square baseboard.
 #http://radxa.com/Rock2
 
-include conf/machine/include/rk3288.inc
+require conf/machine/include/rk3288.inc
+
 KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
 UBOOT_MACHINE = "rock2_defconfig"
-
diff --git a/conf/machine/tinker-rk3288.conf b/conf/machine/tinker-rk3288.conf
index e4dea88..294bdc7 100644
--- a/conf/machine/tinker-rk3288.conf
+++ b/conf/machine/tinker-rk3288.conf
@@ -5,6 +5,7 @@
 #@NAME: Tinker RK3288
 #@DESCRIPTION: ASUS Tinker Board is a Raspberry Pi 3 Alternative based on Rockchip RK3288 Processor.
 
-include conf/machine/include/rk3288.inc
+require conf/machine/include/rk3288.inc
+
 KERNEL_DEVICETREE = "rk3288-tinker.dtb"
 UBOOT_MACHINE = "tinker-rk3288_defconfig"
diff --git a/conf/machine/veyron-speedy.conf b/conf/machine/veyron-speedy.conf
index c9d7ed0..7f1c5a8 100644
--- a/conf/machine/veyron-speedy.conf
+++ b/conf/machine/veyron-speedy.conf
@@ -6,7 +6,8 @@
 #@DESCRIPTION: Google Veyron Speedy Rev 1+ board (formally known as Chromebook Asus C201)
 #https://www.google.com/chromebook/find/#?device=asus-chromebook-c201
 
-include conf/machine/include/rk3288.inc
+require conf/machine/include/rk3288.inc
+
 KERNEL_DEVICETREE = "rk3288-speedy.dtb"
 MACHINE_EXTRA_RDEPENDS = "linux-firmware-bcm4354 linux-firmware-bcm-veyron kernel-module-brcmfmac kernel-module-cros-ec-accel kernel-module-btbcm kernel-module-hci-uart"
 PREFERRED_PROVIDER_virtual/kernel = "linux-veyron"