On Sat, Apr 23, 2011 at 10:30:03PM -0600, Stephen Warren wrote:
> The content of the machine descriptions has be re-organized. Without fixing
> the board-dt.c copy, the system will fail to boot (BUG_ON during timer
> initialization, which happens before printk is operational, leading to a
> silent hang early during kernel boot). Solve this basiclaly by copying the
> existing Harmony version over the copy in board-dt.c
> 
> Signed-off-by: Stephen Warren <swar...@nvidia.com>
> ---
>  arch/arm/mach-tegra/board-dt.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c
> index 899311b..7b9d469 100644
> --- a/arch/arm/mach-tegra/board-dt.c
> +++ b/arch/arm/mach-tegra/board-dt.c
> @@ -175,10 +175,11 @@ static const char * tegra_dt_board_compat[] = {
>  };
>  
>  DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
> -     .fixup          = tegra_dt_fixup,

I take it that with memory ranges encoded into the device tree this
fixup is no longer needed?  I'll drop the tegra_dt_fixup() function
from the file too then.

> -     .init_irq       = tegra_init_irq,
> -     .init_machine   = tegra_dt_init,
> -     .map_io         = tegra_map_common_io,
> -     .timer          = &tegra_timer,
> +     .boot_params    = 0x00000100,

boot_params isn't used for dtb boot, so I'll drop this line.

> +     .map_io         = tegra_map_common_io,
> +     .init_early     = tegra_init_early,
> +     .init_irq       = tegra_init_irq,
> +     .timer          = &tegra_timer,
> +     .init_machine   = tegra_dt_init,
>       .dt_compat      = tegra_dt_board_compat,
>  MACHINE_END

I'll also squash these changes into the clean commit in
devicetree/test.  I'm just building and testing now.

Thanks!
g.


_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
http://lists.linaro.org/mailman/listinfo/linaro-dev

Reply via email to