Merge remote branch 'freescale/denzil' into master

* freescale/denzil:
  linux-imx (2.6.35.3): use imx233-olinuxino override and share defconfig
  imx-bootlets: use imx233-olinuxino override for patching
  imx233-olinuxino.inc: create imx233-olinuxino override
  imx233-olinuxino-mini: add machine definition
  imx233-olinuxino: move common definitions to a .inc file
This commit is contained in:
Otavio Salvador 2012-07-26 17:35:07 -03:00
commit fc89ed4962
8 changed files with 29 additions and 31 deletions

View File

@ -2,18 +2,6 @@
#@NAME: iMX233-OLinuXino-Maxi
#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Maxi
include conf/machine/include/mxs-base.inc
IMXBOOTLETS_MACHINE = "stmp378x_dev"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
IMAGE_BOOTLOADER = "imx-bootlets"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 linux.sb sdcard"
include conf/machine/include/imx233-olinuxino.inc
MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "net-persistent-mac"
MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"

View File

@ -2,16 +2,4 @@
#@NAME: iMX233-OLinuXino-Micro
#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Micro
include conf/machine/include/mxs-base.inc
IMXBOOTLETS_MACHINE = "stmp378x_dev"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
IMAGE_BOOTLOADER = "imx-bootlets"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 linux.sb sdcard"
MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
include conf/machine/include/imx233-olinuxino.inc

View File

@ -0,0 +1,5 @@
#@TYPE: Machine
#@NAME: iMX233-OLinuXino-Mini
#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Mini
include conf/machine/include/imx233-olinuxino.inc

View File

@ -0,0 +1,18 @@
# Common definitions to all iMX233-OlinuXino variants
include conf/machine/include/mxs-base.inc
# Add a override for all iMX233-OLinuXino variants
SOC_FAMILY_append = "imx233-olinuxino:"
IMXBOOTLETS_MACHINE = "stmp378x_dev"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-olinuxino.dts"
IMAGE_BOOTLOADER = "imx-bootlets"
SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
IMAGE_FSTYPES ?= "tar.bz2 ext3 linux.sb sdcard"
MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"

View File

@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
PRINC := "${@int(PRINC) + 1}"
PRINC := "${@int(PRINC) + 2}"
# Board specific patches
SRC_URI_append_imx233-olinuxino-maxi = " file://imx233-olinuxino-maxi.patch"
SRC_URI_append_imx233-olinuxino = " file://imx233-olinuxino.patch"

View File

@ -1,8 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
PRINC := "${@int(PRINC) + 6}"
PRINC := "${@int(PRINC) + 7}"
# Board specific patches
SRC_URI_append_imx233-olinuxino-maxi = " file://imx233-olinuxino.patch"
SRC_URI_append_imx233-olinuxino-micro = " file://imx233-olinuxino.patch"
SRC_URI_append_imx233-olinuxino = " file://imx233-olinuxino.patch"