Merge git://www.denx.de/git/u-boot into uboot

Merge branch 'master_merge_new-image' of /home/tur/git/u-boot

Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing

Conflicts:

common/cmd_bootm.c
cpu/mpc8xx/cpu.c

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

[new uImage] Do not compile new uImage format support by default

Disable default building of new uImage format support in preparation
for merge with the master. Support for new format can be enabled

[new uImage] Do not compile new uImage format support by default

Disable default building of new uImage format support in preparation
for merge with the master. Support for new format can be enabled on
a per-board basis, by defining the following in the board's config file:

#define CONFIG_FIT 1
#define CONFIG_OF_LIBFDT 1

This can be optionally defined to give more verbose output:

#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */

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

show more ...

Add MD5 support to the new uImage format

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

[new uImage] Fix definition of common bootm_headers_t fields

verify, autostart and lmb fields are used regardless of CONFIG_FIT
setting, move their definitions to common section.

Signed-off-by: Mar

[new uImage] Fix definition of common bootm_headers_t fields

verify, autostart and lmb fields are used regardless of CONFIG_FIT
setting, move their definitions to common section.

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

show more ...

[new uImage] Add proper ramdisk/FDT handling when FIT configuration is used

Save FIT configuration provied in the first bootm argument and use it
when to get ramdisk/FDT subimages when second and th

[new uImage] Add proper ramdisk/FDT handling when FIT configuration is used

Save FIT configuration provied in the first bootm argument and use it
when to get ramdisk/FDT subimages when second and third (ramdisk/FDT)
arguments are not specified.

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

show more ...

[new uImage] Add node offsets for FIT images listed in struct bootm_headers

This patch adds new node offset fields to struct bootm_headers
and updates bootm_headers processing code to make use of th

[new uImage] Add node offsets for FIT images listed in struct bootm_headers

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: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Remove unnecessary arguments passed to ramdisk routines

boot_get_ramdisk() and image_get_ramdisk() do not need all
cmdtp, flag, argc and argv arguments. Simplify routines definition.

S

[new uImage] Remove unnecessary arguments passed to ramdisk routines

boot_get_ramdisk() and image_get_ramdisk() do not need all
cmdtp, flag, argc and argv arguments. Simplify routines definition.

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

show more ...

[new uImage] Add support for new uImage format to mkimage tool

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

mkimage [-D dtc_option

[new uImage] Add support for new uImage format to mkimage tool

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: Bartlomiej Sieka <tur@semihalf.com>

show more ...

[new uImage] Make node unit names const in struct bootm_headers

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

[new uImage] New uImage low-level API

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

fit_ - routines handling globa

[new uImage] New uImage low-level API

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: Bartlomiej Sieka <tur@semihalf.com>
Signed-off-by: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Share common uImage code between mkimage and U-boot

This patch adds the following common routines:

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

[new uImage] Share common uImage code between mkimage and U-boot

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: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Update naming convention for bootm/uImage related code

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

genimg_ - dual forma

[new uImage] Update naming convention for bootm/uImage related code

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: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Provide ability to restrict region used for boot images

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

[new uImage] Provide ability to restrict region used for boot images

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: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Use lmb for bootm allocations

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 in

[new uImage] Use lmb for bootm allocations

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: Kumar Gala <galak@kernel.crashing.org>

show more ...

[new uImage] Add autostart flag to bootm_headers structure

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

[new uImage] Add autostart flag to bootm_headers structure

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: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Introduce lmb from linux kernel for memory mgmt of boot images

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

[new uImage] Introduce lmb from linux kernel for memory mgmt of boot images

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: Kumar Gala <galak@kernel.crashing.org>

show more ...

[new uImage] rework error handling so common functions don't reset

Changed image_get_ramdisk() to just return NULL on error and have
get_ramdisk() propogate that error to the caller. It's left to t

[new uImage] rework error handling so common functions don't reset

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: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Don't pass kdb to ramdisk_high since we may not have one

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. Al

[new uImage] Don't pass kdb to ramdisk_high since we may not have one

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: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Correct raw FDT blob handlig when CONFIG_FIT is disabled

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

[new uImage] Correct raw FDT blob handlig when CONFIG_FIT is disabled

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: Marian Balakowicz <m8@semihalf.com>

show more ...

[new uImage] Move image verify flag to bootm_headers structure

Do not pass image verification flag directly to related routines.
Simplify argument passing and move it to the bootm_header structure w

[new uImage] Move image verify flag to bootm_headers structure

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: Marian Balakowicz <m8@semihalf.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>

show more ...

[new uImage] Add dual format uImage support framework

This patch adds framework for dual format images. Format detection is added
and the bootm controll flow is updated to include cases for new FIT

[new uImage] Add dual format uImage support framework

This patch adds framework for dual format images. Format detection is added
and the bootm controll flow is updated to include cases for new FIT format
uImages.

When the legacy (image_header based) format is detected appropriate
legacy specific handling is invoked. For the new (FIT based) format uImages
dual boot framework has a minial support, that will only print out a
corresponding debug messages. Implementation of the FIT specific handling will
be added in following patches.

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

show more ...

[new uImage] Rename and move print_image_hdr() routine

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

[new uImage] Add fit_parse_conf() and fit_parse_subimage() routines

Introducing routines for parsing new uImage format bootm arguments:
[<addr>]#<conf> - configuration specification
[<addr>]:<subim

[new uImage] Add fit_parse_conf() and fit_parse_subimage() routines

Introducing routines for parsing new uImage format bootm arguments:
[<addr>]#<conf> - configuration specification
[<addr>]:<subimg> - subimage specification

New format images can contain multiple subimages of the same type. For example
a single new format image file can contain three kernels, two ramdisks and a
couple of FDT blobs. Subimage and configuration specifications are extensions
to bootm (and other image-related commands) arguments' syntax that allow to
specify which particular subimage should be operated on.

Subimage specification is used to denote a particular subimage. Configurations
are a bit more complex -- they are used to define a particualr booting setup,
for example a (kernel, fdt blob) pair, or a (kernel, ramdisk, fdt blob) tuple,
etc.

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

show more ...