git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
embed_config.c
diff --git
a/arch/ppc/boot/simple/embed_config.c
b/arch/ppc/boot/simple/embed_config.c
index
4dc12e6
..
be0b6ca
100644
(file)
--- a/
arch/ppc/boot/simple/embed_config.c
+++ b/
arch/ppc/boot/simple/embed_config.c
@@
-16,7
+16,7
@@
#endif
#ifdef CONFIG_8260
#include <asm/mpc8260.h>
#endif
#ifdef CONFIG_8260
#include <asm/mpc8260.h>
-#include <asm/immap_
8260
.h>
+#include <asm/immap_
cpm2
.h>
#endif
#ifdef CONFIG_40x
#include <asm/io.h>
#endif
#ifdef CONFIG_40x
#include <asm/io.h>
@@
-97,7
+97,7
@@
embed_config(bd_t **bdp)
#endif /* CONFIG_MBX */
#if defined(CONFIG_RPXLITE) || defined(CONFIG_RPXCLASSIC) || \
#endif /* CONFIG_MBX */
#if defined(CONFIG_RPXLITE) || defined(CONFIG_RPXCLASSIC) || \
- defined(CONFIG_RPX
6
) || defined(CONFIG_EP405)
+ defined(CONFIG_RPX
8260
) || defined(CONFIG_EP405)
/* Helper functions for Embedded Planet boards.
*/
/* Because I didn't find anything that would do this.......
/* Helper functions for Embedded Planet boards.
*/
/* Because I didn't find anything that would do this.......
@@
-147,7
+147,7
@@
rpx_eth(bd_t *bd, u_char *cp)
}
}
}
}
-#ifdef CONFIG_RPX
6
+#ifdef CONFIG_RPX
8260
static uint
rpx_baseten(u_char *cp)
{
static uint
rpx_baseten(u_char *cp)
{
@@
-415,9
+415,9
@@
clk_8260(bd_t *bd)
{
uint scmr, vco_out, clkin;
uint plldf, pllmf, corecnf;
{
uint scmr, vco_out, clkin;
uint plldf, pllmf, corecnf;
- volatile
immap_t
*ip;
+ volatile
cpm2_map_t
*ip;
- ip = (
immap_t *)I
MAP_ADDR;
+ ip = (
cpm2_map_t *)CPM_
MAP_ADDR;
scmr = ip->im_clkrst.car_scmr;
/* The clkin is always bus frequency.
scmr = ip->im_clkrst.car_scmr;
/* The clkin is always bus frequency.
@@
-457,9
+457,9
@@
clk_8280(bd_t *bd)
{
uint scmr, main_clk, clkin;
uint pllmf, corecnf;
{
uint scmr, main_clk, clkin;
uint pllmf, corecnf;
- volatile
immap_t
*ip;
+ volatile
cpm2_map_t
*ip;
- ip = (
immap_t *)I
MAP_ADDR;
+ ip = (
cpm2_map_t *)CPM_
MAP_ADDR;
scmr = ip->im_clkrst.car_scmr;
/* The clkin is always bus frequency.
scmr = ip->im_clkrst.car_scmr;
/* The clkin is always bus frequency.
@@
-588,7
+588,7
@@
embed_config(bd_t **bdp)
}
#endif /* SBS8260 */
}
#endif /* SBS8260 */
-#ifdef CONFIG_RPX
6
+#ifdef CONFIG_RPX
8260
void
embed_config(bd_t **bdp)
{
void
embed_config(bd_t **bdp)
{