summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Zhang <b40530@freescale.com>2013-09-04 17:03:45 +0800
committerHeiko Schocher <hs@denx.de>2013-09-09 07:43:43 +0200
commit81b867aa4451e745b9706b00e53793df6b52f42a (patch)
treed219187680f9c725b46b56af764f2b8b7f6f2da4
parent1affd4d4a3fe512050e1ad1636d9360c670da531 (diff)
downloadu-boot-imx-81b867aa4451e745b9706b00e53793df6b52f42a.zip
u-boot-imx-81b867aa4451e745b9706b00e53793df6b52f42a.tar.gz
u-boot-imx-81b867aa4451e745b9706b00e53793df6b52f42a.tar.bz2
SPL: P1022DS: switch to new multibus/multiadapter support
- Added section "u_boot_list" in arch/powerpc/cpu/mpc85xx/u-boot-spl.lds - Use the function i2c_init_all instead of i2c_init Signed-off-by: Ying Zhang <b40530@freescale.com>
-rw-r--r--arch/powerpc/cpu/mpc85xx/u-boot-spl.lds5
-rw-r--r--board/freescale/p1022ds/spl.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
index 85ec74b..bc13267 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
@@ -44,6 +44,11 @@ SECTIONS
}
_edata = .;
+ . = ALIGN(4);
+ .u_boot_list : {
+ KEEP(*(SORT(.u_boot_list*)));
+ }
+
. = .;
__start___ex_table = .;
__ex_table : { *(__ex_table) }
diff --git a/board/freescale/p1022ds/spl.c b/board/freescale/p1022ds/spl.c
index b9dbf81..7f151e3 100644
--- a/board/freescale/p1022ds/spl.c
+++ b/board/freescale/p1022ds/spl.c
@@ -102,7 +102,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
env_relocate();
#endif
- i2c_init(CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C
+ i2c_init_all();
+#else
+ i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
gd->ram_size = initdram(0);
#ifdef CONFIG_SPL_NAND_BOOT