diff options
| author | Tom Rini <trini@ti.com> | 2013-02-12 19:03:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-12 19:03:59 -0500 |
| commit | 9c748e02d99476e6a08d55eadfd8776edffe1e2e (patch) | |
| tree | 74018fa9cefe7428a49b398355885b840687cf32 /arch/mips/include/asm | |
| parent | 1634e969189ea428bc5fb9cf7d70bb314c98fc4f (diff) | |
| parent | 04380c651a2ff0d1495822321d2b7668dcd02537 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/config.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/global_data.h | 3 | ||||
| -rw-r--r-- | arch/mips/include/asm/u-boot-mips.h | 19 |
3 files changed, 20 insertions, 4 deletions
diff --git a/arch/mips/include/asm/config.h b/arch/mips/include/asm/config.h index 02fbfb3abf..049c44eaf8 100644 --- a/arch/mips/include/asm/config.h +++ b/arch/mips/include/asm/config.h @@ -21,6 +21,4 @@ #ifndef _ASM_CONFIG_H_ #define _ASM_CONFIG_H_ -#define CONFIG_NEEDS_MANUAL_RELOC - #endif diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index b39737fea3..f912428cae 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -32,6 +32,9 @@ struct arch_global_data { /* There are other clocks in the jz4740 */ unsigned long per_clk; /* Peripheral bus clock */ unsigned long dev_clk; /* Device clock */ + unsigned long sys_clk; + unsigned long tbl; + unsigned long lastinc; #endif }; diff --git a/arch/mips/include/asm/u-boot-mips.h b/arch/mips/include/asm/u-boot-mips.h index 6f26dfac56..a483166a9c 100644 --- a/arch/mips/include/asm/u-boot-mips.h +++ b/arch/mips/include/asm/u-boot-mips.h @@ -5,7 +5,22 @@ * Copyright (C) 2003 Wolfgang Denk, DENX Software Engineering, wd@denx.de */ -extern ulong uboot_end_data; -extern ulong uboot_end; +static inline unsigned long bss_start(void) +{ + extern ulong __bss_start; + return (unsigned long) &__bss_start; +} + +static inline unsigned long bss_end(void) +{ + extern ulong __bss_end; + return (unsigned long) &__bss_end; +} + +static inline unsigned long image_copy_end(void) +{ + extern ulong __image_copy_end; + return (unsigned long) &__image_copy_end; +} extern int incaip_set_cpuclk(void); |