diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/bitbake.conf | 2 | ||||
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 3 | ||||
-rw-r--r-- | conf/distro/angstrom-2010.x.conf | 3 | ||||
-rw-r--r-- | conf/distro/include/angstrom-2010-preferred-versions.inc | 4 | ||||
-rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
-rw-r--r-- | conf/distro/jlime-2010.1.conf | 30 | ||||
-rw-r--r-- | conf/distro/kaeilos-2010.conf | 3 | ||||
-rw-r--r-- | conf/distro/kaeilos.conf | 3 | ||||
-rw-r--r-- | conf/distro/minimal.conf | 6 | ||||
-rw-r--r-- | conf/distro/shr.conf | 6 | ||||
-rw-r--r-- | conf/machine/chumby-falconwing.conf | 22 | ||||
-rw-r--r-- | conf/machine/efikamx.conf | 4 | ||||
-rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
-rw-r--r-- | conf/machine/jornada7xx.conf | 2 | ||||
-rw-r--r-- | conf/machine/mini6410.conf | 48 | ||||
-rw-r--r-- | conf/machine/nokia900.conf | 11 | ||||
-rw-r--r-- | conf/machine/rx1950.conf | 12 |
17 files changed, 98 insertions, 65 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 677c76a2f7..b0994995cb 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -295,7 +295,6 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/sysroots" -STAGING_DIR_JAVA = "${STAGING_DIR}/java" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}" @@ -321,6 +320,7 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" # This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine # specific packages - hack around it for now. STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}" +STAGING_DIR_JAVA = "${STAGING_DATADIR}/java" STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 8f66ae929b..ec4f21e864 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,9 +20,6 @@ DISTRO_PR = ".6" OLDEST_KERNEL ?= "2.6.16" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/angstrom-2008-preferred-versions.inc diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf index 8260647517..b8724503e8 100644 --- a/conf/distro/angstrom-2010.x.conf +++ b/conf/distro/angstrom-2010.x.conf @@ -25,9 +25,6 @@ DISTRO_PR = ".7" OLDEST_KERNEL ?= "2.6.16" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/angstrom-2010-preferred-versions.inc diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc index 8212c2f45e..2c6c7ba27c 100644 --- a/conf/distro/include/angstrom-2010-preferred-versions.inc +++ b/conf/distro/include/angstrom-2010-preferred-versions.inc @@ -9,8 +9,8 @@ PREFERRED_VERSION_autoconf = "2.65" PREFERRED_VERSION_autoconf-native = "2.65" PREFERRED_VERSION_automake = "1.11.1" PREFERRED_VERSION_automake-native = "1.11.1" -PREFERRED_VERSION_busybox = "1.13.2" -PREFERRED_VERSION_cairo = "1.8.10" +PREFERRED_VERSION_busybox = "1.17.1" +PREFERRED_VERSION_cairo = "1.10.0" PREFERRED_VERSION_dbus = "1.2.24" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.8.0" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 430e85904d..4c509c6aef 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -53,7 +53,7 @@ USE_NLS_glib-2.0 = "yes" USE_NLS_glib-2.0-native = "yes" USE_NLS_gcc-cross = "no" -INHERIT += "package_ipk debian testlab packaged-staging siteinfo" +INHERIT += "package_ipk debian testlab siteinfo" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf index f62ca9970e..37e71d35b1 100644 --- a/conf/distro/jlime-2010.1.conf +++ b/conf/distro/jlime-2010.1.conf @@ -67,18 +67,10 @@ PREFERRED_PROVIDER_gtk+ = "gtk+" PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static" PREFERRED_PROVIDER_bluez-libs = "bluez-libs" -PREFERRED_VERSION_gcc = "4.4.2" -PREFERRED_VERSION_gcc-cross = "4.4.2" -PREFERRED_VERSION_gcc-cross-initial = "4.4.2" -PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2" -PREFERRED_VERSION_binutils = "2.20" -PREFERRED_VERSION_binutils-cross = "2.20" -PREFERRED_VERSION_coreutils-native = "7.2" - # # Target OS & FPU system # -TARGET_OS = "linux" +TARGET_OS = "linux-gnueabi" TARGET_FPU_sh = "soft" TARGET_FPU_arm = "soft" @@ -86,12 +78,18 @@ TARGET_FPU_armeb = "soft" TARGET_FPU_mipsel = "soft" TARGET_FPU_mips = "soft" -LIBC = "glibc" -require conf/distro/include/${LIBC}.inc +DISTRO_FEATURES += " eabi " + +LIBC ?= "eglibc" +require conf/distro/include/sane-toolchain.inc +require conf/distro/include/arm-thumb.inc + + -PREFERRED_VERSION_linux-libc-headers = "2.6.31" -PREFERRED_VERSION_glibc-initial = "2.9" -PREFERRED_VERSION_glibc = "2.9" +PREFERRED_PROVIDER_virtual/libc = "${LIBC}" +PREFERRED_VERSION_eglibc ?= "2.11" +PREFERRED_VERSION_eglibc-initial ?= "2.11" +PREFERRED_VERSION_linux-libc-headers = "2.6.34" # # Bootstrap & Init @@ -109,13 +107,9 @@ PREFERRED_PROVIDER_virtual/libx11-native = "libx11-native" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib" PREFERRED_PROVIDER_tslib = "tslib" -PREFERRED_VERSION_mesa = "7.6" -PREFERRED_VERSION_mesa-dri = "7.6" -PREFERRED_VERSION_mesa-xlib = "7.6" SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev " # # General Userspace # require conf/distro/include/preferred-opie-versions-1.2.4.inc -PREFERRED_VERSION_cdparanoia = "10.2" diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf index 4828dce873..0101705dc7 100644 --- a/conf/distro/kaeilos-2010.conf +++ b/conf/distro/kaeilos-2010.conf @@ -18,9 +18,6 @@ DISTRO_PR = ".1" OLDEST_KERNEL ?= "2.6.28" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/kaeilos-2009-preferred-versions.inc diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 78a69f110f..1287ea1dac 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -20,9 +20,6 @@ DISTRO_PR = ".5" OLDEST_KERNEL ?= "2.6.16" -#build staging from packages -INHERIT += "packaged-staging" - require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc require conf/distro/include/kaeilos-2009-preferred-versions.inc diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 2f3a8217a8..376ffdee02 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -46,12 +46,6 @@ DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK' INHERIT += "debian" ############################################################################# -# STAGING AREA -############################################################################# -# Controlled by packaging system -INHERIT += "packaged-staging" - -############################################################################# # PACKAGING & FEEDS ############################################################################# # Chose the packaging system diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 1191d8c88c..9dd1c3e30d 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -122,12 +122,6 @@ DISTRO_FEATURES += " tk " INHERIT += "debian" ############################################################################# -# STAGING AREA -############################################################################# -# Controlled by packaging system -INHERIT += "packaged-staging" - -############################################################################# # PACKAGING & FEEDS ############################################################################# # Chose the packaging system diff --git a/conf/machine/chumby-falconwing.conf b/conf/machine/chumby-falconwing.conf new file mode 100644 index 0000000000..e451c5ce49 --- /dev/null +++ b/conf/machine/chumby-falconwing.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@Name: chumby Falconwing i.MX233-based boards +#@DESCRIPTION: Machine configuration for chumby Falconwing platform + +TARGET_ARCH = "arm" + +MACHINE_GUI_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "240" + +PREFERRED_PROVIDER_virtual/kernel = "linux-imx" +PREFERRED_PROVIDER_virtual/bootloader = "bootstream-chumby-falconwing" + +require conf/machine/include/tune-arm926ejs.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyAM0" + +ROOT_FLASH_SIZE = "128" + +MACHINE_FEATURES = "kernel26 usbhost touchscreen ext2 ext3 vfat keyboard alsa" +IMAGE_FSTYPES = "ext3.gz tar.gz" diff --git a/conf/machine/efikamx.conf b/conf/machine/efikamx.conf index 935649b240..ffc0cc96f8 100644 --- a/conf/machine/efikamx.conf +++ b/conf/machine/efikamx.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@Name: Genisi EFIKA MX Development Platform -#@DESCRIPTION: Machine configuration for the EFIKA development platform (http://www.powerdeveloper.org/platforms/efikamx) +#@Name: Genesi EFIKA MX Development Platform +#@DESCRIPTION: Machine configuration for the EFIKA MX development platform (http://www.powerdeveloper.org/platforms/efikamx) TARGET_ARCH = "arm" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 1052296d8a..60ec0ff42a 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,7 +3,7 @@ SOC_FAMILY = "omap3" require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r88" +MACHINE_KERNEL_PR = "r89" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 8741eb4ff6..64fca12069 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -9,4 +9,4 @@ require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat" -MACHINE_EXTRA_RDEPENDS = "kernel-modules" +MACHINE_EXTRA_RDEPENDS = "kernel-modules bluez-dtl1-workaround" diff --git a/conf/machine/mini6410.conf b/conf/machine/mini6410.conf new file mode 100644 index 0000000000..494de25131 --- /dev/null +++ b/conf/machine/mini6410.conf @@ -0,0 +1,48 @@ +#@TYPE: Machine +#@Name: FriendlyARM Mini6410 +#@DESCRIPTION: Machine configuration for FriendlyARM Mini6410 Dev Board + +TARGET_ARCH = "arm" + +# Definitions matching the default kit display +MACHINE_DISPLAY_WIDTH_PIXELS ?= "480" +MACHINE_DISPLAY_HEIGHT_PIXELS ?= "272" +MACHINE_DISPLAY_ORIENTATION ?= "0" +MACHINE_DISPLAY_PPI ?= "120" +GUI_MACHINE_CLASS = "bigscreen" + +SERIAL_CONSOLE ?= "115200 ttySAC0" +UBOOT_ENTRYPOINT = "50008000" + +# Software selections +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-tslib \ + xf86-video-fbdev \ + xf86-input-keyboard \ + xf86-input-mouse \ +" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +# Filesystem parameter +ROOT_FLASH_SIZE ?= "128" + +MKUBIFS_ARGS = "-m 2048 -e 129024 -c 512" +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" + +EXTRA_IMAGECMD_jffs2 = " -e 128KiB -l -p ; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 128KiB -p -l " + +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +MACHINE_FEATURES = "kernel26 alsa ext2 keyboard screen touchscreen usbgadget usbhost vfat" + +# Output files +KERNEL_IMAGETYPE = "uImage" +IMAGE_FSTYPES = "tar.bz2 ubi" + + +require conf/machine/include/tune-arm1176jzf-s.inc + diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 4ceb936c61..b1b8a870ad 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -1,7 +1,11 @@ #@TYPE: Machine #@NAME: Nokia 900 internet tablet #@DESCRIPTION: Machine configuration for the Nokia 900 + TARGET_ARCH = "arm" +SOC_FAMILY = "omap3" +require conf/machine/include/tune-cortexa8.inc + PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER = "xserver-xorg \ @@ -13,15 +17,12 @@ GUI_MACHINE_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "800" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -require conf/machine/include/omap3.inc - -# omap3.inc redefine it to uImage KERNEL_IMAGETYPE = "zImage" ROOT_FLASH_SIZE = "100" EXTRA_IMAGECMD_jffs2_nokia900 = "--pad --little-endian --eraseblock=0x20000 -n" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "jffs2 tar.gz" SERIAL_CONSOLE = "115200 ttyS0" @@ -35,4 +36,4 @@ MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat" # Copied from include/omap3.inc (as we do not use linux-omap recipes): # # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r52" +MACHINE_KERNEL_PR = "r53" diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index fb70437bd8..d43a2dc8db 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -20,17 +20,9 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda wifi usbgadget screen vfa # # Software/packages selection # -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.35" PCMCIA_MANAGER = "pcmciautils" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" - -# -# Modules autoload and other boot properties -# -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" - -require conf/machine/include/LAB-settings.inc |