diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-11-20 22:23:27 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-11-20 22:23:27 +0000 |
| commit | 98c0b5b928603160485232fd9e1bec669653472d (patch) | |
| tree | 39cf4bbd80505cd1109499907993b1bb6ab796f0 /conf | |
| parent | 3383588f87a41861aee25db50ac30e1a37bb57a6 (diff) | |
| parent | 2b8176358284d1044c558428e97d674794f93b62 (diff) | |
merge of '36d0c5f8885b2e835ebb7e89958f2ba06c2b2f2e'
and 'a245c6986b9923650003dbb564c2fb2cdf73124a'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/machine/h5000.conf (renamed from conf/machine/h5xxx.conf) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f593194ba6..05acebfa8f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -33,7 +33,7 @@ FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5xxx = "armv5te" +FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5000.conf index 5aac579e91..ffc1328f50 100644 --- a/conf/machine/h5xxx.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx" require conf/machine/include/tune-xscale.conf @@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb # PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p" MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ |