Skip to contentSkip to conversation

arm/km: add support for km_kirkwood_128m16 board

PATCH Superseded Holger Brunck 3 participants 7 messages Jul 4, 2013 – Oct 2, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 arm/km: add support for km_kirkwood_128m16 board

From: Karlheinz Jerg <[email protected]>

The board is similar to the standard km_kirkwood board. From a u-boot point of view, the only difference is an increased 256 MiB DRAM (128M16). A board based on this design is for example the SUP12.

---
 boards.cfg                    |  1 +
 include/configs/km_kirkwood.h | 10 ++++++++++
 2 files changed, 11 insertions(+)
boards.cfg +1 -0
index c0c4282..2bb493f 100644
@@ -165,6 +165,7 @@ lschlv2                      arm         arm926ejs   lsxl                buffalo
 lsxhl                        arm         arm926ejs   lsxl                buffalo        kirkwood    lsxl:LSXHL
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD
 km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD_PCI
+km_kirkwood_128m16           arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD_128M16
 kmnusa                       arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_NUSA
 kmsuv31                      arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_SUV31
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_MGCOGE3UN
include/configs/km_kirkwood.h +10 -0
index 83bb7aa..2b5f389 100644
@@ -51,6 +51,16 @@
 #define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
 #define CONFIG_KM_FPGA_CONFIG
 
+/* KM_KIRKWOOD_128M16 */
+#elif defined(CONFIG_KM_KIRKWOOD_128M16)
+#define CONFIG_IDENT_STRING		"\nKeymile Kirkwood 128M16"
+#define CONFIG_HOSTNAME			km_kirkwood_128m16
+#undef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG \
+		$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_KM_DISABLE_PCIE
+#define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
+
 /* KM_NUSA */
 #elif defined(CONFIG_KM_NUSA)
 #define KM_IVM_BUS			"pca9547:70:9"	/* I2C2 (Mux-Port 1)*/
Signature · 1 line
1.8.0.1
#1 lore raw

PATCH 1/3 arm/km: add support for km_kirkwood_128m16 board

Hi Prafulla, hi Albert,
we are not so far away from v2013.10 I guess, so could one of you please pick of these small patch series? Thanks!

Note for this patch there is already a v2 posted which applies cleanly again.

So there were:
http://patchwork.ozlabs.org/patch/275613/
http://patchwork.ozlabs.org/patch/256901/
http://patchwork.ozlabs.org/patch/256900/

Regards
Holger

Quoted 48 lines · Holger Brunck

From: Karlheinz Jerg <[email protected]>

The board is similar to the standard km_kirkwood board. From a u-boot point of view, the only difference is an increased 256 MiB DRAM (128M16). A board based on this design is for example the SUP12.

---
 boards.cfg                    |  1 +
 include/configs/km_kirkwood.h | 10 ++++++++++
 2 files changed, 11 insertions(+)
boards.cfg +1 -0
index c0c4282..2bb493f 100644
@@ -165,6 +165,7 @@ lschlv2                      arm         arm926ejs   lsxl                buffalo
 lsxhl                        arm         arm926ejs   lsxl                buffalo        kirkwood    lsxl:LSXHL
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD
 km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD_PCI
+km_kirkwood_128m16           arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_KIRKWOOD_128M16
 kmnusa                       arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_NUSA
 kmsuv31                      arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_SUV31
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood    km_kirkwood:KM_MGCOGE3UN
include/configs/km_kirkwood.h +10 -0
index 83bb7aa..2b5f389 100644
@@ -51,6 +51,16 @@
 #define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
 #define CONFIG_KM_FPGA_CONFIG
 
+/* KM_KIRKWOOD_128M16 */
+#elif defined(CONFIG_KM_KIRKWOOD_128M16)
+#define CONFIG_IDENT_STRING		"\nKeymile Kirkwood 128M16"
+#define CONFIG_HOSTNAME			km_kirkwood_128m16
+#undef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG \
+		$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_KM_DISABLE_PCIE
+#define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
+
 /* KM_NUSA */
 #elif defined(CONFIG_KM_NUSA)
 #define KM_IVM_BUS			"pca9547:70:9"	/* I2C2 (Mux-Port 1)*/
#2 lore raw

PATCH 1/3 arm/km: add support for km_kirkwood_128m16 board

Quoted 15 lines

-----Original Message-----
From: Holger Brunck [mailto:holger.brunck at keymile.com]
Sent: 25 September 2013 12:50
To: Prafulla Wadaskar; albert.u.boot at aribaud.net
Cc: u-boot at lists.denx.de; Valentin Longchamp
Subject: Re: [PATCH 1/3] arm/km: add support for km_kirkwood_128m16 board

Hi Prafulla, hi Albert,
we are not so far away from v2013.10 I guess, so could one of you please pick of
these small patch series? Thanks!

Quoted 7 lines

Note for this patch there is already a v2 posted which applies cleanly again.

So there were:
http://patchwork.ozlabs.org/patch/275613/
http://patchwork.ozlabs.org/patch/256901/
http://patchwork.ozlabs.org/patch/256900/

Dear Holger

I have pulled these patches to u-boot-marvell.git. Will send the pull request soon.

Regards...
Prafulla . . .

Quoted 79 lines

Regards
Holger

Quoted 3 lines · Holger Brunck

From: Karlheinz Jerg <[email protected]>

The board is similar to the standard km_kirkwood

board. From a

Quoted 1 line

u-boot point of view, the only difference is an

increased

Quoted 1 line

256 MiB DRAM (128M16). A board based on this design

is for

Quoted 3 lines

example the SUP12.

Signed-off-by Karlheinz Jerg

<[email protected]>

Quoted 1 line
Signed-off-by Holger Brunck

<[email protected]>

boards.cfg lschlv2 arm

Quoted 10 lines
---
 boards.cfg                    |  1 +
 include/configs/km_kirkwood.h | 10 ++++++++++
 2 files changed, 11 insertions(+)
boards.cfg +0 -0
index c0c4282..2bb493f 100644
@@ -165,6 +165,7 @@ lschlv2                      arm

arm926ejs lsxl buffalo

boards.cfg lschlv2 arm · line 165

Quoted 1 line
boards.cfg +0 -0
 lsxhl                        arm         arm926ejs

lsxl buffalo kirkwood
lsxl:LSXHL

boards.cfg lschlv2 arm · line 166

Quoted 1 line
boards.cfg +0 -0
 km_kirkwood                  arm         arm926ejs

km_arm keymile kirkwood
km_kirkwood:KM_KIRKWOOD

boards.cfg lschlv2 arm · line 167

Quoted 1 line
boards.cfg +0 -0
 km_kirkwood_pci              arm         arm926ejs

km_arm keymile kirkwood
km_kirkwood:KM_KIRKWOOD_PCI

boards.cfg lschlv2 arm · line 168

Quoted 1 line
boards.cfg +1 -0
+km_kirkwood_128m16           arm         arm926ejs

km_arm keymile kirkwood
km_kirkwood:KM_KIRKWOOD_128M16

boards.cfg lschlv2 arm · line 169

Quoted 1 line
boards.cfg +0 -0
 kmnusa                       arm         arm926ejs

km_arm keymile kirkwood
km_kirkwood:KM_NUSA

boards.cfg lschlv2 arm · line 170

Quoted 1 line
boards.cfg +0 -0
 kmsuv31                      arm         arm926ejs

km_arm keymile kirkwood
km_kirkwood:KM_SUV31

boards.cfg lschlv2 arm · line 171

Quoted 1 line
boards.cfg +0 -0
 mgcoge3un                    arm         arm926ejs

km_arm keymile kirkwood
km_kirkwood:KM_MGCOGE3UN

Review

Quoted 1 line
(quoted diff) +0 -0

b/include/configs/km_kirkwood.h

include/configs/km_kirkwood.h line 51

Quoted 5 lines

index 83bb7aa..2b5f389 100644

include/configs/km_kirkwood.h +0 -0
@@ -51,6 +51,16 @@
 #define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2

