diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2008-08-14 23:48:23 +0000 |
---|---|---|
committer | Florian Boor <florian.boor@kernelconcepts.de> | 2008-08-14 23:48:23 +0000 |
commit | e9570b88fa18c49a68b5f44bffd7e2abb101f499 (patch) | |
tree | 083d8795a6ff13b6950f8da4ba4c507791b39fa2 /conf/machine | |
parent | 8e9a327b9c3924807b7c2093d6cc910213720440 (diff) | |
parent | 2792ce30ea1b3eb6a32bad578a956557e3040e89 (diff) |
merge of '77de2c054faaf8169bea5553ae2311a39a581403'
and 'fd59ca4a2d1cdb56a15d6a3323721ce78836fe52'
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/adzs-bf548-ezlite.conf | 2 | ||||
-rw-r--r-- | conf/machine/om-gta01.conf | 6 | ||||
-rw-r--r-- | conf/machine/om-gta02.conf | 5 |
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 |