diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
| commit | b90296fc39a33f84bb2b0aa79bf997be495ba791 (patch) | |
| tree | 4ea0d61df25d10fe7552aedf781fd167f4c670fe /include/asm-m68k/global_data.h | |
| parent | e80e585b00fbbab7ad1bf71619741f2c5b029ab7 (diff) | |
| parent | 527c80f012030fa0b51f8594847ec56c9317e9b1 (diff) | |
| download | u-boot-imx-b90296fc39a33f84bb2b0aa79bf997be495ba791.zip u-boot-imx-b90296fc39a33f84bb2b0aa79bf997be495ba791.tar.gz u-boot-imx-b90296fc39a33f84bb2b0aa79bf997be495ba791.tar.bz2 | |
Merge commit 'origin/master'
Diffstat (limited to 'include/asm-m68k/global_data.h')
| -rw-r--r-- | include/asm-m68k/global_data.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-m68k/global_data.h b/include/asm-m68k/global_data.h index f68352f..9d9894b 100644 --- a/include/asm-m68k/global_data.h +++ b/include/asm-m68k/global_data.h @@ -39,6 +39,14 @@ typedef struct global_data { unsigned long baudrate; unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; +#ifdef CONFIG_PCI + unsigned long pci_clk; +#endif +#ifdef CONFIG_EXTRA_CLOCK + unsigned long inp_clk; + unsigned long vco_clk; + unsigned long flb_clk; +#endif unsigned long ram_size; /* RAM size */ unsigned long reloc_off; /* Relocation Offset */ unsigned long reset_status; /* reset status register at boot */ |