Moves machine specific code from layer.conf to dory.conf

AsteroidOS · Jul 26, 2015 · 8c75b44 · 8c75b44
1 parent fc11f16
commit 8c75b44
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -1,21 +1,5 @@
-# We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
-
 BBFILE_COLLECTIONS += "dory-hybris-layer"
 BBFILE_PATTERN_dory-hybris-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_dory-hybris-layer = "7"
-
-PREFERRED_PROVIDER_virtual/egl ?= "libhybris"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "libhybris"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "libhybris"
-
-PREFERRED_PROVIDER_virtual/android-headers = "android"
-PREFERRED_PROVIDER_virtual/android-system-image = "android"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_android = "lollipop"
-PREFERRED_VERSION_linux = "3.10+lollipop"
-
-IMAGE_INSTALL += "android-tools android-system-compat android-system"
diff --git a/conf/machine/dory.conf b/conf/machine/dory.conf
@@ -3,3 +3,27 @@
 #@DESCRIPTION: Machine configuration for the LG G Watch
 
 require conf/machine/include/tune-cortexa7.inc
+
+MACHINE_FEATURES = "apm alsa bluetooth usbgadget usbhost vfat ext2"
+MACHINE_DISPLAY_WIDTH_PIXELS = "280"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "280"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "240"
+
+PREFERRED_PROVIDER_virtual/egl ?= "libhybris"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "libhybris"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "libhybris"
+
+PREFERRED_PROVIDER_virtual/android-headers = "android"
+PREFERRED_PROVIDER_virtual/android-system-image = "android"
+PREFERRED_PROVIDER_virtual/kernel = "linux-dory"
+PREFERRED_VERSION_android = "lollipop"
+PREFERRED_VERSION_linux = "3.10+lollipop"
+
+KERNEL_IMAGETYPE = "zImage"
+
+ANDROID_BOARD_SYSTEMIMAGE_PARTITION = "mmcblk0p15"
+ANDROID_BOARD_SYSTEMIMAGE_PARTITION_SIZE = "1073741824"
+ANDROID_BOARD_FLASH_BLOCK_SIZE = "131072"
+
+IMAGE_INSTALL += "android-tools android-system-compat android-system"