diff mbox

[U-Boot,1/3] SPL: P1022DS: switch to new multibus/multiadapter support

Message ID 1378285425-6783-1-git-send-email-ying.zhang@freescale.com
State Superseded
Delegated to: Heiko Schocher
Headers show

Commit Message

ying.zhang@freescale.com Sept. 4, 2013, 9:03 a.m. UTC 
From: Ying Zhang <b40530@freescale.com>

- 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>
---
 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds |    5 +++++
 board/freescale/p1022ds/spl.c           |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)
diff mbox

Patch

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