am 7b8970c5: fastboot: add support for some obscure args. (9efab70f) · Commits · e / os / android_system_core

fastboot/bootimg.c

+11 −8

Original line number	Diff line number	Diff line
		@@ -37,10 +37,10 @@ void bootimg_set_cmdline(boot_img_hdr h, const char cmdline)
		strcpy((char*) h->cmdline, cmdline);
		}

		boot_img_hdr mkbootimg(void kernel, unsigned kernel_size,
		void *ramdisk, unsigned ramdisk_size,
		void *second, unsigned second_size,
		unsigned page_size, unsigned base,
		boot_img_hdr mkbootimg(void kernel, unsigned kernel_size, unsigned kernel_offset,
		void *ramdisk, unsigned ramdisk_size, unsigned ramdisk_offset,
		void *second, unsigned second_size, unsigned second_offset,
		unsigned page_size, unsigned base, unsigned tags_offset,
		unsigned *bootimg_size)
		{
		unsigned kernel_actual;
		@@ -68,12 +68,15 @@ boot_img_hdr mkbootimg(void kernel, unsigned kernel_size,
		hdr->kernel_size = kernel_size;
		hdr->ramdisk_size = ramdisk_size;
		hdr->second_size = second_size;
		hdr->kernel_addr = base + 0x00008000;
		hdr->ramdisk_addr = base + 0x01000000;
		hdr->second_addr = base + 0x00F00000;
		hdr->tags_addr = base + 0x00000100;

		hdr->kernel_addr = base + kernel_offset;
		hdr->ramdisk_addr = base + ramdisk_offset;
		hdr->second_addr = base + second_offset;
		hdr->tags_addr = base + tags_offset;

		hdr->page_size = page_size;


		memcpy(hdr->magic + page_size,
		kernel, kernel_size);
		memcpy(hdr->magic + page_size + kernel_actual,

fastboot/fastboot.c

+67 −45

Original line number	Diff line number	Diff line
		@@ -58,10 +58,10 @@ char cur_product[FB_RESPONSE_SZ + 1];

		void bootimg_set_cmdline(boot_img_hdr h, const char cmdline);

		boot_img_hdr mkbootimg(void kernel, unsigned kernel_size,
		void *ramdisk, unsigned ramdisk_size,
		void *second, unsigned second_size,
		unsigned page_size, unsigned base,
		boot_img_hdr mkbootimg(void kernel, unsigned kernel_size, unsigned kernel_offset,
		void *ramdisk, unsigned ramdisk_size, unsigned ramdisk_offset,
		void *second, unsigned second_size, unsigned second_offset,
		unsigned page_size, unsigned base, unsigned tags_offset,
		unsigned *bootimg_size);

		static usb_handle *usb = 0;
		@@ -74,7 +74,13 @@ static int long_listing = 0;
		static int64_t sparse_limit = -1;
		static int64_t target_sparse_limit = -1;

		static unsigned base_addr = 0x10000000;
		unsigned page_size = 2048;
		unsigned base_addr = 0x10000000;
		unsigned kernel_offset = 0x00008000;
		unsigned ramdisk_offset = 0x01000000;
		unsigned second_offset = 0x00f00000;
		unsigned tags_offset = 0x00000100;


		void die(const char *fmt, ...)
		{
		@@ -186,11 +192,6 @@ oops:
		}
		#endif

		int match_fastboot(usb_ifc_info *info)
		{
		return match_fastboot_with_serial(info, serial);
		}

		int match_fastboot_with_serial(usb_ifc_info info, const char local_serial)
		{
		if(!(vendor_id && (info->dev_vendor == vendor_id)) &&
		@@ -217,6 +218,11 @@ int match_fastboot_with_serial(usb_ifc_info info, const char local_serial)
		return 0;
		}

		int match_fastboot(usb_ifc_info *info)
		{
		return match_fastboot_with_serial(info, serial);
		}

		int list_devices_callback(usb_ifc_info *info)
		{
		if (match_fastboot_with_serial(info, NULL) == 0) {
		@@ -297,14 +303,14 @@ void usage(void)
		" -p <product> specify product name\n"
		" -c <cmdline> override kernel commandline\n"
		" -i <vendor id> specify a custom USB vendor id\n"
		" -b <base_addr> specify a custom kernel base address\n"
		" -b <base_addr> specify a custom kernel base address. default: 0x10000000\n"
		" -n <page size> specify the nand page size. default: 2048\n"
		" -S <size>[K\|M\|G] automatically sparse files greater than\n"
		" size. 0 to disable\n"
		);
		}

		void load_bootable_image(unsigned page_size, const char kernel, const char *ramdisk,
		void load_bootable_image(const char kernel, const char *ramdisk,
		unsigned sz, const char cmdline)
		{
		void kdata = 0, rdata = 0;
		@@ -345,7 +351,10 @@ void load_bootable_image(unsigned page_size, const char kernel, const char *ra
		}

		fprintf(stderr,"creating boot image...\n");
		bdata = mkbootimg(kdata, ksize, rdata, rsize, 0, 0, page_size, base_addr, &bsize);
		bdata = mkbootimg(kdata, ksize, kernel_offset,
		rdata, rsize, ramdisk_offset,
		0, 0, second_offset,
		page_size, base_addr, tags_offset, &bsize);
		if(bdata == 0) {
		fprintf(stderr,"failed to create boot.img\n");
		return 0;
		@@ -806,35 +815,64 @@ int main(int argc, char **argv)
		int erase_first = 1;
		void *data;
		unsigned sz;
		unsigned page_size = 2048;
		int status;
		int c;
		int r;

		const struct option longopts = { 0, 0, 0, 0 };
		const struct option longopts[] = {
		{"base", required_argument, 0, 'b'},
		{"kernel_offset", required_argument, 0, 'k'},
		{"page_size", required_argument, 0, 'n'},
		{"ramdisk_offset", required_argument, 0, 'r'},
		{"help", 0, 0, 'h'},
		{0, 0, 0, 0}
		};

		serial = getenv("ANDROID_SERIAL");

		while (1) {
		c = getopt_long(argc, argv, "wub:n:s:S:lp:c:i:m:h", &longopts, NULL);
		int option_index = 0;
		c = getopt_long(argc, argv, "wub:k:n:r:s:S:lp:c:i:m:h", longopts, NULL);
		if (c < 0) {
		break;
		}

		/* Alphabetical cases */
		switch (c) {
		case 'w':
		wants_wipe = 1;
		break;
		case 'u':
		erase_first = 0;
		break;
		case 'b':
		base_addr = strtoul(optarg, 0, 16);
		break;
		case 'c':
		cmdline = optarg;
		break;
		case 'h':
		usage();
		return 1;
		case 'i': {
		char *endptr = NULL;
		unsigned long val;

		val = strtoul(optarg, &endptr, 0);
		if (!endptr \|\| *endptr != '\0' \|\| (val & ~0xffff))
		die("invalid vendor id '%s'", optarg);
		vendor_id = (unsigned short)val;
		break;
		}
		case 'k':
		kernel_offset = strtoul(optarg, 0, 16);
		break;
		case 'l':
		long_listing = 1;
		break;
		case 'n':
		page_size = (unsigned)strtoul(optarg, NULL, 0);
		if (!page_size) die("invalid page size");
		break;
		case 'p':
		product = optarg;
		break;
		case 'r':
		ramdisk_offset = strtoul(optarg, 0, 16);
		break;
		case 's':
		serial = optarg;
		break;
		@@ -844,28 +882,12 @@ int main(int argc, char **argv)
		die("invalid sparse limit");
		}
		break;
		case 'l':
		long_listing = 1;
		break;
		case 'p':
		product = optarg;
		break;
		case 'c':
		cmdline = optarg;
		case 'u':
		erase_first = 0;
		break;
		case 'i': {
		char *endptr = NULL;
		unsigned long val;

		val = strtoul(optarg, &endptr, 0);
		if (!endptr \|\| *endptr != '\0' \|\| (val & ~0xffff))
		die("invalid vendor id '%s'", optarg);
		vendor_id = (unsigned short)val;
		case 'w':
		wants_wipe = 1;
		break;
		}
		case 'h':
		usage();
		return 1;
		case '?':
		return 1;
		default:
		@@ -944,7 +966,7 @@ int main(int argc, char **argv)
		rname = argv[0];
		skip(1);
		}
		data = load_bootable_image(page_size, kname, rname, &sz, cmdline);
		data = load_bootable_image(kname, rname, &sz, cmdline);
		if (data == 0) return 1;
		fb_queue_download("boot.img", data, sz);
		fb_queue_command("boot", "booting");
		@@ -975,7 +997,7 @@ int main(int argc, char **argv)
		} else {
		skip(3);
		}
		data = load_bootable_image(page_size, kname, rname, &sz, cmdline);
		data = load_bootable_image(kname, rname, &sz, cmdline);
		if (data == 0) die("cannot load bootable image");
		fb_queue_flash(pname, data, sz);
		} else if(!strcmp(*argv, "flashall")) {