diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-02-14 10:22:01 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-02-14 10:22:01 +0000 |
| commit | d264c684381ace00faa32ea710718d85c4253810 (patch) | |
| tree | 8e7142c0d654bd49cd1fd5a11f36ab26c7b9057a /conf | |
| parent | 69fade6e3c11fee16b5c369b88dc236790321f7e (diff) | |
consolidate collie, shepherd, husky into the common machine c7x0. kernel 2.6 handles all three machines, for kernel 2.4 we build three different kernels for every -image build.
BKrev: 42107bc9qhsZjYvjPqkddsMIsQuYAA
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/boxer.conf | 2 | ||||
| -rw-r--r-- | conf/machine/c7x0.conf | 0 | ||||
| -rw-r--r-- | conf/machine/corgi.conf | 8 | ||||
| -rw-r--r-- | conf/machine/husky.conf | 9 | ||||
| -rw-r--r-- | conf/machine/shepherd.conf | 8 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.4.conf | 5 |
6 files changed, 12 insertions, 20 deletions
diff --git a/conf/machine/boxer.conf b/conf/machine/boxer.conf index 6d3ea0f799..f5afc14017 100644 --- a/conf/machine/boxer.conf +++ b/conf/machine/boxer.conf @@ -1,2 +1,2 @@ WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C860,\n* because \ -it really is just a Sharp SL-C760 with a different case color. Use MACHINE = \"husky\".\n*\n*\n')}" +it really is just a Sharp SL-C760 with a different case color. Use MACHINE = \"c7x0\".\n*\n*\n')}" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/c7x0.conf diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf index d9e6bb47da..8055af0e82 100644 --- a/conf/machine/corgi.conf +++ b/conf/machine/corgi.conf @@ -1,7 +1,3 @@ -#@TYPE: Machine -#@NAME: Sharp Zaurus SL-C700 -#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-C700 device +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C700,\n* because \ +of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}" -include conf/machine/zaurus-clamshell.conf - -ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf index 35ab460efa..fae9540b0f 100644 --- a/conf/machine/husky.conf +++ b/conf/machine/husky.conf @@ -1,7 +1,2 @@ -#@TYPE: Machine -#@NAME: Sharp Zaurus SL-C750,Sharp Zaurus SL-C760 -#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C760 and Sharp Zaurus SL-C860 devices - -include conf/machine/zaurus-clamshell.conf - -ROOT_FLASH_SIZE = "64" +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C760,\n* because \ +of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}" diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf index e029a957e1..154171298e 100644 --- a/conf/machine/shepherd.conf +++ b/conf/machine/shepherd.conf @@ -1,7 +1,3 @@ -#@TYPE: Machine -#@NAME: Sharp Zaurus SL-C750 -#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C750 device +WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C750,\n* because \ +of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}" -include conf/machine/zaurus-clamshell.conf - -ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index e69de29bb2..292a157a4a 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -0,0 +1,5 @@ + +BOOTSTRAP_EXTRA_DEPENDS = "corgi-kernel shepherd-kernel husky-kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \ +kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ +kernel-module-usbdcore kernel-module-usbdmonitor chkhinge" |