diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-24 14:02:56 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-24 14:02:56 +0200 |
| commit | be6fec499ddd4de3d76a60bafbf47d94f7632d93 (patch) | |
| tree | 4bb2a3e897779ccf738076b08ff39163f969aed4 /conf | |
| parent | a29819bbbbebdf42e94e3da20c973a1b715985f7 (diff) | |
linux-davinci: bump PR and point to include file where MACHINE_KERNEL_PR is located
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/dm355-leopard.conf | 6 | ||||
| -rw-r--r-- | conf/machine/include/davinci.inc | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf index b83cca5487..a488e0b1c8 100644 --- a/conf/machine/dm355-leopard.conf +++ b/conf/machine/dm355-leopard.conf @@ -2,11 +2,9 @@ #@NAME: Leopard "beagle buddy" DM355 based IP cam board #@DESCRIPTION: Machine configuration for the DM355 leopard board +require conf/machine/include/davinci.inc TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - PREFERRED_VERSION_u-boot = "1.2.0" UBOOT_MACHINE = "davinci_leopard_config" UBOOT_ENTRYPOINT = "0x80008000" @@ -15,5 +13,3 @@ SERIAL_CONSOLE ?= "115200 ttyS0" MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc" -require conf/machine/include/tune-arm926ejs.inc - diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 295a9c7007..0f6123a359 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-arm926ejs.inc # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r0" +MACHINE_KERNEL_PR = "r6" TARGET_ARCH = "arm" |