colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-sh

Browse Source
This commit is contained in:
Wolfgang Denk
2008-10-14 12:59:35 +02:00
parent 6df0efd5c8 05c7e9070f
commit 0e8a7b2f15
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/stubs.c
View File

@@ -162,11 +162,13 @@ gd_t *global_data;
#x ":\n" \ #x ":\n" \
" mov r13, r1\n" \ " mov r13, r1\n" \
" add %0, r1\n" \ " add %0, r1\n" \
" add %1, r1\n" \ " mov.l @r1, r2\n" \
" add %1, r2\n" \
" mov.l @r2, r1\n" \
" jmp @r1\n" \ " jmp @r1\n" \
" nop\n" \ " nop\n" \
" nop\n" \ " nop\n" \
: : "i"(offsetof(gd_t, jt)), "i"(XF_ ## x * sizeof(void *)) : "r1"); : : "i"(offsetof(gd_t, jt)), "i"(XF_ ## x * sizeof(void *)) : "r1", "r2");
#elif defined(CONFIG_SPARC) #elif defined(CONFIG_SPARC)
/* /*
* g7 holds the pointer to the global_data. g1 is call clobbered. * g7 holds the pointer to the global_data. g1 is call clobbered.

5
include/configs/rsk7203.h
View File

@@ -104,4 +104,9 @@
#define CMT_CLK_DIVIDER 32 /* 8 (default), 32, 128 or 512 */ #define CMT_CLK_DIVIDER 32 /* 8 (default), 32, 128 or 512 */
#define CFG_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER) #define CFG_HZ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
/* Network interface */
#define CONFIG_DRIVER_SMC911X
#define CONFIG_DRIVER_SMC911X_16_BIT
#define CONFIG_DRIVER_SMC911X_BASE (0x24000000)
#endif /* __RSK7203_H */ #endif /* __RSK7203_H */