diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 69 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 1 | ||||
| -rw-r--r-- | conf/documentation.conf | 2 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 11 | ||||
| -rw-r--r-- | conf/machine/h4000.conf | 14 | ||||
| -rw-r--r-- | conf/machine/h5xxx.conf | 22 | ||||
| -rw-r--r-- | conf/machine/htcuniversal.conf | 25 | ||||
| -rw-r--r-- | conf/machine/hx2000.conf | 49 | ||||
| -rw-r--r-- | conf/machine/hx4700.conf | 64 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 3 |
11 files changed, 171 insertions, 92 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 02a072ca66..756ce7675e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -313,7 +313,8 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge" -GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source" +GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" +GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 87c3dde12d..11d47f11c8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -16,14 +16,14 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ - base##${ANGSTROM_URI}/unstable/feed/base \ - perl##${ANGSTROM_URI}/unstable/feed/perl \ - python##${ANGSTROM_URI}/unstable/feed/python \ - debug##${ANGSTROM_URI}/unstable/feed/debug \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" -# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ -# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ -# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \ + perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \ + python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \ + debug##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/debug \ + ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}" +# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/base \ +# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/machine/${MACHINE} \ +# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates" #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" @@ -114,9 +114,9 @@ PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" PREFERRED_VERSION_binutils ?= "2.17" PREFERRED_VERSION_binutils-cross ?= "2.17" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" # To use an EABI compatible version 3 series gcc, either uncomment # the lines below or set them in local.conf: @@ -139,20 +139,8 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" PREFERRED_VERSION_hostap-modules ?= "0.4.7" #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad +# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad -#### Bootstrap options #### - -PCMCIA_MANAGER_c7x0 = "pcmciautils" -PCMCIA_MANAGER_akita = "pcmciautils" -PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_tosa = "pcmciautils" -PCMCIA_MANAGER_poodle = "pcmciautils" -PCMCIA_MANAGER_nokia770 = "pcmciautils" -PCMCIA_MANAGER_h2200 = "pcmciautils" -PCMCIA_MANAGER_h4000 = "pcmciautils" -PCMCIA_MANAGER_h6300 = "pcmciautils" -PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" # add altboot to compatible models, will be replaced with angstrom-bootmanager #EXTRA_STUFF_append_c7x0 = "altboot" @@ -161,20 +149,27 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" #EXTRA_STUFF_append_poodle = "altboot" #EXTRA_STUFF_append_tosa = "altboot" -### GPE section ### -#Install libgtkinput in devices without a keyboard -GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" -GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" -GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" +# do some task-base stuff here + +# We want to ship extra debug utils in the rootfs when doing a debug build +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb procps",d)}' + +#this should go away soon +EXTRA_STUFF ?= "" -#As soon as a kill switch is in place we can add it to devices with a keyboard -#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" -#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" -#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" -#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +# Angstrom want to ship some extra stuff. This should be moved into task-base eventually +DISTRO_EXTRA_RDEPENDS = "\ + update-modules module-init-tools modutils-initscripts \ + sysvinit initscripts sysvinit-pidof \ + psplash \ + netbase dropbear \ + angstrom-version \ + ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + " diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index fb753dc85e..a1132209ad 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -34,6 +34,7 @@ SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" +SRCDATE_psplash ?= "20061011" SRCDATE_zaurusd ?= "20060628" # GPE diff --git a/conf/documentation.conf b/conf/documentation.conf index feb572db46..9996b27d48 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -57,7 +57,7 @@ PRIORITY[doc] = "Importance of package, default values are 'optional' or 'needed DESCRIPTION[doc] = "A small description of the package." LICENSE[doc] = "The license of the resulting package e.g. GPL" AUTHOR[doc] = "The author of the files installed." -MAINTAINER[doc] = "Maintainer of the .bb file and the resulting package." +MAINTAINER[doc] = "Distributions can put this in their .conf file to add their contact information into packages, this is not valid inside recipes" HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net." diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 65f27085f4..1ead1aa919 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -16,23 +16,14 @@ PCMCIA_MANAGER = "pcmciautils" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" - -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${H2200_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils h2200-bootloader kernel udev module-init-tools" - -#ship in rootfs: -H2200_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" +MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel" #autoload on boot: module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" - USE_VT = "0" -include conf/machine/include/handheld-common.conf - GUI_MACHINE_CLASS = "smallscreen" include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 41301c1721..c12e487bf7 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,35 +2,25 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx -INHERIT += "linux_modules" TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h4000" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" ROOT_FLASH_SIZE = "32" -MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" -BOOT_MODULES = " ${@linux_module_packages('${H4000_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS = " ${BOOT_MODULES}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " mtd-utils kernel udev module-init-tools" - -#ship in rootfs: -H4000_MODULES = "g_ether g_serial g_file_storage snd-pcm-oss" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" #autoload on boot: module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" - USE_VT = "0" -include conf/machine/include/handheld-common.conf - GUI_MACHINE_CLASS = "smallscreen" include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 2ab9775419..6e9e951132 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -2,17 +2,10 @@ #@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx #@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices -#KERNEL ?= "kernel24" -KERNEL ?= "kernel26" - -OVERRIDES =. "${KERNEL}:" - -INHERIT += "linux_modules" TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" @@ -20,18 +13,17 @@ ROOT_FLASH_SIZE = "32" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" -BOOT_MODULES = "${@linux_module_packages('${H5XXX_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${BOOT_MODULES}" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" -BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" -H5XXX_MODULES_kernel24 = " g_ether pxa2xx_udc h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mtdchar h5400-audio" -H5XXX_MODULES_kernel26 = " h5400_lcd g_ether apm h5400_battery pcmcia-core" -# pxa2xx_udc is built in to the kernel +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" +MACHINE_EXTRA__RRECOMMENDS = " \ + kernel-module-h5400_lcd \ + kernel-module-h5400_battery \ + " + + SERIAL_CONSOLE = "115200 tts/0 vt100" -USE_DEVFS_kernel24 = "1" USE_VT = "0" GUI_MACHINE_CLASS = "smallscreen" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 8fae31d9f8..86b46dcbca 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -13,19 +13,18 @@ XSERVER = "xserver-kdrive-fbdev" MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen" MODUTILS = "26" -BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${UN_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" -BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus" -BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" -PXA270_MODULES = "acx g_ether g_file_storage pxa27x_udc bsd_comp \ - snd_pcm_oss snd_mixer_oss \ - hidp bluetooth bfusb hci_usb \ - irtty-sir pxaficp_ir sir-dev \ - " - -include conf/machine/include/smartphone-common.conf +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" +MACHINE_EXTRA__RRECOMMENDS = " kernel-module-nls_cp437 \ + kernel-module-nls_iso8859-1 \ + kernel-module-nls_utf8 \ + kernel-module-af_key \ + kernel-module-bsd_comp \ + kernel-module-i2c-pxa \ + kernel-module-htcuniversal_power \ + kernel-module-snd-htcuniversal_audio \ + kernel-module-htcuniversal_acx \ + " GUI_MACHINE_CLASS = "bigscreen" @@ -35,8 +34,6 @@ include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first #include conf/machine/include/tune-iwmmxt.conf -UN_MODULES = "i2c-pxa htcuniversal_acx htcuniversal_power snd-htcuniversal_audio" - module_autoload_acx = "acx" module_autoload_htcuniversal_acx = "htcuniversal_acx" diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf new file mode 100644 index 0000000000..0a88932e3e --- /dev/null +++ b/conf/machine/hx2000.conf @@ -0,0 +1,49 @@ +#@TYPE: Machine +#@NAME: iPAQ hx2xxx +#@DESCRIPTION: Machine configuration for the hx2000 iPAQs with a pxa27x CPU + +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" + +#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" + +PREFERRED_VERSION_orinoco-modules = "0.15rc1" + +ROOT_FLASH_SIZE = "80" + +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p" + +IMAGE_FSTYPES ?= "jffs2" + +MODUTILS = "26" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" + +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" + +GUI_MACHINE_CLASS = "smallscreen" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/include/tune-xscale.conf + +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#include conf/machine/include/tune-iwmmxt.conf + +module_autoload_evdev = "evdev" +module_autoload_pcmcia = "pcmcia" +module_autoload_mmc_block = "mmc_block" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_pxa27x_udc = "pxa27x_udc" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf new file mode 100644 index 0000000000..e94b7d4d56 --- /dev/null +++ b/conf/machine/hx4700.conf @@ -0,0 +1,64 @@ +#@TYPE: Machine +#@NAME: iPAQ hx47xx +#@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU + +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" + +PREFERRED_VERSION_orinoco-modules = "0.15rc1" + +ROOT_FLASH_SIZE = "80" + +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p" + +IMAGE_FSTYPES ?= "jffs2" + +MODUTILS = "26" + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget" + +PCMCIA_MANAGER = "pcmciautils" + +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" +MACHINE_EXTRA__RRECOMMENDS = "kernel-module-nls_cp437 \ + kernel-module-nls_iso8859-1 \ + kernel-module-nls_utf8 \ + kernel-module-af_key \ + kernel-module-i2c-pxa \ + kernel-module-hx4700_voltage \ + kernel-module-hx4700_acx \ + kernel-module-snd_hx4700_audio" + + +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 + +# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first +#include conf/machine/include/tune-iwmmxt.conf + + +#define which modules to load at boot +module_autoload_evdev = "evdev" +module_autoload_hx4700_power = "hx4700_power" +module_autoload_pcmcia = "pcmcia" +module_autoload_hx4700_pcmcia = "hx4700_pcmcia" +module_autoload_asic3_mmc = "asic3_mmc" +module_autoload_mmc_block = "mmc_block" +module_autoload_hx4700_ts = "hx4700_ts" +module_autoload_hx4700_navpt = "hx4700_navpt" +module_autoload_hx4700_bt = "hx4700_bt" +module_autoload_snd-hx4700_audio = "snd-hx4700_audio" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_pxa27x_udc = "pxa27x_udc" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index d5b0c602bf..ad2120ef6c 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -29,8 +29,7 @@ BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@ BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware" -PXA270_MODULES = "snd_pcm_oss snd_mixer_oss hidp \ - nls_cp437 nls_iso8859-1 nls_utf8 af_key" +PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" |