[coreboot-gerrit] Patch merged into coreboot/master: 0b341b3 ipq/arm: Redesign hooks for bootblock

[gerrit at coreboot.org]

the following patch was just integrated into master:
commit 0b341b341d5ae5b9270b3dd68b97b9d4dd2b4ee7
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Wed Apr 23 11:09:44 2014 -0700

    ipq/arm: Redesign hooks for bootblock
    
    The following patches had to be squashed
    to properly build all the different ARM boards.
    
    ipq8064: storm: re-arrange bootblock initialization
    
    The recent addition of the storm bootblock initialization broke
    compilation of Exynos platforms. The SOC specific code needs to be
    kept in the respective source files, not in the common CPU code.
    
    As of now coreboot does not provide a separate SOC initialization API.
    In general it makes sense to invoke SOC initialization from the board
    initialization code, as the board knows what SOC it is running on.
    
    Presently all what's need initialization on 8064 is the timer. This
    patch adds the SOC initialization framework for 8064 and moves there
    the related code.
    
    BUG=chrome-os-partner:27784
    TEST=manual
      . nyan_big, peach_pit, and storm targets build fine now.
    
    Original-Change-Id: Iae9a021f8cbf7d009770b02d798147a3e08420e8
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/197835
    (cherry picked from commit 3ea7307b531b1a78c692e4f71a0d81b32108ebf0)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    arm: Redesign mainboard and SoC hooks for bootblock
    
    This patch makes some slight changes to the way bootblock_cpu_init() and
    bootblock_mainboard_init() are used on ARM. Experience has shown that
    nearly every board needs either one or both of these hooks, so having
    explicit Kconfigs for them has become unwieldy. Instead, this patch
    implements them as a weak symbol that can be overridden by mainboard/SoC
    code, as the more recent arm64_soc_init() is also doing.
    
    Since the whole concept of a single "CPU" on ARM systems has kinda died
    out, rename bootblock_cpu_init() to bootblock_soc_init(). (This had
    already been done on Storm/ipq806x, which is now adjusted to directly
    use the generic hook.) Also add a proper license header to
    bootblock_common.h that was somehow missing.
    
    Leaving non-ARM32 architectures out for now, since they are still using
    the really old and weird x86 model of directly including a file. These
    architectures should also eventually be aligned with the cleaner ARM32
    model as they mature.
    
    BRANCH=None
    BUG=chrome-os-partner:32123
    TEST=Booted on Pinky. Compiled for Storm and confirmed in the
    disassembly that bootblock_soc_init() is still compiled in and called
    right before the (now no-op) bootblock_mainboard_init().
    
    Original-Change-Id: I57013b99c3af455cc3d7e78f344888d27ffb8d79
    Original-Signed-off-by: Julius Werner <jwerner at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/231940
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    (cherry picked from commit 257aaee9e3aeeffe50ed54de7342dd2bc9baae76)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Id055fe60a8caf63a9787138811dc69ac04dfba57
    Reviewed-on: http://review.coreboot.org/7879
    Reviewed-by: David Hendricks <dhendrix at chromium.org>
    Tested-by: build bot (Jenkins)
    Reviewed-by: Paul Menzel <paulepanter at users.sourceforge.net>
    Reviewed-by: Kyösti Mälkki <kyosti.malkki at gmail.com>


See http://review.coreboot.org/7879 for details.

-gerrit