diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-06-18 04:59:15 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-06-18 04:59:15 +0000 |
| commit | c6df26d6de49d504397c03f286983c8826b34696 (patch) | |
| tree | 245ed0d27e2a8d77904de877421f4566397afaeb /conf | |
| parent | 46409b6477e77bd8c059f9b76be6e0b569074a22 (diff) | |
| parent | 9913984cd856d6308ff34007dfa9bf127e2f53c5 (diff) | |
merge of '702a5081576a1863ce14aecd10fdbf425bc547af'
and 'bdfe6dfd282c298e62007b6885e28ab01463c4bb'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 | ||||
| -rw-r--r-- | conf/machine/magician.conf | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index dbd255ea49..749a719a23 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11905,3 +11905,7 @@ sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041 [ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz] md5=274ca4d36ee6fb216fa6cf01ad5eaa84 sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c + +[http://simh.trailing-edge.com/sources/simhv37-1.zip] +md5=c8c57379e2e9afbf9817fbbe99ee1106 +sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132 diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9931389c26..46a293235d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -132,7 +132,9 @@ PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh7" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh8" + +PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" # Needed for crappy ipaqs with broken hostap in the kernel PREFERRED_VERSION_hostap-modules ?= "0.4.7" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 719c9a5b03..aa30d3164e 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -34,15 +34,21 @@ XSERVER = "xserver-kdrive-fbdev" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ + kernel-module-af-key \ + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-leds-magician \ kernel-module-magician-ts \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" + # # Modules autoload and other boot properties # @@ -54,6 +60,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" module_autoload_magician_ds1wm = "magician_ds1wm" module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" +module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" |