diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /arch/arm/mach-bcmring/Makefile.boot | |
| parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
| parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-bcmring/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-bcmring/Makefile.boot | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-bcmring/Makefile.boot b/arch/arm/mach-bcmring/Makefile.boot new file mode 100644 index 000000000000..fb53b283bebb --- /dev/null +++ b/arch/arm/mach-bcmring/Makefile.boot | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | # Address where decompressor will be written and eventually executed. | ||
| 2 | # | ||
| 3 | # default to SDRAM | ||
| 4 | zreladdr-y := $(CONFIG_BCM_ZRELADDR) | ||
| 5 | params_phys-y := 0x00000800 | ||
| 6 | |||