Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c853d945 authored by Wu Zhangjin's avatar Wu Zhangjin Committed by Ralf Baechle
Browse files

MIPS: Unify the suffix of compressed vmlinux.bin 



The compressed vmlinux.bin is only a temp file so it's ok to use the same
suffix .z for them (.gz,.lzo,.lzma...) to remove several lines and simpify
the maintenance (no need to add the "suffix_$(xxx) := suffix" line).

Signed-off-by: default avatarWu Zhangjin <wuzhangjin@gmail.com>
To: linux-mips <linux-mips@linux-mips.org>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Patchwork: https://patchwork.linux-mips.org/patch/1323/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>

---
parent 51f1336d

arch/mips/boot/compressed/Makefile

+4 −8
Original line number Diff line number Diff line
@@ -48,23 +48,19 @@ OBJCOPYFLAGS_vmlinux.bin := $(OBJCOPYFLAGS) -O binary -R .comment -S 
$(obj)/vmlinux.bin: $(KBUILD_IMAGE) FORCE

	$(call if_changed,objcopy)



suffix_$(CONFIG_KERNEL_GZIP)  = gz

suffix_$(CONFIG_KERNEL_BZIP2) = bz2

suffix_$(CONFIG_KERNEL_LZMA)  = lzma

suffix_$(CONFIG_KERNEL_LZO)   = lzo

tool_$(CONFIG_KERNEL_GZIP)    = gzip

tool_$(CONFIG_KERNEL_BZIP2)   = bzip2

tool_$(CONFIG_KERNEL_LZMA)    = lzma

tool_$(CONFIG_KERNEL_LZO)     = lzo



targets += vmlinux.gz vmlinux.bz2 vmlinux.lzma vmlinux.lzo

$(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin FORCE

targets += vmlinux.bin.z

$(obj)/vmlinux.bin.z: $(obj)/vmlinux.bin FORCE

	$(call if_changed,$(tool_y))



targets += piggy.o

OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.$(suffix_y) \

OBJCOPYFLAGS_piggy.o := --add-section=.image=$(obj)/vmlinux.bin.z \

                        --set-section-flags=.image=contents,alloc,load,readonly,data

$(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.$(suffix_y) FORCE

$(obj)/piggy.o: $(obj)/dummy.o $(obj)/vmlinux.bin.z FORCE

	$(call if_changed,objcopy)



LDFLAGS_vmlinuz := $(LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T

arch/mips/boot/compressed/calc_vmlinuz_load_addr.c

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 "Wu Zhangjin" <wuzhangjin@gmail.com>

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#include <sys/types.h>

#include <sys/stat.h>

#include <errno.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>



int main(int argc, char *argv[])

{

	struct stat sb;

	uint64_t vmlinux_size, vmlinux_load_addr, vmlinuz_load_addr;



	if (argc != 3) {

		fprintf(stderr, "Usage: %s <pathname> <vmlinux_load_addr>\n",

				argv[0]);

		return EXIT_FAILURE;

	}



	if (stat(argv[1], &sb) == -1) {

		perror("stat");

		return EXIT_FAILURE;

	}



	/* Convert hex characters to dec number */

	errno = 0;

	if (sscanf(argv[2], "%llx", &vmlinux_load_addr) != 1) {

		if (errno != 0)

			perror("sscanf");

		else

			fprintf(stderr, "No matching characters\n");



		return EXIT_FAILURE;

	}



	vmlinux_size = (uint64_t)sb.st_size;

	vmlinuz_load_addr = vmlinux_load_addr + vmlinux_size;



	/*

	 * Align with 16 bytes: "greater than that used for any standard data

	 * types by a MIPS compiler." -- See MIPS Run Linux (Second Edition).

	 */



	vmlinuz_load_addr += (16 - vmlinux_size % 16);



	printf("0x%llx\n", vmlinuz_load_addr);



	return EXIT_SUCCESS;

}