aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-04-30 12:18:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-30 12:18:39 +0000
commit12d749a064b0f5d15eee64272f457ef0c72d431f (patch)
tree31bf2951818ba0533c8958eb3df42f995e372d33 /conf
parent70bddd3a21749e9b08b9b90ba93aef32428b0147 (diff)
parent0b31a68c7bffc1513f4a2dbd2e63b5cf2625481b (diff)
downloadopenembedded-12d749a064b0f5d15eee64272f457ef0c72d431f.tar.gz
merge of 8b0bc8c41b0802e756c70c90ed7dc760e76bb9bf
and f334192f936949d2ad335312f690105e8371df03
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2006.9.conf6
-rw-r--r--conf/distro/angstrom.conf4
-rw-r--r--conf/machine/blueangel.conf13
3 files changed, 18 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 1a9b03bb27..e3af317d3f 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -14,7 +14,7 @@ FEED_URIS += " \
# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
-SRCDATE = "20060425"
+SRCDATE ?= "20060425"
# Opie
@@ -58,8 +58,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
PREFERRED_VERSION_gcc ?= "4.1.0"
PREFERRED_VERSION_gcc-cross ?= "4.1.0"
PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
-PREFERRED_VERSION_binutils ?= "2.16.91.0.6"
-PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.6"
+PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
+PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
PREFERRED_VERSION_glibc ?= "2.4"
PREFERRED_VERSION_glibc-intermediate ?= "2.4"
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 547436cd1a..40f57430d0 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -36,8 +36,8 @@ BUILD_OPTIMIZATION = "-Os"
TARGET_FPU_arm = "soft"
#Always ship these packages
-BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version dropbear sysvinit"
-BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version dropbear sysvinit"
+BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version coreutils dropbear sysvinit"
+BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version coreutils dropbear sysvinit"
#Name the generated images in a sane way
IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf
index 3f90ccf84c..9c2b94df42 100644
--- a/conf/machine/blueangel.conf
+++ b/conf/machine/blueangel.conf
@@ -19,6 +19,19 @@ BA_MODULES_kernel26 = " evdev tsdev himalaya_tsc2200 himalaya_ts3 asic3_mmc mmc_
pcmcia-core hci_uart blueangel_pcmcia snd-mixer-oss blueangel_audio blueangel_rom blueangel_kp"
# pxa2xx_udc is built in to the kernel
+module_autoload_evdev = "evdev"
+module_autoload_himalaya_tsc2200 = "himalaya_tsc2200"
+module_autoload_himalaya_ts3 = "himalaya_ts3"
+module_autoload_asic3_mmc = "asic3_mmc"
+module_autoload_g_ether = "g_ether"
+module_autoload_blueangel_kp = "blueangel_kp"
+module_autoload_pxa2xx_udc = "pxa2xx_udc"
+module_autoload_blueangel_audio = "blueangel_audio"
+module_autoload_bluenagel_leds = "bleangel_leds"
+module_autoload_hci_uart = "hci_uart"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+
SERIAL_CONSOLE = "115200 tts/2 vt100"
USE_VT = "0"