diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-25 18:06:33 +0400 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-25 18:06:33 +0400 |
commit | 4e1e589cdb1656a53217a4393ea5c5a6ecff450f (patch) | |
tree | ff53fdce6ada8a7b8fc1061e6e72ec006f529170 /conf | |
parent | 588564f0656e911c89c4d85f0f8b7ef57859a0f4 (diff) | |
parent | ad4e2d75a9d07bce3ff23fffd51f34b39ef97f68 (diff) |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
-rw-r--r-- | conf/checksums.ini | 4 | ||||
-rw-r--r-- | conf/machine/include/zaurus-kernel.inc | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 964f72855d..e07f929acd 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25382,6 +25382,10 @@ sha256=d03eb7e5b47e2f1e1a665700f4e22d15651dc949196b0ec880f0d63cafb6814c md5=1dbede8f6393edfe6c1ecab2f754b3b2 sha256=d70c198cde981c3a53b1c41b717dea4bbf1d397d82957f584c641bb5fd02c82d +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.11.2.tar.bz2] +md5=4c652ecba772f705296b8e52d746857c +sha256=2d252847a410636b55bf80900d9432ca438775f70377ce81311282a2d12853b5 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-2.8.0.tar.bz2] md5=a2b9c70a32b0a6436d837d67fa7aae18 sha256=f0b68171dd4256c927fbee91ecf84fa28c409b5b6b39cbf47eaa48fd73db305f diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index f63af74405..415f8a4d68 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -11,6 +11,8 @@ MACHINE_KERNEL_PR = "r11" MACHINE_KERNEL_PR_collie = "r8" MACHINE_KERNEL_PR_tosa = "r4" +MACHINE_KERNEL_PR_pn-linux-kexecboot = "r12" + KERNEL_IMAGE_MAXSIZE = "1294336" KERNEL_IMAGE_MAXSIZE_collie = "1048576" |