diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/jlime-donkey.conf | 4 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 3 | ||||
| -rw-r--r-- | conf/machine/htcuniversal.conf | 3 | ||||
| -rw-r--r-- | conf/machine/include/tune-iwmmxt.conf | 2 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 4 | ||||
| -rw-r--r-- | conf/machine/logicpd-pxa270.conf | 5 | ||||
| -rw-r--r-- | conf/machine/mainstone.conf | 5 |
7 files changed, 13 insertions, 13 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index a103ddaf7c..67e2aef263 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -78,8 +78,8 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too #<> #<>What Opie version should we use. #<> -OPIE_VERSION = "1.2.2" -include conf/distro/preferred-opie-versions.inc +#OPIE_VERSION = "1.2.3" // use cvsdate for now +#include conf/distro/preferred-opie-versions.inc #<> #<> We want pcmciautils, not pcmcia-cs diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index fab57cae38..e1baea775d 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -14,7 +14,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" ROOT_FLASH_SIZE = "32" PCMCIA_MANAGER = "pcmciautils" -BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" +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: diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 288f3ebaa9..b8368f32c9 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -30,7 +30,7 @@ include conf/machine/include/tune-xscale.conf #include conf/machine/include/tune-iwmmxt.conf BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}" -UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" +UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_acx acx htcuniversal_bt htcuniversal_leds firmware-class" module_autoload_htcuniversal_power = "htcuniversal_power" @@ -41,7 +41,6 @@ module_autoload_firmware-class = "firmware-class" module_autoload_acx = "acx" module_autoload_htcuniversal-acx = "htcuniversal_acx" module_autoload_htcuniversal-bt = "htcuniversal_bt" -module_autoload_htcuniversal-power = "htcuniversal_power" #module_autoload_pxa27x_udc = "pxa27x_udc" diff --git a/conf/machine/include/tune-iwmmxt.conf b/conf/machine/include/tune-iwmmxt.conf index e46796fede..535c914a9d 100644 --- a/conf/machine/include/tune-iwmmxt.conf +++ b/conf/machine/include/tune-iwmmxt.conf @@ -1,6 +1,6 @@ # Configurations for the Intel PXA27x Appications Processor Family. # Please use tune-xscale for PXA255/PXA26x based processors. IPKG_EXTRA_ARCHS += "iwmmxt" -TARGET_CC_ARCH = "-march=iwmmxt -mtune=iwmmxt" +TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt " PACKAGE_ARCH = "iwmmxt" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 9ed313334b..359f8296d8 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -21,7 +21,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf MODUTILS = "26" PCMCIA_MANAGER = "pcmciautils" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" +BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)} ${@linux_module_packages('${HX4700_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev" BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware" @@ -41,7 +42,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 -BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" # These modules are now compiled into the kernel: #HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt \ diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 24e23bc9a0..206958c2ce 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -7,8 +7,9 @@ PREFERRED_VERSION_logicpd-pxa270 = "2.6.17-rc5" GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" +IPKG_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" @@ -16,4 +17,6 @@ SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc ROOT_FLASH_SIZE = "32" # EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000" +EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000" + diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index de242242a7..357e286752 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ IPKG_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" @@ -18,6 +18,3 @@ SERIAL_CONSOLE = "115200 ttyS0" ROOT_FLASH_SIZE = "32" - - - |