diff options
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/collie.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/collie-2.4.conf | 1 | ||||
| -rw-r--r-- | conf/machine/include/collie-2.6.conf | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 170d90db7c..e7e867e539 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -20,8 +20,6 @@ IMAGE_FSTYPES ?= "jffs2 tar.gz" include conf/machine/include/tune-strongarm.conf -SERIAL_CONSOLE = "115200 ttyS0" - ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf index 8e79ebc634..0412ea359a 100644 --- a/conf/machine/include/collie-2.4.conf +++ b/conf/machine/include/collie-2.4.conf @@ -1,5 +1,6 @@ PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix" +SERIAL_CONSOLE = "115200 ttyS0" # # no keyboard feature because 2.4 kernel keymap works ok and we have limited flash # no usbgadget feature because 2.4 kernel handle it in own way on each machine diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf index 76ff96d902..eab879368c 100644 --- a/conf/machine/include/collie-2.6.conf +++ b/conf/machine/include/collie-2.6.conf @@ -1,3 +1,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-rp" +SERIAL_CONSOLE = "115200 ttySA0" MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen" |