diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-23 20:28:37 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-23 20:28:37 +0200 |
| commit | f3edd2d29b7e0094db6eaa4c7d9a870a3a7d8796 (patch) | |
| tree | 7b78ab96fface695033d6514bd3fba772dd7f24a /conf/machine/include | |
| parent | 5d82a069f6c51036e79f8b7deeec3e439dae63cc (diff) | |
| parent | d9b64f479be887dc1026c747536e1fa76d28f08b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/tune-ppce500.inc | 1 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 3 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.inc | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 8d1eb899de..5d6d9ffbff 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r23" +MACHINE_KERNEL_PR = "r31" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/tune-ppce500.inc b/conf/machine/include/tune-ppce500.inc index 9c8c68c342..44f8742f9f 100644 --- a/conf/machine/include/tune-ppce500.inc +++ b/conf/machine/include/tune-ppce500.inc @@ -1,3 +1,4 @@ TARGET_CC_ARCH = "-mcpu=8540" BASE_PACKAGE_ARCH = "ppce500" FEED_ARCH = "ppce500" +PACKAGE_EXTRA_ARCHS += "ppce500" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 61b636bebb..5e4e1ac579 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -38,7 +38,8 @@ GUI_MACHINE_CLASS_poodle = "smallscreen" KERNEL_IMAGE_MAXSIZE = "1294336" -KERNEL_IMAGETYPE ?= "zImage" +ZAURUS_KERNEL_IMAGETYPE ?= "zImage" +KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}" MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index 714380e9aa..cc58c4a48b 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,7 +1,7 @@ include conf/machine/include/tune-xscale.inc -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "0x80008000" +UBOOT_ENTRYPOINT = "0xA0008000" +UBOOT_LOADADDRESS = "0xA0008000" EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" |