diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/bitbake.conf | 7 | ||||
-rw-r--r-- | conf/distro/angstrom-2007.1-oabi.conf | 17 | ||||
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 3 | ||||
-rw-r--r-- | conf/distro/debianslug.conf | 5 | ||||
-rw-r--r-- | conf/distro/openomap.conf | 3 | ||||
-rw-r--r-- | conf/distro/openslug.conf | 5 | ||||
-rw-r--r-- | conf/documentation.conf | 3 | ||||
-rw-r--r-- | conf/machine/a780.conf | 3 | ||||
-rw-r--r-- | conf/machine/collie.conf | 22 | ||||
-rw-r--r-- | conf/machine/compulab-pxa270.conf | 6 | ||||
-rw-r--r-- | conf/machine/h1940.conf | 5 | ||||
-rw-r--r-- | conf/machine/hx2000.conf | 5 | ||||
-rw-r--r-- | conf/machine/include/collie-2.4.conf | 17 | ||||
-rw-r--r-- | conf/machine/include/collie-2.6.conf | 4 | ||||
-rw-r--r-- | conf/machine/include/qemu.conf | 3 | ||||
-rw-r--r-- | conf/machine/ixp4xxle.conf | 4 | ||||
-rw-r--r-- | conf/machine/omap5912osk.conf | 2 | ||||
-rw-r--r-- | conf/machine/palmld.conf | 4 | ||||
-rw-r--r-- | conf/machine/palmtx.conf | 23 | ||||
-rw-r--r-- | conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | conf/machine/qemux86.conf | 17 |
21 files changed, 121 insertions, 39 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-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf new file mode 100644 index 0000000000..d1541509c5 --- /dev/null +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -0,0 +1,17 @@ +require conf/distro/angstrom-2007.1.conf + +#this is a special version of angstrom for armv4 based machines that can't do EABI +#see http://wiki.debian.org/ArmEabiPort for details on that + +#only glibc based builds are supported ATM +TARGET_OS = "linux" + +FEED_ARCH_collie = "arm" +FEED_ARCH_h3600 = "arm" +FEED_ARCH_h3800 = "arm" +FEED_ARCH_simpad = "arm" + + + + + diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 11c4ce7dca..b95fdb7223 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -32,6 +32,7 @@ FEED_ARCH_a780 = "armv5te" FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" +FEED_ARCH_h3900 = "armv5te" FEED_ARCH_h4000 = "armv5te" FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" @@ -67,7 +68,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/distro/debianslug.conf b/conf/distro/debianslug.conf index 2904db1108..d33ae96c68 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -103,6 +103,11 @@ kernel-module-libata \ kernel-module-pata-artop \ " +# Add modules required for Network support +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index f73a980c52..5819b5ad59 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -23,8 +23,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" # use latest booting kernel but allow to override it in local.conf -PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18-omap1" -#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.18+git" +#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1" #use EABI toolchain diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 8634d091f0..1091aa2e98 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -103,6 +103,11 @@ kernel-module-libata \ kernel-module-pata-artop \ " +# Add modules required for Network support +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-via-velocity \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/documentation.conf b/conf/documentation.conf index 392d1718b6..f5be55eb82 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -105,3 +105,6 @@ COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names su COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking." + +BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure." +BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." 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/collie.conf b/conf/machine/collie.conf index deefa1b698..e7e867e539 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,19 +3,11 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -# -# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash -# no usbgadget feature because 2.4 kernel handle it in own way on each machine -# -MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" +MACHINE_KERNEL_VERSION ?= "2.4" +include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support" - -# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied +PREFERRED_PROVIDER_xserver = "xserver-kdrive" # This is needed for the ramdisk script to work MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" @@ -24,14 +16,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/include/tune-strongarm.conf +IMAGE_FSTYPES ?= "jffs2 tar.gz" -SERIAL_CONSOLE = "115200 ttyS0" +include conf/machine/include/tune-strongarm.conf ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - MACHINE_TASK_PROVIDER = "task-base" +GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 12f82773d4..78bcf6a6f8 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -1,9 +1,9 @@ #@TYPE: Machine #@Name: Compulab PXA270 system -#@DESCRIPTION: Machine configuration for LogicPD PXA270 system -#OLDEST_KERNEL = "2.6.17" +#@DESCRIPTION: Machine configuration for Compulab PXA270 system +#OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" -PREFERRED_VERSION_logicpd-pxa270 = "2.6.17" +PREFERRED_VERSION_compulab-pxa270 = "2.6.16" GUI_MACHINE_CLASS = "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 37f61433c7..e105360b96 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -12,8 +12,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" # Set features for task-base MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" -# Empty modules list for now -HANDHELD_MODULES = "" # Some extra configuration VOLATILE_STORAGE_SIZE = "64" @@ -22,3 +20,6 @@ GUI_MACHINE_CLASS = "smallscreen" SERIAL_CONSOLE = "115200 ttySAC2 vt100" USE_VT = "0" +# tune for armv4t +include conf/machine/include/tune-arm920t.conf + diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index 48a4bbf3e5..900da400b0 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -22,11 +22,6 @@ MODUTILS = "26" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" PCMCIA_MANAGER = "pcmciautils" -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware" - -PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf new file mode 100644 index 0000000000..0412ea359a --- /dev/null +++ b/conf/machine/include/collie-2.4.conf @@ -0,0 +1,17 @@ +PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix" + +SERIAL_CONSOLE = "115200 ttyS0" +# +# no keyboard feature because 2.4 kernel keymap works ok and we have limited flash +# no usbgadget feature because 2.4 kernel handle it in own way on each machine +# +MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ + kernel-module-usbdcore kernel-module-usbdmonitor \ + sharp-sdmmc-support" + +# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied + +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-modules = "0.13e" diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf new file mode 100644 index 0000000000..eab879368c --- /dev/null +++ b/conf/machine/include/collie-2.6.conf @@ -0,0 +1,4 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +SERIAL_CONSOLE = "115200 ttySA0" +MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen" diff --git a/conf/machine/include/qemu.conf b/conf/machine/include/qemu.conf index b314fa9bea..26b78a6a9d 100644 --- a/conf/machine/include/qemu.conf +++ b/conf/machine/include/qemu.conf @@ -7,4 +7,5 @@ MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" IMAGE_FSTYPES ?= "tar.bz2 ext2" -ROOT_FLASH_SIZE = "100" +ROOT_FLASH_SIZE = "200" +IMAGE_ROOTFS_SIZE_ext2 = "200000" 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" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index f8a3472f78..6e704a1f4e 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020" +# PREFERRED_VERSION_u-boot = "1.1.6" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index ec7336fe06..bfb2afe69f 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" -PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk" +PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" @@ -18,6 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf new file mode 100644 index 0000000000..ebfd72de7f --- /dev/null +++ b/conf/machine/palmtx.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: Palm TX +#@DESCRIPTION: Machine configuration for the Palm TX + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen" + +ROOT_FLASH_SIZE = "100" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/include/tune-xscale.conf + +module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf index 371ba927bb..2de34e42c9 100644 --- a/conf/machine/qemuarm.conf +++ b/conf/machine/qemuarm.conf @@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttyAMA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" -MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file +MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf new file mode 100644 index 0000000000..dfbd345ae8 --- /dev/null +++ b/conf/machine/qemux86.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: qemu x86 Emulator setup +#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation + +TARGET_ARCH = "i586" +PACKAGE_EXTRA_ARCHS = "x86" + +require conf/machine/include/qemu.conf + +SERIAL_CONSOLE = "115200 ttyS0" + +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +MACHINE_TASK_PROVIDER = "task-base" |