diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-07-10 10:26:07 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-07-10 10:26:07 +0200 |
| commit | 794a5924972fc8073616e98a2668da4a5f9aea90 (patch) | |
| tree | dd0db39b3e183b5bcb0300d5377d7a0d5ac5fd0c /include/asm-ppc/global_data.h | |
| parent | f2aeecc320f5b181b30effcaa67683aec8d5a843 (diff) | |
| parent | 4188f0491886b3b486164e819c0a83fdb97efd7d (diff) | |
| download | blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.tar.gz blackbird-obmc-uboot-794a5924972fc8073616e98a2668da4a5f9aea90.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'include/asm-ppc/global_data.h')
| -rw-r--r-- | include/asm-ppc/global_data.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index ea702662f8..c5ac6584ac 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -96,6 +96,9 @@ typedef struct global_data { uint mp_alloc_base; uint mp_alloc_top; #endif /* CONFIG_QE */ +#if defined(CONFIG_FSL_LAW) + u32 used_laws; +#endif #if defined(CONFIG_MPC5xxx) unsigned long ipb_clk; unsigned long pci_clk; @@ -113,7 +116,7 @@ typedef struct global_data { unsigned long pev_clk; unsigned long flb_clk; #endif - unsigned long ram_size; /* RAM size */ + phys_size_t ram_size; /* RAM size */ unsigned long reloc_off; /* Relocation Offset */ unsigned long reset_status; /* reset status register at boot */ unsigned long env_addr; /* Address of Environment struct */ |
