summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2009-04-07 00:10:28 +0200
committerAndrea Adami <andrea.adami@gmail.com>2009-04-07 00:11:02 +0200
commit747d8eec1f2b19751172f958dc518b7c865494f1 (patch)
tree03c1aa84af0b445eac69e05b70d265fe85165d06
parent28d0f54e301b5063eaf3587c57fd5422ae7fb2b2 (diff)
initramfs-kexecboot-image: fix EXTRA_IMAGEDEPENDS for all Zaurus
-rw-r--r--conf/machine/include/zaurus-2.6.inc4
-rw-r--r--conf/machine/include/zaurus-clamshell.inc3
-rw-r--r--recipes/kexecboot/initramfs-kexecboot-image.bb4
3 files changed, 5 insertions, 6 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 5ce1cdca6a..61b636bebb 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -10,8 +10,8 @@ ERASEBLOCKSIZE_akita = "0x20000"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n"
-ZAURUS-UPDATER = "zaurus-updater"
-EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
+EXTRA_IMAGEDEPENDS += "zaurus-updater"
+KEXECBOOT_IMAGEDEPENDS = "zaurus-updater"
SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index df4e243eef..714380e9aa 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -3,9 +3,8 @@ include conf/machine/include/tune-xscale.inc
UBOOT_ENTRYPOINT = "0x80008000"
UBOOT_LOADADDRESS = "0x80008000"
-
-LEGACY_IMAGEDEPENDS = "${ZAURUS-UPDATER} sharp-flash-header-c700"
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
+KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
--output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb
index 1aacceaa30..385bd258ea 100644
--- a/recipes/kexecboot/initramfs-kexecboot-image.bb
+++ b/recipes/kexecboot/initramfs-kexecboot-image.bb
@@ -10,8 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt"
export IMAGE_BASENAME = "initramfs-kexecboot-image"
-#EXTRA_IMAGEDEPENDS = ""
-EXTRA_IMAGEDEPENDS = "${LEGACY_IMAGEDEPENDS}"
+# avoid to depend from kexecboot
+EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}"
IMAGE_INSTALL = "kexecboot"
IMAGE_LINGUAS = ""