From 90870d9846e6a302823712acf6d40f947e60ed75 Mon Sep 17 00:00:00 2001 From: york Date: Fri, 2 Jul 2010 22:25:59 +0000 Subject: powerpc/8xxx: Fix quad-rank DIMMs support on corenet_ds board. The board specific parameters associated with quad rank dimms where missing. This fixes it so the board will function if quad rank dimms are placed in it. Signed-off-by: York Sun Signed-off-by: Kumar Gala --- include/configs/corenet_ds.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index dd609da8f0..3dcee85d8e 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -124,7 +124,7 @@ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_DIMM_SLOTS_PER_CTLR 1 -#define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) +#define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) #define CONFIG_DDR_SPD #define CONFIG_FSL_DDR3 -- cgit v1.2.1 From a2243b84bf5aa1f789a19e12f03849702d418986 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 19 Aug 2010 01:48:14 -0500 Subject: powerpc/83xx: Fix build issue with ve8313 board due to lbus changes We get two build errors: fsl_elbc_nand.c: In function 'fsl_elbc_run_command': fsl_elbc_nand.c:231: error: 'fsl_lbc_t' has no member named 'lsor' make[1]: *** [/work/wd/tmp-ppc/drivers/mtd/nand/fsl_elbc_nand.o] Error 1 and ve8313.c: In function 'initdram': ve8313.c:104: error: expected '=', ',', ';', 'asm' or '__attribute__' before '*' token ve8313.c:104: error: 'lbc' undeclared (first use in this function) ve8313.c:104: error: (Each undeclared identifier is reported only once ve8313.c:104: error: for each function it appears in.) ve8313.c:104: error: 'immap_t' has no member named 'lbus' make[1]: *** [ve8313.o] Error 1 make: *** [board/ve8313/libve8313.a] Error 2 Due to changes to unifiy local bus struct definitions. Reported-by: Wolfgang Denk Signed-off-by: Kumar Gala --- include/configs/ve8313.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index 1589913a5e..56d24f9014 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -39,6 +39,7 @@ #define CONFIG_VE8313 1 #define CONFIG_PCI 1 +#define CONFIG_FSL_ELBC 1 #define CONFIG_BOARD_EARLY_INIT_F 1 -- cgit v1.2.1 From 2fefa2ae868d3508ff432ba73a0db53356035c71 Mon Sep 17 00:00:00 2001 From: Albert Aribaud Date: Fri, 27 Aug 2010 18:26:03 +0200 Subject: suen3: remove CONFIG_HARD_I2C and related defines These are not used on this board, which uses soft I2C instead. Signed-off-by: Albert Aribaud Acked-by: Prafulla Wadaskar Acked-by: Heiko Schocher --- include/configs/km_arm.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'include') diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index 6519c9042c..1617e697de 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -142,16 +142,8 @@ /* * I2C related stuff */ -#undef CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SOFT_I2C /* I2C bit-banged */ -#if defined(CONFIG_HARD_I2C) -#define CONFIG_I2C_KIRKWOOD -#define CONFIG_I2C_KW_REG_BASE KW_TWSI_BASE -#define CONFIG_SYS_I2C_SLAVE 0x0 -#define CONFIG_SYS_I2C_SPEED 100000 -#endif - #define CONFIG_KIRKWOOD_GPIO /* Enable GPIO Support */ #if defined(CONFIG_SOFT_I2C) #ifndef __ASSEMBLY__ -- cgit v1.2.1 From c2ca44c24b77e8f65bd5c564576d8eee1a78b4f5 Mon Sep 17 00:00:00 2001 From: Albert Aribaud Date: Fri, 27 Aug 2010 18:26:06 +0200 Subject: edminiv2: add I2C support using mvtwsi driver Signed-off-by: Albert Aribaud Acked-by: Prafulla Wadaskar Acked-by: Heiko Schocher --- include/configs/edminiv2.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 57dd1651f3..ccfc66053b 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -132,6 +132,7 @@ */ #include #define CONFIG_CMD_IDE +#define CONFIG_CMD_I2C /* * Network @@ -181,6 +182,16 @@ /* end of IDE defines */ #endif /* CMD_IDE */ +/* + * I2C related stuff + */ +#ifdef CONFIG_CMD_I2C +#define CONFIG_I2C_MVTWSI +#define CONFIG_I2C_MVTWSI_BASE ORION5X_TWSI_BASE +#define CONFIG_SYS_I2C_SLAVE 0x0 +#define CONFIG_SYS_I2C_SPEED 100000 +#endif + /* * Environment variables configurations */ -- cgit v1.2.1 From 38570b2ff3b618892b7b7f2d4c80f5b79d49018f Mon Sep 17 00:00:00 2001 From: Matthias Fuchs Date: Wed, 25 Aug 2010 17:02:28 +0200 Subject: ppc4xx: Fix APC405 board support Opps, after a long time I tested recent u-boot on our APC405 board. This simple fix makes networking work again. Signed-off-by: Matthias Fuchs Signed-off-by: Stefan Roese --- include/configs/APC405.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/APC405.h b/include/configs/APC405.h index 20849bc685..a7724adb42 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -104,6 +104,7 @@ #define CONFIG_NET_MULTI 1 #undef CONFIG_HAS_ETH1 +#define CONFIG_PPC4xx_EMAC #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_PHY_ADDR 0 /* PHY address */ #define CONFIG_LXT971_NO_SLEEP 1 -- cgit v1.2.1 From c1ab75c7d4e5d080c630335b78681c50aa3569a5 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 26 Aug 2010 17:14:51 +0200 Subject: ppc4xx: Fix 440EPx bug in reconfigure_pll() This patch fixes a bug in reconfigure_pll(), where the detection of the current bootstrap option is wrong. The ICS bits where incorrectly shifted. This bug was found on the lwmon5 board, which uses bootstrap option H (I2C bootstrap EEPROM). Additionally a bit of code was moved into the if statement, since its only used after later on. No need to run this code all the time. Also, a few empty lines are added to make the code better readable. Signed-off-by: Stefan Roese Cc: Rupjyoti Sarmah Cc: Victor Gallardo --- include/ppc440.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/ppc440.h b/include/ppc440.h index c807dda2ae..67277539a4 100644 --- a/include/ppc440.h +++ b/include/ppc440.h @@ -1711,6 +1711,7 @@ #if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #define CPR0_ICFG_RLI_MASK 0x80000000 +#define CPR0_ICFG_ICS_MASK 0x00000007 #define CPR0_SPCID_SPCIDV0_MASK 0x03000000 #define CPR0_SPCID_SPCIDV0_DIV1 0x01000000 #define CPR0_SPCID_SPCIDV0_DIV2 0x02000000 -- cgit v1.2.1