summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2008.1.conf15
-rw-r--r--conf/distro/include/angstrom.inc3
2 files changed, 6 insertions, 12 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index a466834968..bb50220f29 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -17,8 +17,8 @@
#DISTRO_VERSION = "2009.X"
DISTRO_VERSION = "2009.X-test-${DATE}"
-DISTRO_REVISION = "1"
-DISTRO_PR = ".1"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".2"
#build staging from packages
INHERIT += "packaged-staging"
@@ -46,7 +46,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}
# set feed path variables
-FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
@@ -99,9 +99,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
# Blackfin has its on gcc
ANGSTROM_GCC_VERSION_bfin = "4.1.2"
-ANGSTROM_GCC_VERSION_486sx = "4.3.3"
-ANGSTROM_GCC_VERSION_armv7a = "4.3.3"
-
# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
@@ -109,10 +106,10 @@ ANGSTROM_GCC_VERSION_armv7a = "4.3.3"
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
#Everybody else can just use this:
-ANGSTROM_GCC_VERSION ?= "4.2.4"
+ANGSTROM_GCC_VERSION ?= "4.3.3"
-#2.19.51.0.3
-ANGSTROM_BINUTILS_VERSION ?= "2.18.50.0.7"
+ANGSTROM_BINUTILS_VERSION ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7"
PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d8c3cd78df..7e921bf06a 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -32,9 +32,6 @@ require conf/distro/include/angstrom-${LIBC}.inc
# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb"
ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"