make binutils 2.18 default for ppc44x and ppc40x

[openwrt.git] / tools / firmware-utils / src / mkfwimage.c

diff --git a/tools/firmware-utils/src/mkfwimage.c b/tools/firmware-utils/src/mkfwimage.c
index 0a2f74e..edbd8ec 100644 (file)
--- a/tools/firmware-utils/src/mkfwimage.c
+++ b/tools/firmware-utils/src/mkfwimage.c
@@ -243,14 +243,14 @@ static int create_image_layout(const char* kernelfile, const char* rootfsfile, c
 
        strcpy(rootfs->partition_name, "rootfs");
        rootfs->partition_index = 2;
 
        strcpy(rootfs->partition_name, "rootfs");
        rootfs->partition_index = 2;

-       rootfs->partition_baseaddr = p->root_start;
+       rootfs->partition_baseaddr = kernel->partition_baseaddr + kernel->partition_length;

        rootfs->partition_length = p->firmware_max_length - kernel->partition_length;
        rootfs->partition_memaddr = 0x00000000;
        rootfs->partition_entryaddr = 0x00000000;
        strncpy(rootfs->filename, rootfsfile, sizeof(rootfs->filename));
 
        rootfs->partition_length = p->firmware_max_length - kernel->partition_length;
        rootfs->partition_memaddr = 0x00000000;
        rootfs->partition_entryaddr = 0x00000000;
        strncpy(rootfs->filename, rootfsfile, sizeof(rootfs->filename));
 

-printf("kernel: %d %d\n", kernel->partition_length, kernel->partition_baseaddr);
-printf("root: %d %d\n", rootfs->partition_length, rootfs->partition_baseaddr);
+printf("kernel: %d 0x%08x\n", kernel->partition_length, kernel->partition_baseaddr);
+printf("root: %d 0x%08x\n", rootfs->partition_length, rootfs->partition_baseaddr);

        im->part_count = 2;
 
        return 0;
        im->part_count = 2;
 
        return 0;