ignore user_type in android nand MBR; these can be other than 0 or 2
contrary to Allwinner's expectations
allow the user to set the user_type from the command line
(optional -- backwards compatible with existing usage
sends the nand driver a BLKRRPART via ioctl; depends on kernel mods
that allow on-the-fly repartitioning of the nand
Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools
cosmetic change: got rid of "if (1 || ...)" tests and enclosing blocks
Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools

Conflicts:
	nand-part.c
Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools

Conflicts:
	nand-part.c
build both A10 and A20 nand-part executables
allow setting of partition 1 size/offset
if -f option is used, force writing of MBR header, even if CRC or
header magic/version are incorrect (for recovery only)
added backwards compatibility with older version of nand-part: if the starting
offset of partition 1 isn't specified, switch to old argument syntax that retains
partition 1 values
display partition numbers starting at "1" instead of "0"; corresponds to
command usage and partition numbering in linux nand driver
print out correct number of partitions
check that starting offset of partition 1 is beyond MBR area
set MBR_MAGIC to "softw411" and MBR_VERSION to 0x200 in nand-part-a20.h
A20 boot1 checks the MBR magic string but not the version, but let's
check it anyway (can always force now with the -f option if the version
isn't 0x200 on the system)