From 2000698b17011bbde1c3e5bb01a7d6763316db5a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2012 13:25:58 +0100 Subject: meta-yocto: Split into distro and bsp components Now we have settled on best practises and compliance criteria, bring meta-yocto into compliance by separating out the hardware support components into meta-yocto-bsp leaving policy configuration in meta-yocto. Also rename the meta-yocto scripts directory to OE-Core can be a clearly isolated component in poky. (From meta-yocto rev: eac90e27a032ea23d9a4f35c7eef8b1940c80e22) Signed-off-by: Richard Purdie --- meta-yocto/conf/bblayers.conf.sample | 3 +- meta-yocto/conf/distro/poky.conf | 1 + meta-yocto/conf/machine/atom-pc.conf | 39 -------------------------- meta-yocto/conf/machine/beagleboard.conf | 40 --------------------------- meta-yocto/conf/machine/mpc8315e-rdb.conf | 31 --------------------- meta-yocto/conf/machine/routerstationpro.conf | 26 ----------------- 6 files changed, 3 insertions(+), 137 deletions(-) delete mode 100644 meta-yocto/conf/machine/atom-pc.conf delete mode 100644 meta-yocto/conf/machine/beagleboard.conf delete mode 100644 meta-yocto/conf/machine/mpc8315e-rdb.conf delete mode 100644 meta-yocto/conf/machine/routerstationpro.conf (limited to 'meta-yocto/conf') diff --git a/meta-yocto/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample index edbccf02ce..98bfd70c22 100644 --- a/meta-yocto/conf/bblayers.conf.sample +++ b/meta-yocto/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "5" +LCONF_VERSION = "6" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -8,4 +8,5 @@ BBFILES ?= "" BBLAYERS ?= " \ ##COREBASE##/meta \ ##COREBASE##/meta-yocto \ + ##COREBASE##/meta-yocto-bsp \ " diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf index 5409a7761f..6897ac481a 100644 --- a/meta-yocto/conf/distro/poky.conf +++ b/meta-yocto/conf/distro/poky.conf @@ -9,6 +9,7 @@ MAINTAINER = "Poky " TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "1" +LAYER_CONF_VERSION ?= "6" DISTRO_FEATURES_append = " largefile opengl" diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf deleted file mode 100644 index 46bc71b75d..0000000000 --- a/meta-yocto/conf/machine/atom-pc.conf +++ /dev/null @@ -1,39 +0,0 @@ -#@TYPE: Machine -#@NAME: Atom-PC - -#@DESCRIPTION: Machine configuration for Intel Atom based PCs. Currently supported machines are the Asus eee901, Acer Aspire One, Toshiba NB305, and Intel BlackSand development board. - -include conf/machine/include/tune-atom.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-intel \ - mesa-dri-driver-i915" - -#MACHINE_EXTRA_RDEPENDS = "rt2860" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -APPEND += "usbcore.autosuspend=1" - -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" - -ROOTLESS_X = "1" diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf deleted file mode 100644 index aa8fa07be4..0000000000 --- a/meta-yocto/conf/machine/beagleboard.conf +++ /dev/null @@ -1,40 +0,0 @@ -#@TYPE: Machine -#@NAME: Beagleboard machine -#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite" -XSERVER ?= "xserver-xorg-lite \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-omapfb \ - xf86-input-keyboard" - -# Ship all kernel modules by default -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" - -# Allow for MMC booting (required by the NAND-less Beagleboard XM) -EXTRA_IMAGEDEPENDS += "u-boot x-load" - -# Uncomment the following line to enable the hard floating point abi. Note that -# this breaks some binary libraries and 3D (neither of which ship with -# meta-yocto). For maximum compatibility, leave this disabled. -#DEFAULTTUNE ?= "cortexa8hf-neon" -include conf/machine/include/tune-cortexa8.inc - -IMAGE_FSTYPES += "tar.bz2 jffs2" -EXTRA_IMAGECMD_jffs2 = "-lnp " - -# 2.6.37 and later kernels use OMAP_SERIAL, ttyO2 -# earlier kernels use ttyS2 -SERIAL_CONSOLE = "115200 ttyO2" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" - -KERNEL_IMAGETYPE = "uImage" - -UBOOT_MACHINE = "omap3_beagle_config" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" - -MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa" diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf deleted file mode 100644 index 266f9d4978..0000000000 --- a/meta-yocto/conf/machine/mpc8315e-rdb.conf +++ /dev/null @@ -1,31 +0,0 @@ -#@TYPE: Machine -#@DESCRIPTION: Machine configuration for running - -TARGET_FPU = "" - -require conf/machine/include/tune-ppc603e.inc - -KERNEL_IMAGETYPE = "uImage" - -EXTRA_IMAGEDEPENDS += "u-boot" -UBOOT_MACHINE_mpc8315e-rdb = "MPC8315ERDB_config" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" - -PREFERRED_VERSION_linux-yocto ?= "3.4%" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-extmod \ - xf86-input-evdev \ - xf86-video-fbdev" - -PREFERRED_VERSION_u-boot ?= "v2012.04%" -UBOOT_ENTRYPOINT = "0x00000000" - -KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/mpc8315erdb.dts" - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf deleted file mode 100644 index 707392d0c8..0000000000 --- a/meta-yocto/conf/machine/routerstationpro.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine -#@NAME: mti_malta32_be MIPS -#@DESCRIPTION: mti_malta32_be - -require conf/machine/include/tune-mips32.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" - -KERNEL_IMAGETYPE = "vmlinux" -KERNEL_ALT_IMAGETYPE = "vmlinux.bin" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.4%" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-extmod \ - xf86-input-evdev \ - xf86-video-fbdev" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" - -IMAGE_FSTYPES ?= "jffs2 tar.bz2" - -- cgit v1.2.3-54-g00ecf