summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/alix.conf2
-rw-r--r--conf/machine/guinness.conf2
-rw-r--r--conf/machine/htcdream.conf3
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/omap3-touchbook.conf1
-rw-r--r--conf/machine/progear.conf2
-rw-r--r--conf/machine/x86.conf2
7 files changed, 7 insertions, 7 deletions
diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index 10b298c0f0..e116e611ad 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -4,7 +4,7 @@
#
# http://pcengines.ch/alix1c.htm
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i586"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index f17451556f..dd21c1ecc2 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -2,7 +2,7 @@
#@NAME: Guinness
#@DESCRIPTION: Machine configuration for Linux running on a tyan 2462 mainboard (codenamed guinness)
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i686"
PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf
index 7f7680a732..d09782c40f 100644
--- a/conf/machine/htcdream.conf
+++ b/conf/machine/htcdream.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: HTC Dream
-#@DESCRIPTION: Machine configuration for HTC Dream smartphone
+#@DESCRIPTION: Machine configuration for HTC Dream phone (aka T-Mobile G1 and Google ADP-1)
require conf/machine/include/htc-msm7.inc
@@ -10,4 +10,3 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usbgadget bluetooth keyboard ext2"
PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
-
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index e87b56c282..2c5c4f2387 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r48"
+MACHINE_KERNEL_PR = "r49"
KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 2839b7ddf6..88cb9cc8e3 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -8,6 +8,7 @@ XSERVER = "xserver-xorg \
xf86-input-evdev \
xf86-input-mouse \
xf86-input-tslib \
+ xf86-video-fbdev \
xf86-video-omapfb \
xf86-input-keyboard"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 60716f6153..627bbc1c69 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -2,7 +2,7 @@
#@NAME: Progear
#@DESCRIPTION: Machine configuration for Progear 1050HX+ webpad
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i586"
require conf/machine/include/tune-pentiummmx.inc
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index 30eb943cc6..5e43102fb3 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -4,7 +4,7 @@
#@NAME: X86
#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines
-# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
+# i386 doesn't work with NPTL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html
TARGET_ARCH = "i486"
PREFERRED_PROVIDER_virtual/kernel = "linux"