diff options
| -rw-r--r-- | conf/machine/cm-x270.conf (renamed from conf/machine/compulab-pxa270.conf) | 8 | ||||
| -rw-r--r-- | packages/tasks/task-boot.bb | 3 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty (renamed from packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine (renamed from packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine) | 0 |
4 files changed, 6 insertions, 5 deletions
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/cm-x270.conf index ff0eb42a11..c712c3728e 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/cm-x270.conf @@ -1,12 +1,12 @@ #@TYPE: Machine -#@Name: Compulab PXA270 system -#@DESCRIPTION: Machine configuration for Compulab PXA270 system +#@Name: Compulab cm-x270 +#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module #OLDEST_KERNEL = "2.6.16" TARGET_ARCH = "arm" PREFERRED_VERSION_compulab-pxa270 = "2.6.22" GUI_MACHINE_CLASS ?= "bigscreen" -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" +PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" require conf/machine/include/tune-xscale.inc @@ -21,7 +21,7 @@ CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1" # used by sysvinit_2 package, so rebuild this # package if you change the SERIAL_CONSOLE setting -# the following is the for the cm-x270 L module +# the following is the port for the cm-x270 L module # I think the W module would use ttyS0, but has # not been tested. This can be overwritten in # local.conf diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 40c5bd530b..fb09ad1a83 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r40" +PR = "r41" inherit task @@ -40,6 +40,7 @@ RDEPENDS_task-boot = "\ base-passwd \ busybox \ initscripts \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ modutils-initscripts \ netbase \ update-alternatives \ diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty +++ b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine index e27931cf6b..e27931cf6b 100644 --- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine |