arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI

PATCH Superseded Holger Brunck 3 participants 7 messages Jun 14, 2011 – Jul 18, 2011 Arm (32-bit)

Share & tools

Holger Brunck

author

2011-06-14 07:11 UTC #0 lore raw

PATCH 1/2 arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI

Some boards e.g. keymile arm boards have CONFIG_CMD_I2C switched on but they use soft i2c on kirkwood. So don't switch CONFIG_I2C_MVTWSI on in this case.

Signed-off-by Holger Brunck <[email protected]>

cc Valentin Longchamp <[email protected]>

cc Prafulla Wadaskar <[email protected]>

cc Heiko Schocher <[email protected]>

---
 arch/arm/include/asm/arch-kirkwood/config.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

arch/arm/include/asm/arch-kirkwood/config.h +2 -0

index 71ba464..b7dae1e 100644
@@ -137,7 +137,9 @@
  * I2C related stuff
  */
 #ifdef CONFIG_CMD_I2C
+#ifndef CONFIG_SOFT_I2C
 #define CONFIG_I2C_MVTWSI
+#endif
 #define CONFIG_SYS_I2C_SLAVE		0x0
 #define CONFIG_SYS_I2C_SPEED		100000
 #endif

Signature · 1 line

1.7.1

Holger Brunck

author

2011-06-14 07:11 UTC #1 lore raw

PATCH 2/2 arm/km: fix u-boot.kwb build breakage

commit 010a958b
(arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h) breaks building keymile arm targets, when u-boot.kwb tries to generate the binary with mkimage. A simple make <board> or MAKEALL succeeded because it don't try to build the kirwood binary at the end.

Due this commit we use the CONFIG_SYS_KWD_CONFIG from the arch-kirkwood/config.h and it was removed from the board config. But it was forgotten to include the header. Now the header is included in km_arm.h. Some other defines were obsolete due to this include, these are also removed in this commit.

Signed-off-by Holger Brunck <[email protected]>

cc Valentin Longchamp <[email protected]>

cc Prafulla Wadaskar <[email protected]>

cc Heiko Schocher <[email protected]>

---
 include/configs/km/km_arm.h |   30 +++++++-----------------------
 include/configs/mgcoge3un.h |    1 +
 2 files changed, 8 insertions(+), 23 deletions(-)

include/configs/km/km_arm.h +7 ~~-23~~

index 20ee6ea..29815be 100644
@@ -40,15 +40,20 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_MARVELL
-#define CONFIG_ARM926EJS		/* Basic Architecture */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
 #define CONFIG_KIRKWOOD			/* SOC Family Name */
-#define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_MACH_KM_KIRKWOOD		/* Machine type */
 
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
+#define CONFIG_KW88F6281		/* SOC Name */
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_SF
+#define CONFIG_SOFT_I2C		/* I2C bit-banged	*/
+
+#include "asm/arch/config.h"
+
 #define CONFIG_SYS_TEXT_BASE	0x04000000	/* code address after reloc */
 #define CONFIG_ENV_SIZE		(128 << 10)	/* NAND chip block size	*/
 #define CONFIG_SYS_MEMTEST_START 0x00400000	/* 4M */

@@ -75,12 +80,7 @@
 
 #define CONFIG_KM_ARCH_DBG_FILE		"scripts/debug-arm-env.txt"
 
-#define CONFIG_MD5	/* get_random_hex on krikwood needs MD5 support */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
-#define CONFIG_KIRKWOOD_EGIGA_INIT	/* Enable GbePort0/1 for kernel */
-#undef  CONFIG_KIRKWOOD_PCIE_INIT	/* Disable PCIE Port0 for kernel */
-#define CONFIG_KIRKWOOD_RGMII_PAD_1V8	/* Set RGMII Pad voltage to 1.8V */
-
 #define CONFIG_MISC_INIT_R
 
 /*

@@ -116,7 +116,6 @@
  */
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_MTDPARTS
-#define CONFIG_CMD_NAND
 #define CONFIG_CMD_NFS
 
 /*

@@ -131,8 +130,6 @@
  */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define NAND_MAX_CHIPS			1
-#define CONFIG_NAND_KIRKWOOD
-#define CONFIG_SYS_NAND_BASE		0xd8000000
 
 #define BOOTFLASH_START		0x0

@@ -175,8 +172,6 @@
 /*
  * I2C related stuff
  */
-#define	CONFIG_SOFT_I2C		/* I2C bit-banged	*/
-
 #define	CONFIG_KIRKWOOD_GPIO		/* Enable GPIO Support */
 #if defined(CONFIG_SOFT_I2C)
 #ifndef __ASSEMBLY__

@@ -200,8 +195,6 @@ int get_scl(void);
 #define I2C_DELAY	udelay(3)	/* 1/4 I2C clock duration */
 #define I2C_SOFT_DECLARATIONS
 
