diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-30 22:15:13 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-30 22:16:10 +0100 |
| commit | c0c657bd92911788b96d9670620eabf024453752 (patch) | |
| tree | 774a5e2d966d6ee87da17cd063580d5970564d00 /meta-extras/conf | |
| parent | e71a306f9cac8e30e689d607e2092e11a756ef5d (diff) | |
| download | poky-c0c657bd92911788b96d9670620eabf024453752.tar.gz | |
Split meta-extras and meta-moblin out of the main repository
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-extras/conf')
| -rw-r--r-- | meta-extras/conf/distro/include/poky-extras-src-revisions.inc | 6 | ||||
| -rw-r--r-- | meta-extras/conf/layer.conf | 11 | ||||
| -rw-r--r-- | meta-extras/conf/machine/mx31litekit.conf | 14 | ||||
| -rw-r--r-- | meta-extras/conf/machine/nokia770.conf | 35 | ||||
| -rw-r--r-- | meta-extras/conf/machine/nokia800.conf | 30 | ||||
| -rw-r--r-- | meta-extras/conf/machine/om-gta01.conf | 48 | ||||
| -rw-r--r-- | meta-extras/conf/machine/om-gta02.conf | 49 |
7 files changed, 0 insertions, 193 deletions
diff --git a/meta-extras/conf/distro/include/poky-extras-src-revisions.inc b/meta-extras/conf/distro/include/poky-extras-src-revisions.inc deleted file mode 100644 index 4fc380ad84..0000000000 --- a/meta-extras/conf/distro/include/poky-extras-src-revisions.inc +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | SRCREV_pn-evince ??= "2437" | ||
| 2 | SRCDATE_maemo-mapper-nohildon ??= "20061114" | ||
| 3 | SRCREV_pn-libxosd ??= "627" | ||
| 4 | SRCREV_pn-matchbox-applet-light ??= "1548" | ||
| 5 | SRCREV_pn-matchbox-common ??= "1561" | ||
| 6 | |||
diff --git a/meta-extras/conf/layer.conf b/meta-extras/conf/layer.conf deleted file mode 100644 index c992abc9f6..0000000000 --- a/meta-extras/conf/layer.conf +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | # We have a conf and classes directory, add to BBPATH | ||
| 2 | BBPATH := "${BBPATH}:${LAYERDIR}" | ||
| 3 | |||
| 4 | # We have a packages directory, add to BBFILES | ||
| 5 | BBFILES := "${BBFILES} ${LAYERDIR}/packages/*/*.bb" | ||
| 6 | |||
| 7 | BBFILE_COLLECTIONS += "extras" | ||
| 8 | BBFILE_PATTERN_extras := "^${LAYERDIR}/" | ||
| 9 | BBFILE_PRIORITY_extras = "5" | ||
| 10 | |||
| 11 | require conf/distro/include/poky-extras-src-revisions.inc | ||
diff --git a/meta-extras/conf/machine/mx31litekit.conf b/meta-extras/conf/machine/mx31litekit.conf deleted file mode 100644 index 2dc2883759..0000000000 --- a/meta-extras/conf/machine/mx31litekit.conf +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: imx31 Lite Kit | ||
| 3 | #@DESCRIPTION: Machine configuration for the imx31 based Lite Kit | ||
| 4 | TARGET_ARCH = "arm" | ||
| 5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" | ||
| 6 | |||
| 7 | PREFERRED_PROVIDER_virtual/kernel = "linux-mx31" | ||
| 8 | |||
| 9 | MACHINE_FEATURES = "kernel26 apm alsa bluetooth irda screen touchscreen" | ||
| 10 | |||
| 11 | IMAGE_FSTYPES ?= "tar.gz" | ||
| 12 | SERIAL_CONSOLE = "-L 115200 ttymxc0" | ||
| 13 | |||
| 14 | require conf/machine/include/tune-arm1136jf-s.inc | ||
diff --git a/meta-extras/conf/machine/nokia770.conf b/meta-extras/conf/machine/nokia770.conf deleted file mode 100644 index c8b4c3c912..0000000000 --- a/meta-extras/conf/machine/nokia770.conf +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: Nokia 770 internet tablet | ||
| 3 | #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet | ||
| 4 | TARGET_ARCH = "arm" | ||
| 5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" | ||
| 6 | |||
| 7 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" | ||
| 8 | PREFERRED_PROVIDER_virtual/bootloader = "" | ||
| 9 | |||
| 10 | XSERVER = "xserver-kdrive-xomap" | ||
| 11 | |||
| 12 | # 800x480 is big enough for me | ||
| 13 | GUI_MACHINE_CLASS = "bigscreen" | ||
| 14 | |||
| 15 | require conf/machine/include/tune-arm926ejs.inc | ||
| 16 | |||
| 17 | #size of the root partition (yes, it is 123 MB) | ||
| 18 | ROOT_FLASH_SIZE = "123" | ||
| 19 | EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 -n" | ||
| 20 | |||
| 21 | IMAGE_FSTYPES ?= "jffs2" | ||
| 22 | |||
| 23 | # serial console port on devboard rev. B3 | ||
| 24 | SERIAL_CONSOLE = "115200 ttyS0" | ||
| 25 | |||
| 26 | PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" | ||
| 27 | |||
| 28 | #use this if you are using the nokia initfs | ||
| 29 | ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " | ||
| 30 | |||
| 31 | MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat" | ||
| 32 | MACHINE_EXTRA_RDEPENDS = "usbinit" | ||
| 33 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" | ||
| 34 | |||
| 35 | KERNEL_IMAGE_MAXSIZE = "2097152" | ||
diff --git a/meta-extras/conf/machine/nokia800.conf b/meta-extras/conf/machine/nokia800.conf deleted file mode 100644 index fb2cd02b03..0000000000 --- a/meta-extras/conf/machine/nokia800.conf +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: Nokia 800/810 internet tablet | ||
| 3 | #@DESCRIPTION: Machine configuration for the Nokia 800/810 | ||
| 4 | TARGET_ARCH = "arm" | ||
| 5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" | ||
| 6 | |||
| 7 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" | ||
| 8 | XSERVER = "xserver-kdrive-xomap" | ||
| 9 | |||
| 10 | GUI_MACHINE_CLASS = "bigscreen" | ||
| 11 | |||
| 12 | require conf/machine/include/tune-arm1136jf-s.inc | ||
| 13 | |||
| 14 | ROOT_FLASH_SIZE = "174" | ||
| 15 | EXTRA_IMAGECMD_jffs2_nokia800 = "--pad --little-endian --eraseblock=0x20000 -n" | ||
| 16 | |||
| 17 | IMAGE_FSTYPES ?= "jffs2" | ||
| 18 | |||
| 19 | SERIAL_CONSOLE = "-L 115200 ttyS0" | ||
| 20 | |||
| 21 | PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" | ||
| 22 | |||
| 23 | #use this if you are using the nokia initfs | ||
| 24 | ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " | ||
| 25 | |||
| 26 | MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat" | ||
| 27 | MACHINE_EXTRA_RDEPENDS = "cx3110x usbinit" | ||
| 28 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" | ||
| 29 | |||
| 30 | KERNEL_IMAGE_MAXSIZE = "2097152" | ||
diff --git a/meta-extras/conf/machine/om-gta01.conf b/meta-extras/conf/machine/om-gta01.conf deleted file mode 100644 index f40457e226..0000000000 --- a/meta-extras/conf/machine/om-gta01.conf +++ /dev/null | |||
| @@ -1,48 +0,0 @@ | |||
| 1 | #----------------------------------------------------------------------------- | ||
| 2 | #@TYPE: Machine | ||
| 3 | #@NAME: FIC GTA01 (Neo1973) | ||
| 4 | #@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone | ||
| 5 | #----------------------------------------------------------------------------- | ||
| 6 | |||
| 7 | TARGET_ARCH = "arm" | ||
| 8 | MACHINE_CLASS = "neo1973" | ||
| 9 | PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}" | ||
| 10 | |||
| 11 | PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" | ||
| 12 | UBOOT_ENTRYPOINT = "30008000" | ||
| 13 | |||
| 14 | MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" | ||
| 15 | MACHINE_DISPLAY_WIDTH_PIXELS = "480" | ||
| 16 | MACHINE_DISPLAY_HEIGHT_PIXELS = "640" | ||
| 17 | MACHINE_DISPLAY_ORIENTATION = "0" | ||
| 18 | MACHINE_DISPLAY_PPI = "285" | ||
| 19 | XSERVER = "xserver-kdrive-fbdev" | ||
| 20 | |||
| 21 | MACHINE_EXTRA_RDEPENDS = "usbinit" | ||
| 22 | # package machine specific modules | ||
| 23 | MACHINE_EXTRA_RRECOMMENDS = "\ | ||
| 24 | kernel-module-gta01-pm-bt \ | ||
| 25 | kernel-module-gta01-pm-gps \ | ||
| 26 | kernel-module-gta01-pm-gsm \ | ||
| 27 | kernel-module-gta01kbd \ | ||
| 28 | kernel-module-s3cmci \ | ||
| 29 | kernel-module-snd-soc-neo1973-wm8753 \ | ||
| 30 | kernel-module-snd-soc-smdk2440 \ | ||
| 31 | " | ||
| 32 | |||
| 33 | # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab | ||
| 34 | #SERIAL_CONSOLE = "115200 ttySAC0" | ||
| 35 | |||
| 36 | # used by some images | ||
| 37 | ROOT_FLASH_SIZE = "60" | ||
| 38 | |||
| 39 | # extra jffs2 tweaks | ||
| 40 | IMAGE_FSTYPES ?= "jffs2" | ||
| 41 | EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" | ||
| 42 | |||
| 43 | # build / upload tools | ||
| 44 | #EXTRA_IMAGEDEPENDS += "dfu-util-native" | ||
| 45 | |||
| 46 | # tune for S3C24x0 | ||
| 47 | include conf/machine/include/tune-arm920t.inc | ||
| 48 | |||
diff --git a/meta-extras/conf/machine/om-gta02.conf b/meta-extras/conf/machine/om-gta02.conf deleted file mode 100644 index 55f4bec21d..0000000000 --- a/meta-extras/conf/machine/om-gta02.conf +++ /dev/null | |||
| @@ -1,49 +0,0 @@ | |||
| 1 | #----------------------------------------------------------------------------- | ||
| 2 | #@TYPE: Machine | ||
| 3 | #@NAME: FIC GTA02 (Neo1973) | ||
| 4 | #@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone | ||
| 5 | #----------------------------------------------------------------------------- | ||
| 6 | |||
| 7 | TARGET_ARCH = "arm" | ||
| 8 | MACHINE_CLASS = "neo1973" | ||
| 9 | PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}" | ||
| 10 | |||
| 11 | PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" | ||
| 12 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" | ||
| 13 | UBOOT_ENTRYPOINT = "30008000" | ||
| 14 | |||
| 15 | MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" | ||
| 16 | MACHINE_DISPLAY_WIDTH_PIXELS = "480" | ||
| 17 | MACHINE_DISPLAY_HEIGHT_PIXELS = "640" | ||
| 18 | MACHINE_DISPLAY_ORIENTATION = "0" | ||
| 19 | MACHINE_DISPLAY_PPI = "285" | ||
| 20 | XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev" | ||
| 21 | |||
| 22 | # package machine specific modules | ||
| 23 | MACHINE_EXTRA_RRECOMMENDS = "\ | ||
| 24 | kernel-module-gta01-pm-bt \ | ||
| 25 | kernel-module-gta01-pm-gps \ | ||
| 26 | kernel-module-gta01-pm-gsm \ | ||
| 27 | kernel-module-gta01kbd \ | ||
| 28 | kernel-module-s3cmci \ | ||
| 29 | kernel-module-snd-soc-neo1973-gta02-wm8753 \ | ||
| 30 | " | ||
| 31 | |||
| 32 | SERIAL_CONSOLE = "115200 ttySAC2" | ||
| 33 | |||
| 34 | # used by some images | ||
| 35 | ROOT_FLASH_SIZE = "256" | ||
| 36 | |||
| 37 | # extra jffs2 tweaks | ||
| 38 | IMAGE_FSTYPES ?= "jffs2" | ||
| 39 | EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ | ||
| 40 | --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ | ||
| 41 | --littleendian --pad \ | ||
| 42 | -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ | ||
| 43 | -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" | ||
| 44 | |||
| 45 | # build / upload tools | ||
| 46 | #EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" | ||
| 47 | |||
| 48 | # tune for S3C24x0 | ||
| 49 | include conf/machine/include/tune-arm920t.inc | ||
