From dbbcc17221a9a001631d8522ade1035fd750a3cf Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 26 Jul 2012 16:51:44 -0300 Subject: [PATCH 1/5] imx233-olinuxino: move common definitions to a .inc file This avoids duplication in machine and allow for easy addition of new variants of board. Signed-off-by: Otavio Salvador --- conf/machine/imx233-olinuxino-maxi.conf | 13 +------------ conf/machine/imx233-olinuxino-micro.conf | 13 +------------ conf/machine/include/imx233-olinuxino.inc | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 24 deletions(-) create mode 100644 conf/machine/include/imx233-olinuxino.inc diff --git a/conf/machine/imx233-olinuxino-maxi.conf b/conf/machine/imx233-olinuxino-maxi.conf index ad21642..9c91903 100644 --- a/conf/machine/imx233-olinuxino-maxi.conf +++ b/conf/machine/imx233-olinuxino-maxi.conf @@ -2,17 +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" - -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" diff --git a/conf/machine/imx233-olinuxino-micro.conf b/conf/machine/imx233-olinuxino-micro.conf index d8a2fdb..a32ec7f 100644 --- a/conf/machine/imx233-olinuxino-micro.conf +++ b/conf/machine/imx233-olinuxino-micro.conf @@ -2,15 +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" - -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 diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc new file mode 100644 index 0000000..e78acf4 --- /dev/null +++ b/conf/machine/include/imx233-olinuxino.inc @@ -0,0 +1,15 @@ +# Common definitions to all iMX233-OlinuXino variants + +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" From a1ba303b68c47f5c66dc002161f6034068358818 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 26 Jul 2012 16:53:21 -0300 Subject: [PATCH 2/5] imx233-olinuxino-mini: add machine definition Signed-off-by: Otavio Salvador --- conf/machine/imx233-olinuxino-mini.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 conf/machine/imx233-olinuxino-mini.conf diff --git a/conf/machine/imx233-olinuxino-mini.conf b/conf/machine/imx233-olinuxino-mini.conf new file mode 100644 index 0000000..b0e4487 --- /dev/null +++ b/conf/machine/imx233-olinuxino-mini.conf @@ -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 From 7bf04681afa48d7ce4e92ef6ea2b3ef29dd35ffe Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 26 Jul 2012 16:56:54 -0300 Subject: [PATCH 3/5] imx233-olinuxino.inc: create imx233-olinuxino override Allow for easy maintainence and avoid duplication when definitions or patches are shareable in all variants. Signed-off-by: Otavio Salvador --- conf/machine/include/imx233-olinuxino.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc index e78acf4..294c0f2 100644 --- a/conf/machine/include/imx233-olinuxino.inc +++ b/conf/machine/include/imx233-olinuxino.inc @@ -2,6 +2,9 @@ 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" From 206f21ce01760501132a1fbdabee30df55373547 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 26 Jul 2012 16:59:43 -0300 Subject: [PATCH 4/5] imx-bootlets: use imx233-olinuxino override for patching This fixes problem of people booting other board variants as Mini and Micro. Signed-off-by: Otavio Salvador --- .../{imx233-olinuxino-maxi.patch => imx233-olinuxino.patch} | 0 recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename recipes-bsp/imx-bootlets/imx-bootlets/{imx233-olinuxino-maxi.patch => imx233-olinuxino.patch} (100%) diff --git a/recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino-maxi.patch b/recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino.patch similarity index 100% rename from recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino-maxi.patch rename to recipes-bsp/imx-bootlets/imx-bootlets/imx233-olinuxino.patch diff --git a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend index 3eaaaae..8f39b93 100644 --- a/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend +++ b/recipes-bsp/imx-bootlets/imx-bootlets_10.12.01.bbappend @@ -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" From 3d27f2a4b0dece013469290f9e51c8c2de8c8988 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 26 Jul 2012 17:23:36 -0300 Subject: [PATCH 5/5] linux-imx (2.6.35.3): use imx233-olinuxino override and share defconfig Signed-off-by: Otavio Salvador --- .../{imx233-olinuxino-micro => imx233-olinuxino}/defconfig | 0 recipes-kernel/linux/linux-imx_2.6.35.3.bbappend | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) rename recipes-kernel/linux/linux-imx-2.6.35.3/{imx233-olinuxino-micro => imx233-olinuxino}/defconfig (100%) diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino-micro/defconfig b/recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig similarity index 100% rename from recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino-micro/defconfig rename to recipes-kernel/linux/linux-imx-2.6.35.3/imx233-olinuxino/defconfig diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend b/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend index 70dafd4..e2426c1 100644 --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bbappend @@ -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"