-#define	CONFIG_SYS_I2C_SLAVE		0x0
-#define	CONFIG_SYS_I2C_SPEED		100000
 #endif
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50

@@ -224,15 +217,8 @@ int get_scl(void);
 #define CONFIG_ENV_OFFSET_REDUND	0x2000 /* no bracets! */
 #define CONFIG_ENV_SIZE_REDUND		(CONFIG_ENV_SIZE)
 
-#define CONFIG_CMD_SF
-
 #define CONFIG_SPI_FLASH
-#define CONFIG_HARD_SPI
-#define CONFIG_KIRKWOOD_SPI
 #define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_ENV_SPI_BUS		0
-#define CONFIG_ENV_SPI_CS		0
-#define CONFIG_ENV_SPI_MAX_HZ		50000000	/* 50Mhz */
 
 #define FLASH_GPIO_PIN			0x00010000

@@ -272,8 +258,6 @@ int get_scl(void);
 
 /* additions for new relocation code, must be added to all boards */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
-/* Kirkwood has 2k of Security SRAM, use it for SP */
-#define CONFIG_SYS_INIT_SP_ADDR		0xC8012000
 /* Do early setups now in board_init_f() */
 #define CONFIG_BOARD_EARLY_INIT_F

include/configs/mgcoge3un.h +1 -0

index 6d56d7d..8d1b61f 100644
@@ -48,6 +48,7 @@
 #define KM_ENV_BUS	"pca9547:70:d" /* I2C2 (Mux-Port 5)*/
 
 /* we use a new RAM type on mgcoge3un board */
+#undef CONFIG_SYS_KWD_CONFIG
 #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-memphis.cfg
 
 /*

Signature · 1 line

1.7.1

Prafulla Wadaskar

2011-06-15 07:18 UTC #2 lore raw

PATCH 2/2 arm/km: fix u-boot.kwb build breakage

Quoted 38 lines

-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: Tuesday, June 14, 2011 12:42 PM
To: u-boot at lists.denx.de
Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko Schocher
Subject: [PATCH 2/2] arm/km: fix u-boot.kwb build breakage
commit 010a958b
(arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h) breaks building keymile arm targets, when u-boot.kwb tries to generate the binary with mkimage. A simple make <board> or MAKEALL succeeded because it don't try to build the kirwood binary at the end.
Due this commit we use the CONFIG_SYS_KWD_CONFIG from the arch-kirkwood/config.h and it was removed from the board config. But it was forgotten to include the header. Now the header is included in km_arm.h. Some other defines were obsolete due to this include, these are also removed in this commit.
Signed-off-by Holger Brunck <[email protected]>
cc Valentin Longchamp <[email protected]>
cc Prafulla Wadaskar <[email protected]>
cc Heiko Schocher <[email protected]>
---
 include/configs/km/km_arm.h |   30 +++++++-----------------------
 include/configs/mgcoge3un.h |    1 +
 2 files changed, 8 insertions(+), 23 deletions(-)
include/configs/km/km_arm.h +0 -0
index 20ee6ea..29815be 100644
@@ -40,15 +40,20 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_MARVELL

include/configs/km/km_arm.h line 50

Quoted 10 lines

include/configs/km/km_arm.h +1 -2

-#define CONFIG_ARM926EJS		/* Basic Architecture */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
 #define CONFIG_KIRKWOOD			/* SOC Family Name */
-#define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_MACH_KM_KIRKWOOD		/* Machine type */
 
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
+#define CONFIG_KW88F6281		/* SOC Name */

Why did you moved this from top to here?

include/configs/km/km_arm.h line 52

Quoted 2 lines

include/configs/km/km_arm.h +2 -0
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_SF

I think CONFIG_CMD_XXX should ideally below #include <config_cmd_default.h> and that too in <board_config>.h file.

Rest Ack of the patch

Regards..
Prafulla . .

Holger Brunck

author

2011-06-15 07:38 UTC #3 lore raw

PATCH 2/2 arm/km: fix u-boot.kwb build breakage

Hi Prafulla,

Quoted 44 lines · Prafulla Wadaskar

Quoted 44 lines
-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: Tuesday, June 14, 2011 12:42 PM
To: u-boot at lists.denx.de
Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko Schocher
Subject: [PATCH 2/2] arm/km: fix u-boot.kwb build breakage
commit 010a958b
(arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h) breaks building keymile arm targets, when u-boot.kwb tries to generate the binary with mkimage. A simple make <board> or MAKEALL succeeded because it don't try to build the kirwood binary at the end.
Due this commit we use the CONFIG_SYS_KWD_CONFIG from the arch-kirkwood/config.h and it was removed from the board config. But it was forgotten to include the header. Now the header is included in km_arm.h. Some other defines were obsolete due to this include, these are also removed in this commit.
Signed-off-by Holger Brunck <[email protected]>
cc Valentin Longchamp <[email protected]>
cc Prafulla Wadaskar <[email protected]>
cc Heiko Schocher <[email protected]>
---
 include/configs/km/km_arm.h |   30 +++++++-----------------------
 include/configs/mgcoge3un.h |    1 +
 2 files changed, 8 insertions(+), 23 deletions(-)
include/configs/km/km_arm.h +0 -2
index 20ee6ea..29815be 100644
@@ -40,15 +40,20 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_MARVELL
-#define CONFIG_ARM926EJS		/* Basic Architecture */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
 #define CONFIG_KIRKWOOD			/* SOC Family Name */
-#define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_MACH_KM_KIRKWOOD		/* Machine type */
 

Quoted 7 lines

include/configs/km/km_arm.h line 50
Quoted 4 lines
include/configs/km/km_arm.h +1 -0
 /* include common defines/options for all Keymile boards */
 #include "keymile-common.h"
 
+#define CONFIG_KW88F6281		/* SOC Name */
Why did you moved this from top to here?

Indeed this is unneeded. I fix this and resubmit.

Quoted 5 lines

include/configs/km/km_arm.h line 52
Quoted 2 lines
include/configs/km/km_arm.h +2 -0
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_SF
I think CONFIG_CMD_XXX should ideally below #include <config_cmd_default.h> and that too in <board_config>.h file.

I agree for a single board support, but this is not possible in our approach. We include config_cmd_default.h in keymile-common.h. And keymile-common.h is valid for our powerpc and arm boards. In km_arm.h we add the CMD settings which are only additionaly needed on our arm boards.

Quoted 2 lines

Rest Ack of the patch

Ok.

Best regards
Holger

Albert ARIBAUD

2011-07-16 10:51 UTC #4 lore raw

PATCH 2/2 arm/km: fix u-boot.kwb build breakage

Le 15/06/2011 09:38, Holger Brunck a ?crit :

Quoted 4 lines

I agree for a single board support, but this is not possible in our approach. We include config_cmd_default.h in keymile-common.h. And keymile-common.h is valid for our powerpc and arm boards. In km_arm.h we add the CMD settings which are only additionaly needed on our arm boards.

You can #undef things just as you can #define them after including default command headers -- I personally see no issue with this.

Amicalement,

Signature · 1 line

Albert.

Holger Brunck

author

2011-07-18 09:41 UTC #5 lore raw

PATCH 2/2 arm/km: fix u-boot.kwb build breakage

Hi Albert,

Quoted 10 lines · Albert ARIBAUD

Le 15/06/2011 09:38, Holger Brunck a ?crit :
Quoted 4 lines
I agree for a single board support, but this is not possible in our approach. We include config_cmd_default.h in keymile-common.h. And keymile-common.h is valid for our powerpc and arm boards. In km_arm.h we add the CMD settings which are only additionaly needed on our arm boards.
You can #undef things just as you can #define them after including default command headers -- I personally see no issue with this.

yes you are right it could be done this way. But I think it's more clearly arranged if we only define the commands in keymile-common.h wich are common for all keymile boards rather to define a superset there and undef them later on in km-powerpc.h or km_arm.h.

Best regards
Holger Brunck

Prafulla Wadaskar

2011-06-15 07:21 UTC #6 lore raw

PATCH 1/2 arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI

In reply to Holger Brunck

Quoted 28 lines

-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: Tuesday, June 14, 2011 12:42 PM
To: u-boot at lists.denx.de
Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko Schocher
Subject: [PATCH 1/2] arm/kirkwood: if CONFIG_SOFT_I2C is set don't set CONFIG_I2C_MVTWSI
Some boards e.g. keymile arm boards have CONFIG_CMD_I2C switched on but they use soft i2c on kirkwood. So don't switch CONFIG_I2C_MVTWSI on in this case.
Signed-off-by Holger Brunck <[email protected]>
cc Valentin Longchamp <[email protected]>
cc Prafulla Wadaskar <[email protected]>
cc Heiko Schocher <[email protected]>
---
 arch/arm/include/asm/arch-kirkwood/config.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-kirkwood/config.h +0 -0
index 71ba464..b7dae1e 100644

arch/arm/include/asm/arch-kirkwood/config.h line 145

Quoted 9 lines

arch/arm/include/asm/arch-kirkwood/config.h +2 -0

@@ -137,7 +137,9 @@
  * I2C related stuff
  */
 #ifdef CONFIG_CMD_I2C
+#ifndef CONFIG_SOFT_I2C
 #define CONFIG_I2C_MVTWSI
+#endif
 #define CONFIG_SYS_I2C_SLAVE		0x0
 #define CONFIG_SYS_I2C_SPEED		100000
 #endif

Acked-by Prafulla Wadaskar <[email protected]>

Regards..
Prafulla . .

Quoted 2 lines

--
1.7.1