From 81b867aa4451e745b9706b00e53793df6b52f42a Mon Sep 17 00:00:00 2001 From: Ying Zhang Date: Wed, 4 Sep 2013 17:03:45 +0800 Subject: [PATCH] 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 --- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 5 +++++ board/freescale/p1022ds/spl.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index 85ec74ba94..bc132673a5 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 b9dbf81b3f..7f151e38cf 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 -- 2.25.1