This patch allocates a set of show_boot_progress() IDs for new uImage format
and adds show_boot_progress() calls in new uImage format handling code.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Updated commands:

docboot  - cmd_doc.c
fdcboot  - cmd_fdc.c
diskboot - cmd_ide.c
nboot    - cmd_nand.c
scsiboot - cmd_scsi.c
usbboot  - cmd_usb.c
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

autoscript() routine is updated to accept second argument, which
is only used for FIT images and provides a FIT subimage unit name.

autoscript() routine callers must now pass two arguments. For
non-interactive use (like in cmd_load.c, cmd_net.c), new environment
variable 'autoscript_uname' is introduced and used as a FIT
subimage unit name source.

autoscript command accepts extended syntax of the addr argument:
addr:<subimg_uname>
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

This patch updates architecture specific implementations of
do_bootm_linux() adding new uImage format handling for
operations like get kernel entry point address, get kernel
image data start address.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

This patch adds new node offset fields to struct bootm_headers
and updates bootm_headers processing code to make use of them.
Saved node offsets allow to avoid repeating fit_image_get_node() calls.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Support for new (FIT) format uImages is added to powerpc specific
boot_get_fdt() routine which now recognizes, sanity checks FIT image
and is able to access data sections of the requested component image.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Re-enable interrupts if we return from do_bootm_<os> and 'autostart'
environment variable is not set to 'yes'.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

boot_get_ramdisk() and image_get_ramdisk() do not need all
cmdtp, flag, argc and argv arguments. Simplify routines definition.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

This patch updates boot_get_ramdisk() routine adding format
verification and handling for new (FIT) uImages.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

New format uImages are recognized by the bootm command,
validity of specified kernel component image is checked and
its data section located and used for further processing
(uncompress, load, etc.)
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

imls and iminfo can now recognize nad print out contents of the new (FIT)
format uImages.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Support for the new uImage format (FIT) is added to mkimage tool.
Commandline syntax is appropriately extended:

mkimage [-D dtc_options] -f fit-image.its fit-image

mkimage (together with dtc) takes fit-image.its and referenced therein
binaries (like vmlinux.bin.gz) as inputs, and produces fit-image file -- the
final image that can be transferred to the target (e.g., via tftp) and then
booted using the bootm command in U-Boot.
Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>

Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Add FDT-based functions for handling new format component images,
configurations, node operations, property get/set, etc.

fit_        - routines handling global new format uImage operations
              like get/set top level property, process all nodes, etc.
fit_image_  - routines handling component images subnodes
fit_conf_   - routines handling configurations node
Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Do not use global fdt blob pointer, calculate blob size from routine
argument blob pointer.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

This patch adds an fdt_next_node() function which can be used to
iterate through nodes of the tree while keeping track of depth.  This
function is used to simplify the iteration code in a lot of other
functions, and is also exported for use by library users.
Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>

Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>

Signed-off-by: NBartlomiej Sieka <tur@semihalf.com>

Use uint32_t when accessing size table in image_multi_count() and
image_multi_getimg() for multi component images.

Add missing uimage_to_cpu() endianness conversion.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

This patch adds the following common routines:

1) Dedicated mkimage print_header() is replaced with common
image_print_contents()
image_print_contents_noindent()

2) Common os/arch/type/comp fields name <--> id translation routines
genimg_get_os_name()
genimg_get_arch_name()
genimg_get_type_name()
genimg_get_comp_name()
genimg_get_os_id()
genimg_get_arch_id()
genimg_get_type_id()
genimg_get_comp_id()
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

This patch introduces the following prefix convention for the
image format handling and bootm related code:

genimg_		- dual format shared code
image_		- legacy uImage format specific code
fit_		- new uImage format specific code
boot_		- booting process related code

Related routines are renamed and a few pieces of code are moved around and
re-grouped.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

Allow the user to set 'bootm_low' and 'bootm_size' env vars as a way
to restrict what memory range is used for bootm.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

Convert generic ramdisk_high(), get_boot_cmdline(), get_boot_kbd()
functions over to using lmb for allocation of the ramdisk, command line
and kernel bd info.

Convert PPC specific fdt_relocate() to use lmb for allocation of the device
tree.

Provided a weak function that board code can call to do additional
lmb reserves if needed.

Also introduce the concept of bootmap_base to specify the offset in
physical memory that the bootmap is located at.  This is used for
allocations of the cmdline, kernel bd, and device tree as they should
be contained within bootmap_base and bootmap_base + CFG_BOOTMAPSZ.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>

The autostart env variable was dropped as part of the initial new uImage
cleanup.  Add it back here so the arch specific code can decide if it
wants to really boot or not.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

Introduce the LMB lib used on PPC in the kernel as a clean way to manage
the memory spaces used by various boot images and structures.  This code
will allow us to simplify the code in bootm and its support functions.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>

For historical reasons we limited the stack to 256M because some boards
could only map that much via BATS.  However newer boards are capable of
mapping more memory (for example 85xx is capable of doing up to 2G).
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

Changed image_get_ramdisk() to just return NULL on error and have
get_ramdisk() propogate that error to the caller.  It's left to the
caller to call do_reset() if it wants to.

Also moved calling do_reset() in get_fdt() and fdt_relocate() on ppc
to a common location.  In the future we will change get_fdt() and
fdt_relocate() to return success/failure and not call do_reset() at all.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

Doing the fdt before the ramdisk allows us to grow the fdt w/o concern
however it does mean we have to go in and fixup the initrd info since
we don't know where it will be.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>

If we are bootin OF style than we can skip setting up some things
that are used for the old boot method.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

We don't actually need the kdb param as we are just using it to get
bd->bi_memsize which we can get from gd->bd->bi_memsize.  Also, if we
boot via OF we might not actually fill out a kdb.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
Acked-by: NMarian Balakowicz <m8@semihalf.com>

Dual format image code must properly handle all three FDT passing methods:
- raw FDT blob passed
- FDT blob embedded in the legacy uImage
- FDT blob embedded in the new uImage

This patch enables proper raw FDT handling when no FIT imaeg support
is compiled in. This is a bit tricky as we must dected FIT format even
when FIT uImage handling is not enabled as both FIT uImages and raw FDT
blobs use tha same low level format (libfdt).
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

FDT blob may be passed either: (1) raw (2) or embedded in the legacy uImage
(3) or embedded in the new uImage. For the (2) case embedding image must be
verified before we get FDT from it. This patch factors out legacy image
specific verification routine to the separate helper routine.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>
Acked-by: NKumar Gala <galak@kernel.crashing.org>

Legacy image specific verification is factored out to a separate helper
routine to keep get_kernel() generic and simple.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>
Acked-by: NKumar Gala <galak@kernel.crashing.org>

Do not pass image verification flag directly to related routines.
Simplify argument passing and move it to the bootm_header structure which
contains curently processed image specific data and is already being passed
on the argument list.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>
Acked-by: NKumar Gala <galak@kernel.crashing.org>

Signed-off-by: NMarian Balakowicz <m8@semihalf.com>

When CONFIG_HAS_DATAFLASH is not defined gen_get_image() routine has nothing
to do, update its control flow to better reflect that simple case.
Signed-off-by: NMarian Balakowicz <m8@semihalf.com>
Acked-by: NKumar Gala <galak@kernel.crashing.org>