diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/jlime-donkey.conf | 17 | ||||
| -rw-r--r-- | conf/machine/h5000.conf (renamed from conf/machine/h5xxx.conf) | 4 |
3 files changed, 7 insertions, 16 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f593194ba6..05acebfa8f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -33,7 +33,7 @@ FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5xxx = "armv5te" +FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 2390106023..1ae683b336 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -20,7 +20,7 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - +PREFERRED_PROVIDER_virtual/${ARCH}-linux-libc-for-gcc = "glibc" #<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 @@ -50,18 +50,9 @@ PREFERRED_VERSION_gcc = "4.1.1" PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.4" -PREFERRED_VERSION_glibc-intermediate = "2.4" - -#<>-----------------------------------------------------------------> -#<>Patch for bitbake bug: -#<>Due to bitbake not grabbing glibc 2.4 properly -#<>we need to override it to be sure. Do it for both supported archs -#<>-----------------------------------------------------------------< - -#Add proper line to your local.conf (sh3 for 6xx, arm for 7xx) -#PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_glibc-intermediate = "2.5" #<>------------------------------------------------------------------> #<> diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5000.conf index 5aac579e91..ffc1328f50 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx" require conf/machine/include/tune-xscale.conf @@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb # PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p" MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ |