diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-08-28 08:01:11 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-08-28 08:01:11 +0000 |
| commit | dfe25f5c771ea5cf6cb7fd60ff55be82fea6cb3c (patch) | |
| tree | e8ff3481e0757b853a93460cba250e73997bd4dc | |
| parent | 431b0378e7c2a282c4dc5ba2bf641d644facc4dd (diff) | |
| parent | d6da4ca0d13301c94601f28e825e6c722b84cca6 (diff) | |
merge of 14cc680dbaa6317eec602330d2fe0ac7dea3be7a
and f44d275bf4228f606ebd4c69aec81b02d56b599b
| -rw-r--r-- | conf/distro/include/angstrom.inc | 5 | ||||
| -rw-r--r-- | conf/machine/h5xxx.conf | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 5ff9e1c942..3bb4028a22 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -37,9 +37,6 @@ CXXFLAGS += "-fvisibility-inlines-hidden" #ARM EABI is softfloat by default, but let's make sure :) TARGET_FPU_arm = "soft" -#Always ship these packages -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}" DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} @@ -48,4 +45,4 @@ DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE} DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" # We want images supporting the following features (for task-base) -DISTO_FEATURES = "nfs smbfs ipsec wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" +DISTO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf index 32e9304cdb..008bfb252f 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5xxx.conf @@ -2,8 +2,8 @@ #@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" +#KERNEL ?= "kernel24" +KERNEL ?= "kernel26" OVERRIDES =. "${KERNEL}:" @@ -12,12 +12,14 @@ 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_kernel26 = "handhelds-pxa-2.6" +#PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" +MACHINE_FEATURES = "kernel26 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" |