From 661edf7460f644cf3fe98c6c1d409a5b62570867 Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Thu, 28 Dec 2006 20:10:14 +0000 Subject: conf/machine/include/tosa-2.6.conf: remove obsolete file --- conf/machine/include/tosa-2.6.conf | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 conf/machine/include/tosa-2.6.conf (limited to 'conf') diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf deleted file mode 100644 index f3591b4b75..0000000000 --- a/conf/machine/include/tosa-2.6.conf +++ /dev/null @@ -1,6 +0,0 @@ -include conf/machine/include/zaurus-2.6.conf -# wlan-ng Modules -MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" - -# WM97xx Modules -#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" -- cgit v1.2.3 From ab81577b599209970579172aefd1b14beb927fb1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Dec 2006 13:04:38 +0000 Subject: angstrom: add OABI version for armv4 machines set DISTRO="angstrom-2007.1-oabi" to make use of this --- conf/distro/angstrom-2007.1-oabi.conf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 conf/distro/angstrom-2007.1-oabi.conf (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf new file mode 100644 index 0000000000..e63dc61a48 --- /dev/null +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -0,0 +1,20 @@ +require conf/distro/angstrom-2007.1.conf + +#this is a special version of angstrom for armv4 based machines that can't do EABI +#see http://wiki.debian.org/ArmEabiPort for details on that + +#set compatible machine so people don't 'accidentally' use this +COMPATIBLE_MACHINE = "(collie|h3600|h3800|simpad)" + +#only glibc based builds are supported ATM +TARGET_OS = "linux" + +FEED_ARCH_collie = "arm" +FEED_ARCH_h3600 = "arm" +FEED_ARCH_h3800 = "arm" +FEED_ARCH_simpad = "arm" + + + + + -- cgit v1.2.3 From 095d2f2f4a11a28edf7dfdc2d80d31695db479f8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Dec 2006 20:30:32 +0000 Subject: collie: added 2.4/2.6 kernel switch from .oz354x - 2.4 kernel is default - I do not want to use include/zaurus-2.6.conf as it is too PXA related --- conf/machine/collie.conf | 20 ++++++-------------- conf/machine/include/collie-2.4.conf | 16 ++++++++++++++++ conf/machine/include/collie-2.6.conf | 3 +++ 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 conf/machine/include/collie-2.4.conf create mode 100644 conf/machine/include/collie-2.6.conf (limited to 'conf') diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index deefa1b698..170d90db7c 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,19 +3,11 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -# -# 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 -# -MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" +MACHINE_KERNEL_VERSION ?= "2.4" +include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor sharp-sdmmc-support" - -# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied +PREFERRED_PROVIDER_xserver = "xserver-kdrive" # This is needed for the ramdisk script to work MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" @@ -24,6 +16,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" +IMAGE_FSTYPES ?= "jffs2 tar.gz" + include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" @@ -31,7 +25,5 @@ SERIAL_CONSOLE = "115200 ttyS0" ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - MACHINE_TASK_PROVIDER = "task-base" +GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf new file mode 100644 index 0000000000..8e79ebc634 --- /dev/null +++ b/conf/machine/include/collie-2.4.conf @@ -0,0 +1,16 @@ +PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix" + +# +# 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 +# +MACHINE_FEATURES = "kernel24 apm pcmcia screen irda" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ + kernel-module-usbdcore kernel-module-usbdmonitor \ + sharp-sdmmc-support" + +# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied + +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-modules = "0.13e" diff --git a/conf/machine/include/collie-2.6.conf b/conf/machine/include/collie-2.6.conf new file mode 100644 index 0000000000..76ff96d902 --- /dev/null +++ b/conf/machine/include/collie-2.6.conf @@ -0,0 +1,3 @@ +PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen" -- cgit v1.2.3 From 862b6764dadafbdc0f5720150c0120e03626e93c Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Fri, 29 Dec 2006 21:12:14 +0000 Subject: collie: fix collie serial console for 2.6 kernel --- conf/machine/collie.conf | 2 -- conf/machine/include/collie-2.4.conf | 1 + conf/machine/include/collie-2.6.conf | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') 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" -- cgit v1.2.3