summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/adzs-bf548-ezlite.conf2
-rw-r--r--conf/machine/om-gta01.conf6
-rw-r--r--conf/machine/om-gta02.conf5
3 files changed, 7 insertions, 6 deletions
diff --git a/conf/machine/adzs-bf548-ezlite.conf b/conf/machine/adzs-bf548-ezlite.conf
index 35c9217339..15074406ce 100644
--- a/conf/machine/adzs-bf548-ezlite.conf
+++ b/conf/machine/adzs-bf548-ezlite.conf
@@ -15,5 +15,5 @@ USE_VT = "0"
MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
# used by sysvinit_2
-SERIAL_CONSOLE = "115200"
+SERIAL_CONSOLE = "57600 ttyBF0"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 190d1d1049..57d81c2ade 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
-#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
+#@NAME: FIC GTA01 (Neo 1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -36,7 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES += "jffs2"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
# build / upload tools
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 45dc0518a4..88aa3881c7 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
-#@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@NAME: Openmoko GTA02 (NeoFreerunner)
+#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-snd-soc-neo1973-gta02-wm8753 \
"
+# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
SERIAL_CONSOLE = "115200 ttySAC2"
# used by some images