5 files changed, 17 insertions, 31 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 78c63019ae..69cdec6f1f 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -13,23 +13,14 @@ XSERVER = "xserver-xorg \
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"
 
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
 
-
-IMAGE_FSTYPES += "tar.bz2 jffs2"
+IMAGE_FSTYPES += "tar.bz2 ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS2"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_MACHINE = "omap3_beagle_config"
 
 # do ubiattach /dev/ubi_ctrl -m 4
@@ -49,7 +40,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 
 PREFERRED_VERSION_u-boot = "git"
-EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
 MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 # and sdio
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
new file mode 100644
index 0000000000..f6cf895c52
--- /dev/null
+++ b/conf/machine/include/omap3.inc
@@ -0,0 +1,12 @@
+require conf/machine/include/tune-cortexa8.inc
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+MACHINE_KERNEL_PR = "r20" 
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+EXTRA_IMAGEDEPENDS += "u-boot x-load"
+
+MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 5bfbb712f2..99d92d5512 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console
 
 TARGET_ARCH = "arm"
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -28,12 +28,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 
-#KERNEL_IMAGETYPE = "uImage"
-
-#UBOOT_ENTRYPOINT = "0x80008000"
-#UBOOT_LOADADDRESS = "0x80008000"
 #UBOOT_ARCH = "arm"
 #UBOOT_MACHINE = "omap3_pandora_config"
 
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 610b1dfc12..8780b827f5 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -13,9 +13,7 @@ XSERVER = "xserver-xorg \
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
 
 # Ship all kernel modules
 MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
@@ -27,10 +25,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm"
 
-KERNEL_IMAGETYPE = "uImage"
-
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_evm_config"
 
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
index 2a93ab069d..cb32539928 100644
--- a/conf/machine/overo.conf
+++ b/conf/machine/overo.conf
@@ -2,18 +2,13 @@
 #@NAME: overo machine
 #@DESCRIPTION: Machine configuration for the Gumstix Overo
 
-include conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/omap3.inc
 
 TARGET_ARCH = "arm"
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
 
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_MACHINE_overo = "omap3_overo_config"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-
-KERNEL_IMAGETYPE = "uImage"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 IMAGE_FSTYPES += "tar.bz2"