diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-01-02 00:04:48 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-01-02 00:04:48 +0000 |
| commit | 49377b6bf81825481bb3c949520b7819af605bad (patch) | |
| tree | 1a343f738e97f2b9f8929b7f48c81fe567fb69d4 /conf | |
| parent | 49168b1bd065468e41c98b5c294be98dc90f533e (diff) | |
| parent | 8d7a61dba67097e2b57ee4be1a531a7e3fd2153e (diff) | |
merge of '132be09ee353f798eadc984f8f09e27e68180850'
and 'c0e1d74b2a331789caaf72b458b57924d21c7da3'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 7 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/machine/a780.conf | 3 | ||||
| -rw-r--r-- | conf/machine/ixp4xxle.conf | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 36e1287d03..6ddf8ecaf4 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -153,10 +153,9 @@ S = "${WORKDIR}/${P}" B = "${S}" STAGING_DIR = "${TMPDIR}/staging" -STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin" -# Set these to the same a STAGING_BINDIR for now +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_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin" STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" @@ -217,7 +216,7 @@ EXTRA_IMAGEDEPENDS = "" CROSS_DIR = "${TMPDIR}/cross" CROSS_DATADIR = "${CROSS_DIR}/share" -export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:" +export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:" ################################################################## # Build utility info. diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 11c4ce7dca..5b46a59640 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -67,7 +67,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode -#SRCDATE = "20061029" +#SRCDATE = "20070303" PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index fe3cdbc481..1c3ae63025 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -20,6 +20,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" +#the a780 needs a userspace daemon to stop the BP from shutting down the phone +MACHINE_EXTRA_RDEPENDS += "opentapi" + ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index 347c7ba3fb..d3fcd2b017 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -5,7 +5,9 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" ARCH_BYTE_SEX = "le" -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf +require conf/machine/include/tune-xscale.conf + PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" |