machine conf: update and cleanup

Signed-off-by: Armin Kuster <[email protected]>
akuster · May 4, 2015 · 5f71c90 · 5f71c90
1 parent c82e9bd
commit 5f71c90
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/conf/machine/odroid-ux3.conf b/conf/machine/odroid-ux3.conf
@@ -5,6 +5,7 @@
 
 DEFAULTTUNE = "cortexa15hf-neon"
 include conf/machine/include/tune-cortexa15.inc
+include conf/machine/include/odroid-default-settings.inc
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
@@ -17,24 +18,22 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 
 EXTRA_IMAGEDEPENDS += "u-boot-odroidux3"
 
-IMAGE_FSTYPES += "cpio.gz tar.bz2 ext4"
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
+IMAGE_FSTYPES ?= "tar.bz2 ext4"
 
 SERIAL_CONSOLE = "115200 ttySAC2"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-odroid"
-PREFERRED_VERSION_linux-odroid = "3.10%"
+PREFERRED_VERSION_linux-odroid ?= "3.10%"
 
 #specify u-boot parameters
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-odroidux3"
 PREFERRED_PROVIDER_u-boot = "u-boot-odroidux3"
-PREFERRED_VERSION_u-boot-odroidux3 = "2012.07"
+PREFERRED_VERSION_u-boot-odroidux3 ?= "2012.07"
 
 KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = "exynos5422-odroidxu3.dtb"
-#KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 UBOOT_MACHINE = "odroid_config"
-#UBOOT_ENTRYPOINT = "0"
-#UBOOT_LOADADDRESS = "0"
 
-MACHINE_FEATURES = "serial usbgadget usbhost vfat alsa screen"
+#MACHINE_FEATURES = "serial usbgadget usbhost vfat ext2 rtc alsa screen"