diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 48 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/fso-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 7 | ||||
| -rw-r--r-- | conf/machine/include/gumstix.inc | 31 | ||||
| -rw-r--r-- | conf/machine/include/tune-cortexa8.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/tune-mips2.inc | 1 | ||||
| -rw-r--r-- | conf/machine/rb500.conf | 3 | ||||
| -rw-r--r-- | conf/machine/wl500g.conf | 2 | ||||
| -rw-r--r-- | conf/machine/wrt54.conf | 3 |
12 files changed, 36 insertions, 72 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ef41dec781..17029ec21e 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -85,42 +85,30 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" #powerpc needs additional patches to gcc -PREFERRED_VERSION_gcc_ppc405 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_ppc405 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_ppc405 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_ppc405 ?= "4.1.1" - -PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" - -PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" - -# GCC 4.3.0 is the first release with armv7-* support -PREFERRED_VERSION_gcc_armv7a = "4.2.3+csl-arm-2008q1-126" -PREFERRED_VERSION_gcc-cross_armv7a = "4.2.3+csl-arm-2008q1-126" -PREFERRED_VERSION_gcc-cross-sdk_armv7a = "4.2.3+csl-arm-2008q1-126" -PREFERRED_VERSION_gcc-cross-initial_armv7a = "4.2.3+csl-arm-2008q1-126" - -PREFERRED_VERSION_gcc ?= "4.2.2" -PREFERRED_VERSION_gcc-cross ?= "4.2.2" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2" -PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2" +ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" +ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" +ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" + +#for proper NEON support we need a CSL toolchain +ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53" + +#avr32 only has support for gcc 4.2.2 +ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" + +#Everybody else can just use this: +ANGSTROM_GCC_VERSION ?= "4.2.2" + +PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc -#avr32 only has patches for binutils 2.17 and gcc 4.2.2 in OE -PREFERRED_VERSION_gcc_avr32 = "4.2.2" -PREFERRED_VERSION_gcc-cross_avr32 = "4.2.2" -PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.2.2" -PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.2.2" +#avr32 only has patches for binutils 2.17 in OE PREFERRED_VERSION_binutils_avr32 = "2.17" PREFERRED_VERSION_binutils-cross_avr32 = "2.17" PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index a9e9f3f7eb..8c76de6f1a 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -24,17 +24,11 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os" -FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -frename-registers -fomit-frame-pointer -O2" -TARGET_CC_ARCH_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp " - FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc-intermediate = "-O2" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -FULL_OPTIMIZATION_pn-glibc_armv7a = " -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp " -CFLAGS_pn-glibc_armv7a = " -fexpensive-optimizations -O3 -fno-tree-vectorize -march=armv7a -frename-registers -fomit-frame-pointer -mfloat-abi=softfp -mfpu=vfp" - BUILD_OPTIMIZATION = "-Os" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2" diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 07340dcb5f..df53515a9a 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -5,5 +5,6 @@ SRCREV_pn-pyneod = "${AUTOREV}" SRCREV_pn-pynoeg = "${AUTOREV}" SRCREV_pn-python-odeviced = "${AUTOREV}" SRCREV_pn-python-ophoned = "${AUTOREV}" +SRCREV_pn-python-ousaged = "${AUTOREV}" SRCREV_pn-python-pytrc = "${AUTOREV}" SRCREV_pn-zhone = "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0edb4ef0ae..c411149cd9 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -1,4 +1,3 @@ -EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}" SRCREV_pn-assassin ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 7721d97ce6..835bfadabe 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE ?= "20080428" +EFL_SRCDATE ?= "20080518" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -80,6 +80,7 @@ SRCDATE_enhance ?= "${EFL_SRCDATE}" SRCDATE_engrave ?= "${EFL_SRCDATE}" SRCDATE_evolve-native ?= "${EFL_SRCDATE}" SRCDATE_evolve ?= "${EFL_SRCDATE}" +SRCDATE_exquisite ?= "${EFL_SRCDATE}" SRCDATE_gevas2 ?= "${EFL_SRCDATE}" SRCDATE_imlib2 ?= "${EFL_SRCDATE}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0e217982e3..293340c478 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -159,8 +159,9 @@ SRCREV_pn-oprofileui ?= "160" SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" -SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965" -SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391" +SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911" +SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6" +SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" @@ -184,4 +185,4 @@ SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" -SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4" +SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b" diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index 8b7d5be188..5aa789e5aa 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -7,15 +7,19 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " +#Compile with armv5te optimizations, incompatible with armv4(t) cpus +require conf/machine/include/tune-xscale.inc + + PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel" KERNEL_IMAGETYPE = "uImage" RDEPENDS_kernel-base = "" + KERNEL_IMAGE_MAXSIZE = "1048577" UBOOT_ENTRYPOINT = "a0008000" MACHINE_FEATURES += "kernel26 " -COMBINED_FEATURES ?= "" IMAGE_FSTYPES = "jffs2 tar.gz" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids" @@ -27,28 +31,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " \ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \ " -# -# The following *should* be in a distro.conf file -# We include them here to avoid creating a new distro - -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" - -PREFERRED_VERSION_gumstix-kernel = "2.6.21" -PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_gnuplot = "4.0.0" -PREFERRED_VERSION_dropbear = "0.47" -PREFERRED_VERSION_wpa-supplicant = "0.5.8" -PREFERRED_VERSION_bluez-utils = "3.24" -PREFERRED_VERSION_bluez-utils-alsa = "3.24" -PREFERRED_VERSION_bluez-libs = "3.24" -PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24" -PREFERRED_VERSION_bluez-hcidump = "1.40" -PREFERRED_VERSION_microwindows = "0.91" -PREFERRED_VERSION_midori = "0.0.15" -PREFERRED_VERSION_jamvm = "1.5.0" -PREFERRED_VERSION_classpath = "0.96" -PREFERRED_VERSION_qtopia-core = "4.3.3" -PREFERRED_VERSION_uicmoc4-native = "4.3.3" - -SRCREV_pn-webkit-gtk = "28656" diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc index 6c3bdb6ee0..f886366f10 100644 --- a/conf/machine/include/tune-cortexa8.inc +++ b/conf/machine/include/tune-cortexa8.inc @@ -3,6 +3,6 @@ # [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html # [3] https://support.codesourcery.com/GNUToolchain/kbentry29 -TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=vfp -mfloat-abi=softfp" +TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" FEED_ARCH = "armv7a" PACKAGE_ARCH = "armv7a" diff --git a/conf/machine/include/tune-mips2.inc b/conf/machine/include/tune-mips2.inc new file mode 100644 index 0000000000..b10d65f23d --- /dev/null +++ b/conf/machine/include/tune-mips2.inc @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-mips2" diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf index e17ca31bcb..30676b2fc4 100644 --- a/conf/machine/rb500.conf +++ b/conf/machine/rb500.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the MIPS based Routerboard TARGET_ARCH = "mipsel" -TARGET_CC_ARCH = "-Os -mips2" PREFERRED_PROVIDER_virtual/kernel = "linux-rb500" + +include conf/machine/include/tune-mips2.inc diff --git a/conf/machine/wl500g.conf b/conf/machine/wl500g.conf index f2e4006a8f..5ed227dfa3 100644 --- a/conf/machine/wl500g.conf +++ b/conf/machine/wl500g.conf @@ -5,4 +5,4 @@ TARGET_ARCH = "mipsel" MACHINE_FEATURES = "kernel26 usbhost wifi ext2" -TARGET_CC_ARCH = "-Os -mips2" +include conf/machine/include/mips2.inc diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index f61570a950..1b07df2666 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Machine configuration for the MIPS based WRT54G(S) devices TARGET_ARCH = "mipsel" -TARGET_CC_ARCH = "-Os" SERIAL_CONSOLE = "tts/0" @@ -31,4 +30,4 @@ INHERIT += "wrt-image" # strip even more: # would be nice but breaks automatic shared library dependencies #DEPENDS_prepend = "${@["elfkickers-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" -#export STRIP = "sstrip"
\ No newline at end of file +#export STRIP = "sstrip" |