minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 05:25:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: xburst: fix broken access to global_data

Browse Source 
Fix access to global_data which is broken since commits:

commit 035cbe99cd2fd4adf9d7fd95aeebb5f814e37eb9
Author: Simon Glass <sjg@chromium.org>
Date:   Thu Dec 13 20:49:08 2012 +0000

    mips: Move per_clk and dev_clk to arch_global_data

    Move these field into arch_global_data and tidy up. The other
    CONFIG_JZSOC fields are used by various architectures, so just remove
    the #ifdef bracketing for these.

    Signed-off-by: Simon Glass <sjg@chromium.org>

commit 582601da2f90b1850aa19f7820b1623c79b3dac6
Author: Simon Glass <sjg@chromium.org>
Date:   Thu Dec 13 20:48:35 2012 +0000

    arm: Move lastinc to arch_global_data

    Move this field into arch_global_data and tidy up.

    Signed-off-by: Simon Glass <sjg@chromium.org>

commit 66ee69234795c0596f84b25f06b7fbc2e8ed214c
Author: Simon Glass <sjg@chromium.org>
Date:   Thu Dec 13 20:48:34 2012 +0000

    arm: Move tbl to arch_global_data

    Move this field into arch_global_data and tidy up.

    Signed-off-by: Simon Glass <sjg@chromium.org>

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Xiangfu Liu <xiangfu@openmobilefree.net>
This commit is contained in:
Daniel Schwierzeck 2013-02-12 22:22:12 +01:00
parent 58864ddc72
commit 97b920dab1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/cpu/xburst/jz4740.c
View File

@ -201,10 +201,10 @@ void calc_clocks(void)
pllout = __cpm_get_pllout(); pllout = __cpm_get_pllout();
gd->cpu_clk = pllout / div[__cpm_get_cdiv()]; gd->cpu_clk = pllout / div[__cpm_get_cdiv()];
gd->sys_clk = pllout / div[__cpm_get_hdiv()]; gd->arch.sys_clk = pllout / div[__cpm_get_hdiv()];
gd->per_clk = pllout / div[__cpm_get_pdiv()]; gd->arch.per_clk = pllout / div[__cpm_get_pdiv()];
gd->mem_clk = pllout / div[__cpm_get_mdiv()]; gd->mem_clk = pllout / div[__cpm_get_mdiv()];
gd->dev_clk = CONFIG_SYS_EXTAL; gd->arch.dev_clk = CONFIG_SYS_EXTAL;
} }
void rtc_init(void) void rtc_init(void)

3
arch/mips/include/asm/global_data.h
View File

@ -32,6 +32,9 @@ struct arch_global_data {
/* There are other clocks in the jz4740 */ /* There are other clocks in the jz4740 */
unsigned long per_clk; /* Peripheral bus clock */ unsigned long per_clk; /* Peripheral bus clock */
unsigned long dev_clk; /* Device clock */ unsigned long dev_clk; /* Device clock */
unsigned long sys_clk;
unsigned long tbl;
unsigned long lastinc;
#endif #endif
}; };