(Mux-Port 1)*/

include/configs/km_kirkwood.h

Quoted 5 lines
include/configs/km_kirkwood.h +3 -0
 #define CONFIG_KM_FPGA_CONFIG
 
+/* KM_KIRKWOOD_128M16 */
+#elif defined(CONFIG_KM_KIRKWOOD_128M16)
+#define CONFIG_IDENT_STRING		"\nKeymile

Kirkwood 128M16"

include/configs/km_kirkwood.h line 63

Quoted 4 lines
include/configs/km_kirkwood.h +4 -0
+#define CONFIG_HOSTNAME			km_kirkwood_128m16
+#undef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG \
+
	$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg

include/configs/km_kirkwood.h line 62

Quoted 2 lines
include/configs/km_kirkwood.h +2 -0
+#define CONFIG_KM_DISABLE_PCIE
+#define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2

(Mux-Port 1)*/

include/configs/km_kirkwood.h

Quoted 4 lines
include/configs/km_kirkwood.h +1 -0
+
 /* KM_NUSA */
 #elif defined(CONFIG_KM_NUSA)
 #define KM_IVM_BUS			"pca9547:70:9"	/* I2C2

(Mux-Port 1)*/

Quoted 1 line
#3 lore raw

PATCH 2/3 arm/km: drop unneeded define

In reply to Holger Brunck

CONFIG_BOOTCOUNT_LIMIT is used on all boards from this board series. So remove this unneeded define.

---
 board/keymile/km_arm/km_arm.c | 4 ----
 1 file changed, 4 deletions(-)
board/keymile/km_arm/km_arm.c +0 -4
index b944887..24fcf70 100644
@@ -180,7 +180,6 @@ static int initialize_unit_leds(void)
 	return 0;
 }
 
-#if defined(CONFIG_BOOTCOUNT_LIMIT)
 static void set_bootcount_addr(void)
 {
 	uchar buf[32];
@@ -189,7 +188,6 @@ static void set_bootcount_addr(void)
 	sprintf((char *)buf, "0x%x", bootcountaddr);
 	setenv("bootcountaddr", (char *)buf);
 }
-#endif
 
 int misc_init_r(void)
 {
@@ -226,9 +224,7 @@ int misc_init_r(void)
 
 	initialize_unit_leds();
 	set_km_env();
-#if defined(CONFIG_BOOTCOUNT_LIMIT)
 	set_bootcount_addr();
-#endif
 	return 0;
 }
 
Signature · 1 line
1.8.0.1
#4 lore raw

PATCH v2 1/3 arm/km: add support for km_kirkwood_128m16 board

In reply to Holger Brunck

From: Karlheinz Jerg <[email protected]>

The board is similar to the standard km_kirkwood board. From a u-boot point of view, the only difference is an increased 256 MiB DRAM (128M16). A board based on this design is for example the SUP12.

---
 boards.cfg                    |  1 +
 include/configs/km_kirkwood.h | 10 ++++++++++
 2 files changed, 11 insertions(+)
boards.cfg +1 -0
index dbd8479..f48c5bb 100644
@@ -167,6 +167,7 @@ Active  arm         arm926ejs      kirkwood    iomega          -
 Active  arm         arm926ejs      kirkwood    karo            tk71                tk71                                 -                                                                                                                                 -
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood                          km_kirkwood:KM_KIRKWOOD                                                                                                           Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_pci                      km_kirkwood:KM_KIRKWOOD_PCI                                                                                                       Valentin Longchamp <[email protected]>
+Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_128m16                   km_kirkwood:KM_KIRKWOOD_128M16                                                                                                    Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmcoge5un                            km_kirkwood:KM_COGE5UN                                                                                                            Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmnusa                               km_kirkwood:KM_NUSA                                                                                                               Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmsuv31                              km_kirkwood:KM_SUV31                                                                                                              Valentin Longchamp <[email protected]>
include/configs/km_kirkwood.h +10 -0
index 0e6073c..b8b64c4 100644
@@ -35,6 +35,16 @@
 #define CONFIG_KM_IVM_BUS		1	/* I2C2 (Mux-Port 1)*/
 #define CONFIG_KM_FPGA_CONFIG
 
