6 files changed, 10 insertions, 15 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f36ae8c6fe..80f1512acf 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -7,7 +7,7 @@
 #@--------------------------------------------------------------------
 
 # The release will the 2007.12
-DISTRO_VERSION = "2007.11RC2.1"
+DISTRO_VERSION = "2007.11RC3"
 DISTRO_REVISION = "51"
 
 require conf/distro/include/sane-srcdates.inc
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index a8a2d60c17..6eeb08825b 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_VERSION_u-boot = "1.1.4"
+KERNEL_IMAGETYPE = "uImage"
 
 #tune for the 405 cpu
 require conf/machine/include/tune-ppc405.inc
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index 68bf1b9025..baa2e55dc1 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
@@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-gsm \
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
-  kernel-module-ext2 \
-  kernel-module-vfat \
   kernel-module-snd-soc-neo1973-wm8753 \
   kernel-module-snd-soc-smdk2440 \
-  kernel-module-nls-iso8859-1 \
-  kernel-module-nls-cp437 \
 "
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index 25c3878ee3..2b2d016089 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
@@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-gsm \
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
-  kernel-module-ext2 \
-  kernel-module-vfat \
   kernel-module-snd-soc-neo1973-gta02-wm8753 \
   kernel-module-snd-soc-smdk2440 \
-  kernel-module-nls-iso8859-1 \
-  kernel-module-nls-cp437 \
 "
 
 SERIAL_CONSOLE = "115200 ttySAC2"
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index fcd6cfa0b9..c4c1237bae 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -26,13 +26,15 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootf
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
-			      kernel-module-h5400-battery"
+			      kernel-module-h5400-battery \
+			      kernel-module-snd-soc-h5000"
 
 #
 # Modules autoload and other boot properties
 #
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-soc-h5000 = "snd-soc-h5000"
 module_autoload_g_ether = "g_ether"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 1c1d08afb1..ac565559aa 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -53,16 +53,16 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
 #
 # Modules autoload and other boot properties
 #
-module_autoload_magician_ts = "magician_ts"
-module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_hci_usb = "hci_usb"
 module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_magician_ts = "magician_ts"
+module_autoload_leds-magician = "leds-magician"
 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"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"