diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2010-10-07 00:57:22 +0200 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2010-10-07 00:57:22 +0200 |
| commit | ac99aeee694e04321664c3fcba2ce6cf39ce160a (patch) | |
| tree | 2beb0c158f2468ecaa97d8e9fcb1111ec2ae6a74 /conf/machine | |
| parent | a934499cee7c8201e303feb22f45e0f28a8e9a7b (diff) | |
| download | openembedded-ac99aeee694e04321664c3fcba2ce6cf39ce160a.tar.gz | |
simpad: merge simpad-2.6.inc in simpad.conf
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/include/simpad-2.6.inc | 5 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/conf/machine/include/simpad-2.6.inc b/conf/machine/include/simpad-2.6.inc deleted file mode 100644 index e485c7bf2a..0000000000 --- a/conf/machine/include/simpad-2.6.inc +++ /dev/null @@ -1,5 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "linux" - -PCMCIA_MANAGER ?= "pcmciautils" - -MACHINE_FEATURES_append = "kernel26" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 5e892920cc..eb22f683f9 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -6,11 +6,12 @@ MACHINE_KERNEL_VERSION ?= "2.6" TARGET_ARCH = "arm" -MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" +MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat kernel26" -include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc -require conf/machine/include/tune-strongarm.inc +PREFERRED_PROVIDER_virtual/kernel = "linux" +PCMCIA_MANAGER ?= "pcmciautils" +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000" |