diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-14 12:59:35 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-14 12:59:35 +0200 |
| commit | 0e8a7b2f1544a593270faf94d028fb48b6b697ea (patch) | |
| tree | 0083e790432a5226f83f5384a961165b22d36d27 | |
| parent | 6df0efd5c86ca1689deeb2738b46b7d83ce228ef (diff) | |
| parent | 05c7e9070fe4d751e029fd9524bfbbc93cbb1393 (diff) | |
| download | talos-obmc-uboot-0e8a7b2f1544a593270faf94d028fb48b6b697ea.tar.gz talos-obmc-uboot-0e8a7b2f1544a593270faf94d028fb48b6b697ea.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
| -rw-r--r-- | examples/stubs.c | 6 | ||||
| -rw-r--r-- | include/configs/rsk7203.h | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/examples/stubs.c b/examples/stubs.c index ec5353216b..a8cb954282 100644 --- a/examples/stubs.c +++ b/examples/stubs.c @@ -162,11 +162,13 @@ gd_t *global_data; #x ":\n" \ " mov r13, 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" \ " 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) /* * g7 holds the pointer to the global_data. g1 is call clobbered. diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index d99e4f3274..1f20e57197 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -104,4 +104,9 @@ #define CMT_CLK_DIVIDER 32 /* 8 (default), 32, 128 or 512 */ #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 */ |