+/* KM_KIRKWOOD_128M16 */
+#elif defined(CONFIG_KM_KIRKWOOD_128M16)
+#define CONFIG_IDENT_STRING		"\nKeymile Kirkwood 128M16"
+#define CONFIG_HOSTNAME			km_kirkwood_128m16
+#undef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG \
+		$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_KM_DISABLE_PCIE
+#define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
+
 /* KM_NUSA */
 #elif defined(CONFIG_KM_NUSA)
 #define CONFIG_KM_IVM_BUS		1	/* I2C2 (Mux-Port 1)*/
Signature · 1 line
1.8.0.1
#5 lore raw

PATCH v2 1/3 arm/km: add support for km_kirkwood_128m16 board

Hi Holger,

Quoted 37 lines · Holger Brunck

From: Karlheinz Jerg <[email protected]>

The board is similar to the standard km_kirkwood board. From a u-boot point of view, the only difference is an increased 256 MiB DRAM (128M16). A board based on this design is for example the SUP12.

---
 boards.cfg                    |  1 +
 include/configs/km_kirkwood.h | 10 ++++++++++
 2 files changed, 11 insertions(+)
boards.cfg +1 -0
index dbd8479..f48c5bb 100644
@@ -167,6 +167,7 @@ Active  arm         arm926ejs      kirkwood    iomega          -
 Active  arm         arm926ejs      kirkwood    karo            tk71                tk71                                 -                                                                                                                                 -
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood                          km_kirkwood:KM_KIRKWOOD                                                                                                           Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_pci                      km_kirkwood:KM_KIRKWOOD_PCI                                                                                                       Valentin Longchamp <[email protected]>
+Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_128m16                   km_kirkwood:KM_KIRKWOOD_128M16                                                                                                    Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmcoge5un                            km_kirkwood:KM_COGE5UN                                                                                                            Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmnusa                               km_kirkwood:KM_NUSA                                                                                                               Valentin Longchamp <[email protected]>
 Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmsuv31                              km_kirkwood:KM_SUV31                                                                                                              Valentin Longchamp <[email protected]>
include/configs/km_kirkwood.h +3 -0
index 0e6073c..b8b64c4 100644
@@ -35,6 +35,16 @@
 #define CONFIG_KM_IVM_BUS		1	/* I2C2 (Mux-Port 1)*/
 #define CONFIG_KM_FPGA_CONFIG
 
+/* KM_KIRKWOOD_128M16 */
+#elif defined(CONFIG_KM_KIRKWOOD_128M16)
+#define CONFIG_IDENT_STRING		"\nKeymile Kirkwood 128M16"

include/configs/km_kirkwood.h line 50

Quoted 10 lines
include/configs/km_kirkwood.h +7 -0
+#define CONFIG_HOSTNAME			km_kirkwood_128m16
+#undef CONFIG_SYS_KWD_CONFIG
+#define CONFIG_SYS_KWD_CONFIG \
+		$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage_128M16_1.cfg
+#define CONFIG_KM_DISABLE_PCIE
+#define KM_IVM_BUS			"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
+
 /* KM_NUSA */
 #elif defined(CONFIG_KM_NUSA)
 #define CONFIG_KM_IVM_BUS		1	/* I2C2 (Mux-Port 1)*/

This was assigned to me on patchwork; should go to Prafulla actually, as V1 did.

Amicalement,

Signature · 1 line
Albert.
#6 lore raw

PATCH 3/3 arm/km: make local function startup_allowed static

In reply to Holger Brunck
---
 board/keymile/km_arm/km_arm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/keymile/km_arm/km_arm.c +1 -1
index 24fcf70..29f85ff 100644
@@ -118,7 +118,7 @@ static const u32 kwmpp_config[] = {
 /*
  * Wait for startup OK from mgcoge3ne
  */
-int startup_allowed(void)
+static int startup_allowed(void)
 {
 	unsigned char buf;
 
Signature · 1 line
1.8.0.1