← Back to branch summary

~ubuntu-branches/ubuntu/maverick/uboot-imx/maverick

« back to all changes in this revision

Viewing changes to cpu/mpc86xx/fdt.c

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2010-01-06 09:28:25 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100106092825-q8o7x811035syh8k
Tags: 2009.08-0ubuntu1
* move to new upstream (2009.08)
* move to new freescale patchset for the 2009.08 release
* remove README.nios_CONFIG_SYS_NIOS_CPU from debian/docs, 
  this is not shipped upstream anymore
* update 1000_fix_gcc_4.4_compability.patch to apply to the new code
* Makefile target is now mx51_bbg_config, update rules accordingly
* switch everything to to3 (including the binary package)

Show diffs side-by-side

added added

removed removed

Lines of Context:
cpu/mpc86xx/fdt.c
9
9
#include <common.h>
10
10
#include <libfdt.h>
11
11
#include <fdt_support.h>
12
 
#include "mp.h"
 
12
#include <asm/mp.h>
13
13
 
14
14
DECLARE_GLOBAL_DATA_PTR;
15
15
 
16
16
void ft_cpu_setup(void *blob, bd_t *bd)
17
17
{
18
 
#if (CONFIG_NUM_CPUS > 1)
 
18
#ifdef CONFIG_MP
19
19
        int off;
20
 
        u32 bootpg;
 
20
        u32 bootpg = determine_mp_bootpg();
21
21
#endif
22
22
 
23
23
        do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
48
48
                               "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
49
49
#endif
50
50
 
51
 
#if (CONFIG_NUM_CPUS > 1)
52
 
        /* if we have 4G or more of memory, put the boot page at 4Gb-1M */
53
 
        if (gd->ram_size > 0xfffff000)
54
 
                bootpg = 0xfff00000;
55
 
        else
56
 
                bootpg = gd->ram_size - (1024 * 1024);
57
 
 
 
51
#ifdef CONFIG_MP
58
52
        /* Reserve the boot page so OSes dont use it */
59
53
        off = fdt_add_mem_rsv(blob, bootpg, (u64)4096);
60
54
        if (off < 0)