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

Signed-off-by: Holger Brunck holger.brunck@keymile.com --- board/keymile/km_arm/km_arm.c | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index b944887..24fcf70 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -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; }

From: Karlheinz Jerg karlheinz.jerg@keymile.com

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.

Signed-off-by: Karlheinz Jerg karlheinz.jerg@keymile.com Signed-off-by: Holger Brunck holger.brunck@keymile.com --- boards.cfg | 1 + include/configs/km_kirkwood.h | 10 ++++++++++ 2 files changed, 11 insertions(+)

diff --git a/boards.cfg b/boards.cfg index dbd8479..f48c5bb 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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 valentin.longchamp@keymile.com Active arm arm926ejs kirkwood keymile km_arm km_kirkwood_pci km_kirkwood:KM_KIRKWOOD_PCI Valentin Longchamp valentin.longchamp@keymile.com +Active arm arm926ejs kirkwood keymile km_arm km_kirkwood_128m16 km_kirkwood:KM_KIRKWOOD_128M16 Valentin Longchamp valentin.longchamp@keymile.com Active arm arm926ejs kirkwood keymile km_arm kmcoge5un km_kirkwood:KM_COGE5UN Valentin Longchamp valentin.longchamp@keymile.com Active arm arm926ejs kirkwood keymile km_arm kmnusa km_kirkwood:KM_NUSA Valentin Longchamp valentin.longchamp@keymile.com Active arm arm926ejs kirkwood keymile km_arm kmsuv31 km_kirkwood:KM_SUV31 Valentin Longchamp valentin.longchamp@keymile.com diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 0e6073c..b8b64c4 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -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)*/

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

On 07/04/2013 03:29 PM, Holger Brunck wrote:

From: Karlheinz Jerg karlheinz.jerg@keymile.com

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.

Signed-off-by: Karlheinz Jerg karlheinz.jerg@keymile.com Signed-off-by: Holger Brunck holger.brunck@keymile.com

---

boards.cfg | 1 + include/configs/km_kirkwood.h | 10 ++++++++++ 2 files changed, 11 insertions(+)

diff --git a/boards.cfg b/boards.cfg index c0c4282..2bb493f 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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 diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h index 83bb7aa..2b5f389 100644 --- a/include/configs/km_kirkwood.h +++ b/include/configs/km_kirkwood.h @@ -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)*/