app: aboot: Use target specific kernel/tags/ramdisk address
Remove the check to default address values, these default values
come from fastboot host side tool and can change. This creates strong
dependency on host side tool. Instead add a compile time feature
'ABOOT_IGNORE_BOOT_HEADER_ADDRS' to use statically defined
kernel/tags/ramdisk address, specific to each target.
Change-Id: I956daa24e2ec532b92cd70665c55113c3fd71cf3
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index d13ddec..d95806c 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -159,23 +159,10 @@
static void update_ker_tags_rdisk_addr(struct boot_img_hdr *hdr)
{
/* overwrite the destination of specified for the project */
- /*
- * Update the value to sane values only when the boot image
- * header does not have sane values, this is added to make sure
- * that we always use values from boot.img header and use the
- * force values when boot image header has default values.
- */
-#ifdef ABOOT_FORCE_KERNEL_ADDR
- if (hdr->kernel_addr == ABOOT_DEFAULT_KERNEL_ADDR)
- hdr->kernel_addr = ABOOT_FORCE_KERNEL_ADDR;
-#endif
-#ifdef ABOOT_FORCE_RAMDISK_ADDR
- if (hdr->ramdisk_addr == ABOOT_DEFAULT_RAMDISK_ADDR)
- hdr->ramdisk_addr = ABOOT_FORCE_RAMDISK_ADDR;
-#endif
-#ifdef ABOOT_FORCE_TAGS_ADDR
- if (hdr->tags_addr == ABOOT_DEFAULT_TAGS_ADDR)
- hdr->tags_addr = ABOOT_FORCE_TAGS_ADDR;
+#ifdef ABOOT_IGNORE_BOOT_HEADER_ADDRS
+ hdr->kernel_addr = ABOOT_FORCE_KERNEL_ADDR;
+ hdr->ramdisk_addr = ABOOT_FORCE_RAMDISK_ADDR;
+ hdr->tags_addr = ABOOT_FORCE_TAGS_ADDR;
#endif
}