diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 150 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 4 | ||||
| -rw-r--r-- | conf/machine/amsdelta.conf | 7 | ||||
| -rw-r--r-- | conf/machine/compulab-pxa270.conf | 2 | ||||
| -rw-r--r-- | conf/machine/gumstix.conf | 1 | ||||
| -rw-r--r-- | conf/machine/h1940.conf | 2 | ||||
| -rw-r--r-- | conf/machine/lite5200.conf | 3 | ||||
| -rw-r--r-- | conf/machine/logicpd-pxa270.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mtx-3.conf | 9 | ||||
| -rw-r--r-- | conf/machine/mtx-3a.conf | 6 | ||||
| -rw-r--r-- | conf/machine/rb500.conf | 1 | ||||
| -rw-r--r-- | conf/machine/triton.conf | 2 |
14 files changed, 132 insertions, 60 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index dc3378fd95..d642998e8d 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -168,6 +168,7 @@ STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin" STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" +STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 282b0532b9..dee674abea 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -33,62 +33,142 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)} FEED_ARCH ?= "${TARGET_ARCH}" +#blackfin machines +FEED_ARCH_bfin = "blackfin" + #armv4t machines +FEED_ARCH_acern30 = "armv4t" +FEED_ARCH_amsdelta = "armv4t" FEED_ARCH_ep93xx = "armv4t" -FEED_ARCH_h6300 = "armv4t" -FEED_ARCH_fic-gta01 = "armv4t" -FEED_ARCH_fic-gta02 = "armv4t" -FEED_ARCH_fic-hxd8 = "armv4t" +FEED_ARCH_eteng500 = "armv4t" +FEED_ARCH_fic-gta01 = "armv4t" +FEED_ARCH_fic-gta02 = "armv4t" +FEED_ARCH_h1940 = "armv4t" +FEED_ARCH_h6300 = "armv4t" +FEED_ARCH_kb9202 = "armv4t" +FEED_ARCH_ks8695 = "armv4t" +FEED_ARCH_rx1950 = "armv4t" +FEED_ARCH_rx3000 = "armv4t" +FEED_ARCH_sarge-at91 = "armv4t" +FEED_ARCH_smdk2440 = "armv4t" +FEED_ARCH_smdk2443 = "armv4t" #armv5t machines +FEED_ARCH_a1200 = "armv5te" FEED_ARCH_a780 = "armv5te" -FEED_ARCH_aximx50 = "armv5te" -FEED_ARCH_akita = "armv5te" +FEED_ARCH_akita = "armv5te" +FEED_ARCH_asus620 = "armv5te" +FEED_ARCH_asus730 = "armv5te" FEED_ARCH_at91sam9263ek = "armv5te" -FEED_ARCH_c7x0 = "armv5te" +FEED_ARCH_aximx50 = "armv5te" +FEED_ARCH_aximx50v = "armv5te" +FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_compulab-pxa270 = "armv5te" -FEED_ARCH_h2200 = "armv5te" -FEED_ARCH_h3900 = "armv5te" -FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5000 = "armv5te" -FEED_ARCH_htctornado = "armv5te" +FEED_ARCH_devkitidp-pxa255 = "armv5te" +FEED_ARCH_e680 = "armv5te" +FEED_ARCH_er0100 = "armv5te" +FEED_ARCH_gumstix = "armv5te" +FEED_ARCH_h1910 = "armv5te" +FEED_ARCH_h2200 = "armv5te" +FEED_ARCH_h3900 = "armv5te" +FEED_ARCH_h4000 = "armv5te" +FEED_ARCH_h5000 = "armv5te" +FEED_ARCH_htcalpine = "armv5te" +FEED_ARCH_htcapache = "armv5te" +FEED_ARCH_htcblueangel = "armv5te" +FEED_ARCH_htchimalaya = "armv5te" +FEED_ARCH_htcsable = "armv5te" +FEED_ARCH_htctornado = "armv5te" FEED_ARCH_htcuniversal = "armv5te" -FEED_ARCH_hx2000 = "armv5te" -FEED_ARCH_hx4700 = "armv5te" -FEED_ARCH_ixp4xx = "armv5te" -FEED_ARCH_ixp4xxle = "armv5te" -FEED_ARCH_magician = "armv5te" -FEED_ARCH_netbook-pro = "armv5te" -FEED_ARCH_nokia770 = "armv5te" -FEED_ARCH_omap5912osk = "armv5te" -FEED_ARCH_poodle = "armv5te" -FEED_ARCH_spitz = "armv5te" -FEED_ARCH_tosa = "armv5te" - - -FEED_ARCH_ixp4xxbe = "armv5teb" +FEED_ARCH_hx2000 = "armv5te" +FEED_ARCH_hx4700 = "armv5te" +FEED_ARCH_ixp4xxle = "armv5te" +FEED_ARCH_logicpd-pxa270 = "armv5te" +FEED_ARCH_looxc550 = "armv5te" +FEED_ARCH_lsarm = "armv5te" +FEED_ARCH_magician = "armv5te" +FEED_ARCH_mainstone = "armv5te" +FEED_ARCH_mnci = "armv5te" +FEED_ARCH_mtx-3 = "armv5te" +FEED_ARCH_mx21ads = "armv5te" +FEED_ARCH_n2100 = "armv5te" +FEED_ARCH_navman-icn330 = "armv5te" +FEED_ARCH_netbook-pro = "armv5te" +FEED_ARCH_nokia770 = "armv5te" +FEED_ARCH_rokre2 = "armv5te" +FEED_ARCH_nslu2le = "armv5te" +FEED_ARCH_omap1510inn = "armv5te" +FEED_ARCH_omap1610h2 = "armv5te" +FEED_ARCH_omap1710h3 = "armv5te" +FEED_ARCH_omap5912osk = "armv5te" +FEED_ARCH_palmld = "armv5te" +FEED_ARCH_palmt650 = "armv5te" +FEED_ARCH_palmt680 = "armv5te" +FEED_ARCH_palmtc = "armv5te" +FEED_ARCH_palmtt = "armv5te" +FEED_ARCH_palmtt3 = "armv5te" +FEED_ARCH_palmtt5 = "armv5te" +FEED_ARCH_palmtx = "armv5te" +FEED_ARCH_palmz31 = "armv5te" +FEED_ARCH_palmz71 = "armv5te" +FEED_ARCH_palmz72 = "armv5te" +FEED_ARCH_poodle = "armv5te" +FEED_ARCH_qemuarm = "armv5te" +FEED_ARCH_spitz = "armv5te" +FEED_ARCH_tosa = "armv5te" +FEED_ARCH_triton = "armv5te" + +FEED_ARCH_ixp4xxbe = "armv5teb" +FEED_ARCH_nslu2be = "armv5teb" + +#i486 machines +FEED_ARCH_geodegx = "i486" +FEED_ARCH_geodelx = "i486" +FEED_ARCH_netvista = "i486" +FEED_ARCH_wrap = "i486" +FEED_ARCH_x86 = "i486" #i586 machines -FEED_ARCH_epia = "i586" +FEED_ARCH_epia = "i586" +FEED_ARCH_i586-generic = "i586" +FEED_ARCH_qemux86 = "i586" #i686 machines -FEED_ARCH_guinness = "i686" -FEED_ARCH_progear = "i686" +FEED_ARCH_alix = "i686" +FEED_ARCH_colinux = "i686" +FEED_ARCH_guinness = "i686" +FEED_ARCH_i686-generic = "i686" +FEED_ARCH_progear = "i686" #powerpc machines -FEED_ARCH_efika = "ppc603e" +FEED_ARCH_dht-walnut = "ppc405" +FEED_ARCH_magicbox = "ppc405" +FEED_ARCH_xilinx-ml403 = "ppc405" +FEED_ARCH_xilinx-ml410 = "ppc405" +FEED_ARCH_sequoia = "ppc440e" +FEED_ARCH_efika = "ppc603e" +FEED_ARCH_lite5200 = "ppc603e" +FEED_ARCH_lsppchd = "ppc603e" +FEED_ARCH_lsppchg = "ppc603e" +FEED_ARCH_storcenter = "ppc603e" +FEED_ARCH_turbostation = "ppc603e" + #strongarm machines, no EABI -FEED_ARCH_collie = "arm-oabi" -FEED_ARCH_h3600 = "arm-oabi" -FEED_ARCH_h3800 = "arm-oabi" -FEED_ARCH_simpad = "arm-oabi" -FEED_ARCH_htcwallaby = "arm-oabi" +FEED_ARCH_collie = "arm-oabi" +FEED_ARCH_h3600 = "arm-oabi" +FEED_ARCH_h3800 = "arm-oabi" +FEED_ARCH_htcwallaby = "arm-oabi" +FEED_ARCH_jornada56x = "arm-oabi" +FEED_ARCH_jornada7xx = "arm-oabi" +FEED_ARCH_shark = "arm-oabi" +FEED_ARCH_simpad = "arm-oabi" + #Tweak packaging for strongarm machines since they can't use EABI diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index 0681b01d3d..fa66d61a0a 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -103,7 +103,7 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2" PREFERRED_VERSION_xrandr = "1.2.2" PREFERRED_VERSION_xrdb = "1.0.3" PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" -PREFERRED_VERSION_xserver-xorg = "1.1.0" +PREFERRED_VERSION_xserver-xorg = "1.3.0.0" PREFERRED_VERSION_xset = "1.0.2" PREFERRED_VERSION_xtrans = "1.0.3" PREFERRED_VERSION_xtrans-native = "1.0.3" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 00b9440b1f..acfe23d742 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.5" +SLUGOS_VERSION = "4.6" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -145,3 +145,5 @@ IGNORE_STRIP_ERRORS = "" #PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" PREFERRED_VERSION_linux-libc-headers = "2.6.18" + +PREFERRED_VERSION_openssh ?= "4.6p1" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index d4877a1724..c17bf7d520 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -3,16 +3,15 @@ #@DESCRIPTION: Machine configuration for the Amstrad E3 TARGET_ARCH = "arm" - -TARGET_FPU = "soft" +PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" PREFERRED_PROVIDER_virtual/kernel = "linux-amsdelta-2.6" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" EXTRA_IMAGEDEPENDS += "u-boot linux-amsdelta-2.6" -BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral mtd-utils udev" +MACHINE_FEATURES = "screen usbhost usbgadget kernel26 apm alsa" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 063a68481a..b1e7082fd7 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for Compulab PXA270 system #OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" -PREFERRED_VERSION_compulab-pxa270 = "2.6.16" +PREFERRED_VERSION_compulab-pxa270 = "2.6.22" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index 510de49a3f..e259477a7b 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Gumstix pxa2xx boards TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 3afec8be27..bc30eb780b 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -2,7 +2,7 @@ #@NAME: h1940 #@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940 -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t" TARGET_ARCH = "arm" # Set preferred providers diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index f47e773717..26d2d655ce 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -3,9 +3,6 @@ PACKAGE_EXTRA_ARCHS = "ppc" UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" - -TARGET_PREFIX = "powerpc-603e-linux-gnu-" - IMAGE_FSTYPES = "jffs2 tar.bz2" require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index f4dd576653..2038aa483f 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -7,7 +7,7 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.19.2" GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" -PACKAGE_EXTRA_ARCHS = "armv4 armv5te" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf index dd848ea021..020c5075a3 100644 --- a/conf/machine/mtx-3.conf +++ b/conf/machine/mtx-3.conf @@ -8,25 +8,20 @@ # TARGET_ARCH should be set here in the machine configuration. # For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " +require conf/machine/include/tune-arm926ejs.conf -PACKAGE_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" -TARGET_CC_ARCH = "-march=armv5te" -#-mtune=arm926ejs" - USE_DEVFS = "1" USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0 vt100" BOOTSTRAP_EXTRA_RDEPENDS += "" -#PREFERRED_VERSION_yamon = "2.24" - - # FIXME: old srec files as mtx-2 used to do it ... this may need to get adapted sometime! # create srec files diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf index 000b200840..cb1b129660 100644 --- a/conf/machine/mtx-3a.conf +++ b/conf/machine/mtx-3a.conf @@ -2,12 +2,10 @@ #@NAME: 4G Systems mtx-3a #@DESCRIPTION: Machine configuration for the mtx-3a +include conf/machine/mtx-3.conf + TARGET_ARCH = "arm" -PACKAGE_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" -TARGET_CC_ARCH = "-march=armv5te" -USE_DEVFS = "1" USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0 vt100" -BOOTSTRAP_EXTRA_RDEPENDS += "" diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf index ab669aee49..e17ca31bcb 100644 --- a/conf/machine/rb500.conf +++ b/conf/machine/rb500.conf @@ -4,5 +4,4 @@ TARGET_ARCH = "mipsel" TARGET_CC_ARCH = "-Os -mips2" -PACKAGE_ARCHS = "all mipsel ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-rb500" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index d79c23e4ac..ab98a07278 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the XScale based triton boards from KaRo Electronics TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" |