All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 00/13] ARM: more cleanups
@ 2011-12-09 11:14 Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 01/13] drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings Wolfgang Denk
                   ` (12 more replies)
  0 siblings, 13 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

The following patches fix another set of build warnigns, mostly for
ARM boards.

Wolfgang Denk (13):
  drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings
  drivers/net/at91_emac.c: Fix GCC 4.6 build warnings
  fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug)
  common/cmd_pxe.c: Fix compile warning
  boards.cfg: sort list
  board/apollon/apollon.c: Fix GCc 4.6 build warnings.
  board/apollon/sys_info.c: Fix GCC 4.6 build warning
  ARM: convert "apollon" board to use boards.cfg
  board/LaCie/edminiv2/edminiv2.c: Fix build warning
  board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings
  ARM: convert "omap16xx" boards to boards.cfg
  board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings
  ARM: convert "omap730p2" boards to boards.cfg

 MAKEALL                         |    4 -
 Makefile                        |   41 -------
 board/LaCie/edminiv2/edminiv2.c |    1 +
 board/apollon/apollon.c         |   18 ++--
 board/apollon/sys_info.c        |    9 +--
 board/ti/omap1610inn/flash.c    |   21 ++--
 board/ti/omap730p2/flash.c      |   19 ++-
 boards.cfg                      |  230 ++++++++++++++++++++------------------
 common/cmd_pxe.c                |    1 +
 drivers/net/at91_emac.c         |   42 ++++---
 drivers/net/ne2000_base.c       |    9 +-
 fs/yaffs2/yaffs_guts.c          |    2 +-
 include/configs/apollon.h       |    2 +
 13 files changed, 189 insertions(+), 210 deletions(-)

-- 
1.7.6.4

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 01/13] drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 02/13] drivers/net/at91_emac.c: " Wolfgang Denk
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
ne2000_base.c: In function 'dp83902a_send':
ne2000_base.c:282:7: warning: variable 'tmp' set but not used
[-Wunused-but-set-variable]
ne2000_base.c: In function 'dp83902a_RxEvent':
ne2000_base.c:376:5: warning: variable 'rsr' set but not used
[-Wunused-but-set-variable]
ne2000_base.c: In function 'dp83902a_TxEvent':
ne2000_base.c:513:5: warning: variable 'tsr' set but not used
[-Wunused-but-set-variable]
ne2000_base.c: In function 'dp83902a_ClearCounters':
ne2000_base.c:550:17: warning: variable 'cnt3' set but not used
[-Wunused-but-set-variable]
ne2000_base.c:550:11: warning: variable 'cnt2' set but not used
[-Wunused-but-set-variable]
ne2000_base.c:550:5: warning: variable 'cnt1' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 drivers/net/ne2000_base.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c
index 88f2b37..8275091 100644
--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -76,6 +76,7 @@ Add SNMP
 #include <command.h>
 #include <net.h>
 #include <malloc.h>
+#include <linux/compiler.h>
 
 /* forward definition of function used for the uboot interface */
 void uboot_push_packet_len(int len);
@@ -279,7 +280,7 @@ dp83902a_send(u8 *data, int total_len, u32 key)
 		 * does (i.e., also read data).
 		 */
 
-		u16 tmp;
+		__maybe_unused u16 tmp;
 		int len = 1;
 
 		DP_OUT(base, DP_RSAL, 0x100 - len);
@@ -373,7 +374,7 @@ dp83902a_RxEvent(void)
 {
 	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
 	u8 *base = dp->base;
-	u8 rsr;
+	__maybe_unused u8 rsr;
 	u8 rcv_hdr[4];
 	int i, len, pkt, cur;
 
@@ -510,7 +511,7 @@ dp83902a_TxEvent(void)
 {
 	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
 	u8 *base = dp->base;
-	u8 tsr;
+	__maybe_unused u8 tsr;
 	u32 key;
 
 	DEBUG_FUNCTION();
@@ -547,7 +548,7 @@ dp83902a_ClearCounters(void)
 {
 	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
 	u8 *base = dp->base;
-	u8 cnt1, cnt2, cnt3;
+	__maybe_unused u8 cnt1, cnt2, cnt3;
 
 	DP_IN(base, DP_FER, cnt1);
 	DP_IN(base, DP_CER, cnt2);
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 02/13] drivers/net/at91_emac.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 01/13] drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-10 22:08   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug) Wolfgang Denk
                   ` (10 subsequent siblings)
  12 siblings, 1 reply; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
at91_emac.c: In function 'at91emac_phy_init':
at91_emac.c:244:20: warning: variable 'duplex' set but not used
[-Wunused-but-set-variable]
at91_emac.c:244:13: warning: variable 'speed' set but not used
[-Wunused-but-set-variable]

Use new debug_cond() to fix these warnings.  In the result, anumber of
inconsistent printf() formats are detected:

at91_emac.c: In function 'at91emac_read':
at91_emac.c:147:2: warning: format '%x' expects argument of type
'unsigned int', but argument 2 has type 'struct at91_emac_t *'
[-Wformat]
at91_emac.c: In function 'at91emac_write':
at91_emac.c:157:2: warning: format '%x' expects argument of type
'unsigned int', but argument 2 has type 'struct at91_emac_t *'
[-Wformat]
at91_emac.c:157:2: warning: format '%x' expects argument of type
'unsigned int', but argument 4 has type 'short unsigned int *'
[-Wformat]
at91_emac.c: In function 'at91emac_recv':
at91_emac.c:451:3: warning: format '%d' expects argument of type
'int', but argument 2 has type 'long unsigned int' [-Wformat]
at91_emac.c:451:3: warning: format '%x' expects argument of type
'unsigned int', but argument 4 has type 'long unsigned int' [-Wformat]

Fix these, too.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Jens Scharsig <js_at_ng@scharsoft.de>
Cc: Andreas Bie?mann <andreas.devel@gmail.com>
Cc: Reinhard Meyer <u-boot@emk-elektronik.de>
---
 drivers/net/at91_emac.c |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 9bda1fc..483c831 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -69,21 +69,21 @@
 #endif
 
 #ifdef ET_DEBUG
-#define DEBUG_AT91EMAC(...)	printf(__VA_ARGS__);
+#define DEBUG_AT91EMAC	1
 #else
-#define DEBUG_AT91EMAC(...)
+#define DEBUG_AT91EMAC	0
 #endif
 
 #ifdef MII_DEBUG
-#define DEBUG_AT91PHY(...)	printf(__VA_ARGS__);
+#define DEBUG_AT91PHY	1
 #else
-#define DEBUG_AT91PHY(...)
+#define DEBUG_AT91PHY	0
 #endif
 
 #ifndef CONFIG_DRIVER_AT91EMAC_QUIET
-#define VERBOSEP(...)	printf(__VA_ARGS__);
+#define VERBOSEP	1
 #else
-#define VERBOSEP(...)
+#define VERBOSEP	0
 #endif
 
 #define RBF_ADDR      0xfffffffc
@@ -137,14 +137,15 @@ int  at91emac_read(at91_emac_t *at91mac, unsigned char addr,
 
 	do {
 		netstat = readl(&at91mac->sr);
-		DEBUG_AT91PHY("poll SR %08lx\n", netstat);
+		debug_cond(DEBUG_AT91PHY, "poll SR %08lx\n", netstat);
 	} while (!(netstat & AT91_EMAC_SR_IDLE));
 
 	*value = readl(&at91mac->man) & AT91_EMAC_MAN_DATA_MASK;
 
 	at91emac_DisableMDIO(at91mac);
 
-	DEBUG_AT91PHY("AT91PHY read %x REG(%d)=%x\n", at91mac, reg, *value)
+	debug_cond(DEBUG_AT91PHY,
+		"AT91PHY read %p REG(%d)=%x\n", at91mac, reg, *value);
 
 	return 0;
 }
@@ -153,7 +154,8 @@ int  at91emac_write(at91_emac_t *at91mac, unsigned char addr,
 		unsigned char reg, unsigned short value)
 {
 	unsigned long netstat;
-	DEBUG_AT91PHY("AT91PHY write %x REG(%d)=%x\n", at91mac, reg, &value)
+	debug_cond(DEBUG_AT91PHY,
+		"AT91PHY write %p REG(%d)=%p\n", at91mac, reg, &value);
 
 	at91emac_EnableMDIO(at91mac);
 
@@ -164,7 +166,7 @@ int  at91emac_write(at91_emac_t *at91mac, unsigned char addr,
 
 	do {
 		netstat = readl(&at91mac->sr);
-		DEBUG_AT91PHY("poll SR %08lx\n", netstat);
+		debug_cond(DEBUG_AT91PHY, "poll SR %08lx\n", netstat);
 	} while (!(netstat & AT91_EMAC_SR_IDLE));
 
 	at91emac_DisableMDIO(at91mac);
@@ -216,7 +218,7 @@ static int at91emac_phy_reset(struct eth_device *netdev)
 	adv = ADVERTISE_CSMA | ADVERTISE_ALL;
 	at91emac_write(emac, CONFIG_DRIVER_AT91EMAC_PHYADDR,
 		MII_ADVERTISE, adv);
-	VERBOSEP("%s: Starting autonegotiation...\n", netdev->name);
+	debug_cond(VERBOSEP, "%s: Starting autonegotiation...\n", netdev->name);
 	at91emac_write(emac, CONFIG_DRIVER_AT91EMAC_PHYADDR, MII_BMCR,
 		(BMCR_ANENABLE | BMCR_ANRESTART));
 
@@ -229,7 +231,8 @@ static int at91emac_phy_reset(struct eth_device *netdev)
 	}
 
 	if (status & BMSR_ANEGCOMPLETE) {
-		VERBOSEP("%s: Autonegotiation complete\n", netdev->name);
+		debug_cond(VERBOSEP,
+			"%s: Autonegotiation complete\n", netdev->name);
 	} else {
 		printf("%s: Autonegotiation timed out (status=0x%04x)\n",
 		       netdev->name, status);
@@ -272,7 +275,7 @@ static int at91emac_phy_init(struct eth_device *netdev)
 		}
 	}
 	if (!(status & BMSR_LSTATUS)) {
-		VERBOSEP("%s: link down\n", netdev->name);
+		debug_cond(VERBOSEP, "%s: link down\n", netdev->name);
 		return -3;
 	} else {
 		at91emac_read(emac, CONFIG_DRIVER_AT91EMAC_PHYADDR,
@@ -283,7 +286,7 @@ static int at91emac_phy_init(struct eth_device *netdev)
 		speed = (media & (ADVERTISE_100FULL | ADVERTISE_100HALF)
 			 ? 1 : 0);
 		duplex = (media & ADVERTISE_FULL) ? 1 : 0;
-		VERBOSEP("%s: link up, %sMbps %s-duplex\n",
+		debug_cond(VERBOSEP, "%s: link up, %sMbps %s-duplex\n",
 		       netdev->name,
 		       speed ? "100" : "10",
 		       duplex ? "full" : "half");
@@ -409,7 +412,7 @@ static void at91emac_halt(struct eth_device *netdev)
 	emac = (at91_emac_t *) netdev->iobase;
 	writel(readl(&emac->ctl) & ~(AT91_EMAC_CTL_TE | AT91_EMAC_CTL_RE),
 		&emac->ctl);
-	DEBUG_AT91EMAC("halt MAC\n");
+	debug_cond(DEBUG_AT91EMAC, "halt MAC\n");
 }
 
 static int at91emac_send(struct eth_device *netdev, volatile void *packet,
@@ -425,7 +428,7 @@ static int at91emac_send(struct eth_device *netdev, volatile void *packet,
 	writel(AT91_EMAC_TCR_LEN(length), &emac->tcr);
 	while (AT91_EMAC_TCR_LEN(readl(&emac->tcr)))
 		;
-	DEBUG_AT91EMAC("Send %d \n", length);
+	debug_cond(DEBUG_AT91EMAC, "Send %d\n", length);
 	writel(readl(&emac->tsr) | AT91_EMAC_TSR_COMP, &emac->tsr);
 	return 0;
 }
@@ -445,7 +448,7 @@ static int at91emac_recv(struct eth_device *netdev)
 		size = rbfp->size & RBF_SIZE;
 		NetReceive(NetRxPackets[dev->rbindex], size);
 
-		DEBUG_AT91EMAC("Recv[%d]: %d bytes @ %x \n",
+		debug_cond(DEBUG_AT91EMAC, "Recv[%ld]: %d bytes @ %lx\n",
 			dev->rbindex, size, rbfp->addr);
 
 		rbfp->addr &= ~RBF_OWNER;
@@ -479,14 +482,15 @@ static int at91emac_write_hwaddr(struct eth_device *netdev)
 	emac = (at91_emac_t *) netdev->iobase;
 
 	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
-	DEBUG_AT91EMAC("init MAC-ADDR %02x:%02x:%02x:%02x:%02x:%02x\n",
+	debug_cond(DEBUG_AT91EMAC,
+		"init MAC-ADDR %02x:%02x:%02x:%02x:%02x:%02x\n",
 		netdev->enetaddr[5], netdev->enetaddr[4], netdev->enetaddr[3],
 		netdev->enetaddr[2], netdev->enetaddr[1], netdev->enetaddr[0]);
 	writel( (netdev->enetaddr[0] | netdev->enetaddr[1] << 8 |
 			netdev->enetaddr[2] << 16 | netdev->enetaddr[3] << 24),
 			&emac->sa2l);
 	writel((netdev->enetaddr[4] | netdev->enetaddr[5] << 8), &emac->sa2h);
-	DEBUG_AT91EMAC("init MAC-ADDR %x%x \n",
+	debug_cond(DEBUG_AT91EMAC, "init MAC-ADDR %x%x\n",
 		readl(&emac->sa2h), readl(&emac->sa2l));
 	return 0;
 }
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug)
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 01/13] drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 02/13] drivers/net/at91_emac.c: " Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 11:36   ` William Juul
  2011-12-10 22:08   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning Wolfgang Denk
                   ` (9 subsequent siblings)
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
yaffs_guts.c: In function 'yaffs_GarbageCollectBlock':
yaffs_guts.c:2761:6: warning: variable 'retVal' set but not used
[-Wunused-but-set-variable]

Here GCC actually detected a bug.  The code was always returning OK
instead of the previously set retrun code.  Fix that.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: William Juul <william.juul@tandberg.com>
Cc: Scott Wood <scottwood@freescale.com>
---
 fs/yaffs2/yaffs_guts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
index f0ef8db..7390b40 100644
--- a/fs/yaffs2/yaffs_guts.c
+++ b/fs/yaffs2/yaffs_guts.c
@@ -2976,7 +2976,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
 
 	dev->isDoingGC = 0;
 
-	return YAFFS_OK;
+	return retVal;
 }
 
 /* New garbage collector
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (2 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug) Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 13:48   ` Jason Hobbs
  2011-12-09 11:14 ` [U-Boot] [PATCH 05/13] boards.cfg: sort list Wolfgang Denk
                   ` (8 subsequent siblings)
  12 siblings, 1 reply; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
cmd_pxe.c: In function 'parse_pxefile_top':
cmd_pxe.c:941:5: warning: 'err' may be used uninitialized in this
function [-Wuninitialized]
cmd_pxe.c:921:6: note: 'err' was declared here

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Jason Hobbs <jason.hobbs@calxeda.com>
---
 common/cmd_pxe.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
index 9426f5b..eaf95bf 100644
--- a/common/cmd_pxe.c
+++ b/common/cmd_pxe.c
@@ -936,6 +936,7 @@ static int parse_menu(char **c, struct pxe_menu *cfg, char *b, int nest_level)
 	default:
 		printf("Ignoring malformed menu command: %.*s\n",
 				(int)(*c - s), s);
+		err = -1;
 	}
 
 	if (err < 0)
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 05/13] boards.cfg: sort list
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (3 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-10 22:09   ` Wolfgang Denk
  2011-12-10 22:39   ` Mike Frysinger
  2011-12-09 11:14 ` [U-Boot] [PATCH 06/13] board/apollon/apollon.c: Fix GCc 4.6 build warnings Wolfgang Denk
                   ` (7 subsequent siblings)
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 boards.cfg |  218 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/boards.cfg b/boards.cfg
index 12f5f6f..4a4968d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -36,13 +36,13 @@
 ###########################################################################################################
 
 integratorcp_cm1136          arm         arm1136     integrator          armltd         -           integratorcp:CM1136
-qong                         arm         arm1136     -                   davedenx       mx31
-mx31ads                      arm         arm1136     -                   freescale      mx31
-imx31_litekit                arm         arm1136     -                   logicpd        mx31
 imx31_phycore                arm         arm1136     -                   -              mx31
 imx31_phycore_eet            arm         arm1136     imx31_phycore       -              mx31         imx31_phycore:IMX31_PHYCORE_EET
+qong                         arm         arm1136     -                   davedenx       mx31
+mx31ads                      arm         arm1136     -                   freescale      mx31
 mx31pdk                      arm         arm1136     -                   freescale      mx31         mx31pdk:NAND_U_BOOT
 tt01                         arm         arm1136     -                   hale           mx31
+imx31_litekit                arm         arm1136     -                   logicpd        mx31
 flea3                        arm         arm1136     -                   CarMediaLab    mx35
 mx35pdk                      arm         arm1136     -                   freescale      mx35
 omap2420h4                   arm         arm1136     -                   ti             omap24xx
@@ -65,51 +65,40 @@ smdk2410                     arm         arm920t     -                   samsung
 omap1510inn                  arm         arm925t     -                   ti
 integratorap_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorap:CM926EJ_S
 integratorcp_cm926ejs        arm         arm926ejs   integrator          armltd         -           integratorcp:CM924EJ_S
-versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
-versatilepb                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_PB
-versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB
 aspenite                     arm         arm926ejs   -                   Marvell        armada100
 gplugd                       arm         arm926ejs   -                   Marvell        armada100
 afeb9260                     arm         arm926ejs   -                   -              at91
-at91sam9260ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9260,SYS_USE_NANDFLASH
 at91sam9260ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS0
 at91sam9260ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9260,SYS_USE_DATAFLASH_CS1
-at91sam9261ek_nandflash      arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9261,SYS_USE_NANDFLASH
+at91sam9260ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9260,SYS_USE_NANDFLASH
 at91sam9261ek_dataflash_cs0  arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9261,SYS_USE_DATAFLASH_CS0
 at91sam9261ek_dataflash_cs3  arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9261,SYS_USE_DATAFLASH_CS3
-at91sam9263ek_nandflash      arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_NANDFLASH
-at91sam9263ek_dataflash_cs0  arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_DATAFLASH
+at91sam9261ek_nandflash      arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9261,SYS_USE_NANDFLASH
 at91sam9263ek_dataflash      arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_DATAFLASH
+at91sam9263ek_dataflash_cs0  arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_DATAFLASH
+at91sam9263ek_nandflash      arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_NANDFLASH
 at91sam9263ek_norflash       arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_NORFLASH
 at91sam9263ek_norflash_boot  arm         arm926ejs   at91sam9263ek       atmel          at91        at91sam9263ek:AT91SAM9263,SYS_USE_BOOT_NORFLASH
-at91sam9g10ek_nandflash      arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9G10,SYS_USE_NANDFLASH
 at91sam9g10ek_dataflash_cs0  arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9G10,SYS_USE_DATAFLASH_CS0
 at91sam9g10ek_dataflash_cs3  arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9G10,SYS_USE_DATAFLASH_CS3
-at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
+at91sam9g10ek_nandflash      arm         arm926ejs   at91sam9261ek       atmel          at91        at91sam9261ek:AT91SAM9G10,SYS_USE_NANDFLASH
 at91sam9g20ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
 at91sam9g20ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
+at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
 at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
-at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
 at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
-at91sam9xeek_nandflash       arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH
+at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
 at91sam9xeek_dataflash_cs0   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS0
 at91sam9xeek_dataflash_cs1   arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_DATAFLASH_CS1
+at91sam9xeek_nandflash       arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9XE,SYS_USE_NANDFLASH
 snapper9260                  arm         arm926ejs   -                   bluewater      at91        snapper9260:AT91SAM9260
 snapper9g20                  arm         arm926ejs   snapper9260         bluewater      at91        snapper9260:AT91SAM9G20
-sbc35_a9g20_nandflash        arm         arm926ejs   sbc35_a9g20         calao          at91        sbc35_a9g20:AT91SAM9G20,SYS_USE_NANDFLASH
 sbc35_a9g20_eeprom           arm         arm926ejs   sbc35_a9g20         calao          at91        sbc35_a9g20:AT91SAM9G20,SYS_USE_EEPROM
-tny_a9g20_nandflash          arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9G20,SYS_USE_NANDFLASH
-tny_a9g20_eeprom             arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9G20,SYS_USE_EEPROM
-tny_a9260_nandflash          arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9260,SYS_USE_NANDFLASH
+sbc35_a9g20_nandflash        arm         arm926ejs   sbc35_a9g20         calao          at91        sbc35_a9g20:AT91SAM9G20,SYS_USE_NANDFLASH
 tny_a9260_eeprom             arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9260,SYS_USE_EEPROM
-cpu9260                      arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260
-cpu9260_nand                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260,NANDBOOT
-cpu9260_128M                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260,CPU9260_128M
-cpu9260_nand_128M            arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260,CPU9260_128M,NANDBOOT
-cpu9G20                      arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20
-cpu9G20_nand                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20,NANDBOOT
-cpu9G20_128M                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20,CPU9G20_128M
-cpu9G20_nand_128M            arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20,CPU9G20_128M,NANDBOOT
+tny_a9260_nandflash          arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9260,SYS_USE_NANDFLASH
+tny_a9g20_eeprom             arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9G20,SYS_USE_EEPROM
+tny_a9g20_nandflash          arm         arm926ejs   tny_a9260           calao          at91        tny_a9260:AT91SAM9G20,SYS_USE_NANDFLASH
 ethernut5                    arm         arm926ejs   ethernut5           egnite         at91        ethernut5:AT91SAM9XE
 top9000eval_xe               arm         arm926ejs   top9000             emk            at91        top9000:EVAL9000
 top9000su_xe                 arm         arm926ejs   top9000             emk            at91        top9000:SU9000
@@ -117,17 +106,21 @@ meesc                        arm         arm926ejs   meesc               esd
 meesc_dataflash              arm         arm926ejs   meesc               esd            at91        meesc:AT91SAM9263,SYS_USE_DATAFLASH
 otc570                       arm         arm926ejs   otc570              esd            at91        otc570:AT91SAM9263,SYS_USE_NANDFLASH
 otc570_dataflash             arm         arm926ejs   otc570              esd            at91        otc570:AT91SAM9263,SYS_USE_DATAFLASH
+cpu9260                      arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260
+cpu9260_128M                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260,CPU9260_128M
+cpu9260_nand                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260,NANDBOOT
+cpu9260_nand_128M            arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9260,CPU9260_128M,NANDBOOT
+cpu9G20                      arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20
+cpu9G20_128M                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20,CPU9G20_128M
+cpu9G20_nand                 arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20,NANDBOOT
+cpu9G20_nand_128M            arm         arm926ejs   cpu9260             eukrea         at91        cpu9260:CPU9G20,CPU9G20_128M,NANDBOOT
 pm9261                       arm         arm926ejs   pm9261              ronetix        at91        pm9261:AT91SAM9261
 pm9263                       arm         arm926ejs   pm9263              ronetix        at91        pm9263:AT91SAM9263
 pm9g45                       arm         arm926ejs   pm9g45              ronetix        at91        pm9g45:AT91SAM9G45
+cam_enc_4xx                  arm         arm926ejs   cam_enc_4xx         ait            davinci     cam_enc_4xx
 da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
-da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci
 da850_am18xxevm              arm         arm926ejs   da8xxevm            davinci        davinci
-cam_enc_4xx                  arm         arm926ejs   cam_enc_4xx         ait            davinci     cam_enc_4xx
-hawkboard                    arm         arm926ejs   da8xxevm            davinci        davinci
-hawkboard_nand               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:NAND_U_BOOT
-hawkboard_uart               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:UART_U_BOOT
-ea20			     arm	 arm926ejs   ea20		 davinci	davinci
+da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci
 davinci_dm355evm             arm         arm926ejs   dm355evm            davinci        davinci
 davinci_dm355leopard         arm         arm926ejs   dm355leopard        davinci        davinci
 davinci_dm365evm             arm         arm926ejs   dm365evm            davinci        davinci
@@ -137,6 +130,10 @@ davinci_dvevm                arm         arm926ejs   dvevm               davinci
 davinci_schmoogie            arm         arm926ejs   schmoogie           davinci        davinci
 davinci_sffsdr               arm         arm926ejs   sffsdr              davinci        davinci
 davinci_sonata               arm         arm926ejs   sonata              davinci        davinci
+ea20			     arm	 arm926ejs   ea20		 davinci	davinci
+hawkboard                    arm         arm926ejs   da8xxevm            davinci        davinci
+hawkboard_nand               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:NAND_U_BOOT
+hawkboard_uart               arm         arm926ejs   da8xxevm            davinci        davinci     hawkboard:UART_U_BOOT
 enbw_cmc                     arm         arm926ejs   enbw_cmc            enbw           davinci
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood:KM_DISABLE_PCI
 km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood:KM_RECONFIG_XLX
@@ -144,8 +141,8 @@ mgcoge3un                    arm         arm926ejs   km_arm              keymile
 portl2                       arm         arm926ejs   km_arm              keymile        kirkwood
 inetspace_v2                 arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:INETSPACE_V2
 net2big_v2                   arm         arm926ejs   net2big_v2          LaCie          kirkwood	lacie_kw:NET2BIG_V2
-netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
+netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
@@ -167,11 +164,14 @@ nhk8815_onenand              arm         arm926ejs   nhk8815             st
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
+versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB
+versatilepb                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_PB
+versatileqemu                arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB
 integratorap_cm946es         arm         arm946es    integrator          armltd         -               integratorap:CM946ES
 integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
-highbank                     arm         armv7       highbank            -              highbank
 am335x_evm                   arm         armv7       am335x              ti             am33xx
+highbank                     arm         armv7       highbank            -              highbank
 efikamx                      arm         armv7       efikamx             -              mx5		efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
 efikasb                      arm         armv7       efikamx             -              mx5		efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg
 mx51evk                      arm         armv7       mx51evk             freescale      mx5		mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
@@ -183,14 +183,14 @@ vision2                      arm         armv7       vision2             ttcontr
 cm_t35                       arm         armv7       cm_t35              -              omap3
 omap3_overo                  arm         armv7       overo               -              omap3
 omap3_pandora                arm         armv7       pandora             -              omap3
+dig297                       arm         armv7       dig297              comelit        omap3
 igep0020                     arm         armv7       igep0020            isee           omap3
 igep0030                     arm         armv7       igep0030            isee           omap3
-am3517_crane                 arm         armv7       am3517crane         ti             omap3
 am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
-dig297                       arm         armv7       dig297              comelit        omap3
 omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
 omap3_zoom2                  arm         armv7       zoom2               logicpd        omap3
 omap3_mvblx                  arm         armv7       mvblx               matrix_vision  omap3
+am3517_crane                 arm         armv7       am3517crane         ti             omap3
 omap3_beagle                 arm         armv7       beagle              ti             omap3
 omap3_evm                    arm         armv7       evm                 ti             omap3
 omap3_evm_quick_mmc          arm         armv7       evm                 ti             omap3
@@ -209,15 +209,14 @@ harmony                      arm         armv7       harmony             nvidia
 seaboard                     arm         armv7       seaboard            nvidia         tegra2
 u8500_href                   arm         armv7       u8500               st-ericsson    u8500
 actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
-actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
 actux1_4_32                  arm         ixp         actux1              -              -           actux1:FLASH2X2,RAM_32MB
+actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
 actux1_8_32                  arm         ixp         actux1              -              -           actux1:FLASH1X8,RAM_32MB
 actux2                       arm         ixp
 actux3                       arm         ixp
 actux4                       arm         ixp
 dvlhost                      arm         ixp
 balloon3                     arm         pxa
-colibri_pxa270               arm         pxa         -                   toradex
 lubbock                      arm         pxa
 palmld                       arm         pxa
 palmtc                       arm         pxa
@@ -229,6 +228,7 @@ vpac270_nor_256              arm         pxa         vpac270             -
 vpac270_ond_256              arm         pxa         vpac270             -              -           vpac270:ONENAND,RAM_256M
 xaeniax                      arm         pxa
 zipitz2                      arm         pxa
+colibri_pxa270               arm         pxa         -                   toradex
 jornada                      arm         sa1100
 atngw100                     avr32       at32ap      -                   atmel          at32ap700x
 atstk1002                    avr32       at32ap      atstk1000           atmel          at32ap700x
@@ -271,11 +271,14 @@ ibf-dsp561                   blackfin    blackfin
 ip04                         blackfin    blackfin
 tcm-bf518                    blackfin    blackfin
 tcm-bf537                    blackfin    blackfin
-eNET                         x86         x86        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x38040000
-eNET_SRAM                    x86         x86        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x19000000
-sandbox                      sandbox     sandbox     sandbox             sandbox        -
+M52277EVB                    m68k        mcf5227x    m52277evb           freescale      -           M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000
+M52277EVB_stmicro            m68k        mcf5227x    m52277evb           freescale      -           M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000
+M5235EVB                     m68k        mcf523x     m5235evb            freescale      -           M5235EVB:SYS_TEXT_BASE=0xFFE00000
+M5235EVB_Flash32             m68k        mcf523x     m5235evb            freescale      -           M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
 cobra5272                    m68k        mcf52x2     cobra5272           -
 idmr                         m68k        mcf52x2
+EB-MCF-EV123                 m68k        mcf52x2     EB+MCF-EV123        BuS            -           EB+MCF-EV123:SYS_TEXT_BASE=0xFFE00000
+EB-MCF-EV123_internal        m68k        mcf52x2     EB+MCF-EV123        BuS            -           EB+MCF-EV123:SYS_TEXT_BASE=0xF0000000
 TASREG                       m68k        mcf52x2     tasreg              esd
 M5208EVBE                    m68k        mcf52x2     m5208evbe           freescale
 M5249EVB                     m68k        mcf52x2     m5249evb            freescale
@@ -285,24 +288,18 @@ M5271EVB                     m68k        mcf52x2     m5271evb            freesca
 M5272C3                      m68k        mcf52x2     m5272c3             freescale
 M5275EVB                     m68k        mcf52x2     m5275evb            freescale
 M5282EVB                     m68k        mcf52x2     m5282evb            freescale
-M52277EVB                    m68k        mcf5227x    m52277evb           freescale      -           M52277EVB:SYS_SPANSION_BOOT,SYS_TEXT_BASE=0x00000000
-M52277EVB_stmicro            m68k        mcf5227x    m52277evb           freescale      -           M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000
-EB-MCF-EV123                 m68k        mcf52x2     EB+MCF-EV123        BuS            -           EB+MCF-EV123:SYS_TEXT_BASE=0xFFE00000
-EB-MCF-EV123_internal        m68k        mcf52x2     EB+MCF-EV123        BuS            -           EB+MCF-EV123:SYS_TEXT_BASE=0xF0000000
-M5235EVB                     m68k        mcf523x     m5235evb            freescale      -           M5235EVB:SYS_TEXT_BASE=0xFFE00000
-M5235EVB_Flash32             m68k        mcf523x     m5235evb            freescale      -           M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000
-M54455EVB                    m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333
-M54455EVB_intel              m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333
-M54455EVB_a66                m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666
-M54455EVB_i66                m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666
-M54455EVB_stm33              m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333
-M54451EVB                    m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000
-M54451EVB_stmicro            m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000
 astro_mcf5373l               m68k        mcf532x     mcf5373l            astro
 M53017EVB                    m68k        mcf532x     m53017evb           freescale
 M5329AFEE                    m68k        mcf532x     m5329evb            freescale      -           M5329EVB:NANDFLASH_SIZE=0
 M5329BFEE                    m68k        mcf532x     m5329evb            freescale      -           M5329EVB:NANDFLASH_SIZE=16
 M5373EVB                     m68k        mcf532x     m5373evb            freescale      -           M5373EVB:NANDFLASH_SIZE=16
+M54451EVB                    m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=24000000
+M54451EVB_stmicro            m68k        mcf5445x    m54451evb           freescale      -           M54451EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x47e00000,SYS_INPUT_CLKSRC=24000000
+M54455EVB                    m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=33333333
+M54455EVB_a66                m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_ATMEL_BOOT,SYS_TEXT_BASE=0x04000000,SYS_INPUT_CLKSRC=66666666
+M54455EVB_i66                m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=66666666
+M54455EVB_intel              m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_INTEL_BOOT,SYS_TEXT_BASE=0x00000000,SYS_INPUT_CLKSRC=33333333
+M54455EVB_stm33              m68k        mcf5445x    m54455evb           freescale      -           M54455EVB:SYS_STMICRO_BOOT,CF_SBF,SYS_TEXT_BASE=0x4FE00000,SYS_INPUT_CLKSRC=33333333
 M5475AFE                     m68k        mcf547x_8x  m547xevb            freescale      -           M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64
 M5475BFE		     m68k        mcf547x_8x  m547xevb            freescale      -           M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16
 M5475CFE		     m68k	 mcf547x_8x  m547xevb            freescale      -           M5475EVB:SYS_BUSCLK=133333333,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO,SYS_USBCTRL
@@ -319,35 +316,35 @@ M5485FFE		     m68k	 mcf547x_8x  m548xevb            freescale      -
 M5485GFE		     m68k        mcf547x_8x  m548xevb            freescale      -           M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64
 M5485HFE		     m68k        mcf547x_8x  m548xevb            freescale      -           M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO
 microblaze-generic           microblaze  microblaze  microblaze-generic  xilinx
+qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips
+tb0229                       mips        mips32
+vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
+vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
+vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
+vct_platinumavc_onenand_small mips       mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_platinumavc_small        mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
+vct_platinum_onenand         mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM,VCT_ONENAND
+vct_platinum_onenand_small   mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_platinum_small           mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM,VCT_SMALL_IMAGE
+vct_premium                  mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM
+vct_premium_onenand          mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM,VCT_ONENAND
+vct_premium_onenand_small    mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE
+vct_premium_small            mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM,VCT_SMALL_IMAGE
 dbau1000                     mips        mips32      dbau1x00            -              au1x00      dbau1x00:DBAU1000
 dbau1100                     mips        mips32      dbau1x00            -              au1x00      dbau1x00:DBAU1100
 dbau1500                     mips        mips32      dbau1x00            -              au1x00      dbau1x00:DBAU1500
 dbau1550                     mips        mips32      dbau1x00            -              au1x00      dbau1x00:DBAU1550
 dbau1550_el                  mips        mips32      dbau1x00            -              au1x00      dbau1x00:DBAU1550
 gth2                         mips        mips32      -                   -              au1x00
+pb1000                       mips        mips32      pb1x00              -              au1x00      pb1x00:PB1000
 incaip                       mips        mips32      incaip              -              incaip
 incaip_100MHz                mips        mips32      incaip              -              incaip      incaip:CPU_CLOCK_RATE=100000000
 incaip_133MHz                mips        mips32      incaip              -              incaip      incaip:CPU_CLOCK_RATE=133000000
 incaip_150MHz                mips        mips32      incaip              -              incaip      incaip:CPU_CLOCK_RATE=150000000
-pb1000                       mips        mips32      pb1x00              -              au1x00      pb1x00:PB1000
-qemu_mips                    mips        mips32      qemu-mips           -              -           qemu-mips
-tb0229                       mips        mips32
-vct_premium                  mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM
-vct_premium_small            mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM,VCT_SMALL_IMAGE
-vct_premium_onenand          mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM,VCT_ONENAND
-vct_premium_onenand_small    mips        mips32      vct                 micronas       -           vct:VCT_PREMIUM,VCT_ONENAND,VCT_SMALL_IMAGE
-vct_platinum                 mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM
-vct_platinum_small           mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM,VCT_SMALL_IMAGE
-vct_platinum_onenand         mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM,VCT_ONENAND
-vct_platinum_onenand_small   mips        mips32      vct                 micronas       -           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE
-vct_platinumavc              mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC
-vct_platinumavc_small        mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_SMALL_IMAGE
-vct_platinumavc_onenand      mips        mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND
-vct_platinumavc_onenand_small mips       mips32      vct                 micronas       -           vct:VCT_PLATINUMAVC,VCT_ONENAND,VCT_SMALL_IMAGE
 qi_lb60                      mips        xburst      qi_lb60             qi
-nios2-generic                nios2       nios2       nios2-generic       altera
 adp-ag101                    nds32       n1213       adp-ag101           AndesTech      ag101
 adp-ag101p                   nds32       n1213       adp-ag101p          AndesTech      ag101
+nios2-generic                nios2       nios2       nios2-generic       altera
 PCI5441                      nios2       nios2       pci5441             psyent
 PK1C20                       nios2       nios2       pk1c20              psyent
 EVB64260                     powerpc     74xx_7xx    evb64260            -              -           EVB64260
@@ -375,10 +372,6 @@ a4m072                       powerpc     mpc5xxx     a4m072
 BC3450                       powerpc     mpc5xxx     bc3450
 canmb                        powerpc     mpc5xxx
 cm5200                       powerpc     mpc5xxx
-digsy_mtc                    powerpc     mpc5xxx     digsy_mtc           intercontrol
-digsy_mtc_RAMBOOT            powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000
-digsy_mtc_rev5               powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:DIGSY_REV5
-digsy_mtc_rev5_RAMBOOT       powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000,DIGSY_REV5
 galaxy5200                   powerpc     mpc5xxx     galaxy5200          -              -           galaxy5200:galaxy5200
 galaxy5200_LOWBOOT           powerpc     mpc5xxx     galaxy5200          -              -           galaxy5200:galaxy5200_LOWBOOT
 icecube_5200                 powerpc     mpc5xxx     icecube             -              -           IceCube
@@ -426,6 +419,10 @@ TOP5200                      powerpc     mpc5xxx     top5200             emk
 cpci5200                     powerpc     mpc5xxx     -                   esd
 mecp5200                     powerpc     mpc5xxx     -                   esd
 pf5200                       powerpc     mpc5xxx     -                   esd
+digsy_mtc                    powerpc     mpc5xxx     digsy_mtc           intercontrol
+digsy_mtc_RAMBOOT            powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000
+digsy_mtc_rev5               powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:DIGSY_REV5
+digsy_mtc_rev5_RAMBOOT       powerpc     mpc5xxx     digsy_mtc           intercontrol   -           digsy_mtc:SYS_TEXT_BASE=0x00100000,DIGSY_REV5
 hmi1001                      powerpc     mpc5xxx     -                   manroland
 mucmc52                      powerpc     mpc5xxx     -                   manroland
 uc101                        powerpc     mpc5xxx     -                   manroland
@@ -561,16 +558,16 @@ MPC8349EMDS                  powerpc     mpc83xx     mpc8349emds         freesca
 MPC8349ITX                   powerpc     mpc83xx     mpc8349itx          freescale      -           MPC8349ITX:MPC8349ITX
 MPC8349ITXGP                 powerpc     mpc83xx     mpc8349itx          freescale      -           MPC8349ITX:MPC8349ITXGP,SYS_TEXT_BASE=0xFE000000
 MPC8349ITX_LOWBOOT           powerpc     mpc83xx     mpc8349itx          freescale      -           MPC8349ITX:MPC8349ITX,SYS_TEXT_BASE=0xFE000000
-MPC8360EMDS_66               powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ
 MPC8360EMDS_33               powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_33MHZ
-MPC8360EMDS_66_ATM           powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1
 MPC8360EMDS_33_ATM           powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_33MHZ,PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1
-MPC8360EMDS_66_HOST_33       powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PCI,PCI_33M,PQ_MDS_PIB=1
 MPC8360EMDS_33_HOST_33       powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_33MHZ,PCI,PCI_33M,PQ_MDS_PIB=1
-MPC8360EMDS_66_HOST_66       powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PCI,PCI_66M,PQ_MDS_PIB=1
 MPC8360EMDS_33_HOST_66       powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_33MHZ,PCI,PCI_66M,PQ_MDS_PIB=1
-MPC8360EMDS_66_SLAVE         powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PCI,PCISLAVE
 MPC8360EMDS_33_SLAVE         powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_33MHZ,PCI,PCISLAVE
+MPC8360EMDS_66               powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ
+MPC8360EMDS_66_ATM           powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1
+MPC8360EMDS_66_HOST_33       powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PCI,PCI_33M,PQ_MDS_PIB=1
+MPC8360EMDS_66_HOST_66       powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PCI,PCI_66M,PQ_MDS_PIB=1
+MPC8360EMDS_66_SLAVE         powerpc     mpc83xx     mpc8360emds         freescale      -           MPC8360EMDS:CLKIN_66MHZ,PCI,PCISLAVE
 MPC8360ERDK                  powerpc     mpc83xx     mpc8360erdk         freescale      -           MPC8360ERDK
 MPC8360ERDK_33               powerpc     mpc83xx     mpc8360erdk         freescale      -           MPC8360ERDK:CLKIN_33MHZ
 MPC8360ERDK_66               powerpc     mpc83xx     mpc8360erdk         freescale      -           MPC8360ERDK
@@ -578,15 +575,15 @@ MPC837XEMDS                  powerpc     mpc83xx     mpc837xemds         freesca
 MPC837XEMDS_HOST             powerpc     mpc83xx     mpc837xemds         freescale      -           MPC837XEMDS:PCI
 MPC837XERDB                  powerpc     mpc83xx     mpc837xerdb         freescale
 kmeter1                      powerpc     mpc83xx     km83xx              keymile
+kmsupx5                      powerpc     mpc83xx     km83xx              keymile
+suvd3                        powerpc     mpc83xx     km83xx              keymile
+tuda1                        powerpc     mpc83xx     km83xx              keymile
+tuxa1                        powerpc     mpc83xx     km83xx              keymile
 MERGERBOX                    powerpc     mpc83xx     mergerbox           matrix_vision
 MVBLM7                       powerpc     mpc83xx     mvblm7              matrix_vision
 SIMPC8313_LP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_LP
 SIMPC8313_SP                 powerpc     mpc83xx     simpc8313           sheldon        -           SIMPC8313:NAND_SP
-kmsupx5                      powerpc     mpc83xx     km83xx              keymile
-suvd3                        powerpc     mpc83xx     km83xx              keymile
 TQM834x                      powerpc     mpc83xx     tqm834x             tqc
-tuda1                        powerpc     mpc83xx     km83xx              keymile
-tuxa1                        powerpc     mpc83xx     km83xx              keymile
 sbc8540                      powerpc     mpc85xx     sbc8560             -              -           SBC8540
 sbc8540_33                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
 sbc8540_66                   powerpc     mpc85xx     sbc8560             -              -           SBC8540
@@ -621,20 +618,20 @@ MPC8569MDS_NAND              powerpc     mpc85xx     mpc8569mds          freesca
 MPC8572DS                    powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS
 MPC8572DS_36BIT              powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:36BIT
 MPC8572DS_NAND               powerpc     mpc85xx     mpc8572ds           freescale      -           MPC8572DS:NAND
-P1010RDB_NOR                 powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB
-P1010RDB_NOR_SECBOOT         powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,SECURE_BOOT
+P1010RDB_36BIT_NAND          powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND
+P1010RDB_36BIT_NAND_SECBOOT  powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT
 P1010RDB_36BIT_NOR           powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT
 P1010RDB_36BIT_NOR_SECBOOT   powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SECURE_BOOT
+P1010RDB_36BIT_SDCARD        powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SDCARD
+P1010RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SPIFLASH
+P1010RDB_36BIT_SPIFLASH_SECBOOT      powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SPIFLASH,SECURE_BOOT
 P1010RDB_NAND                powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,NAND
 P1010RDB_NAND_SECBOOT        powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,NAND_SECBOOT,SECURE_BOOT
-P1010RDB_36BIT_NAND          powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND
-P1010RDB_36BIT_NAND_SECBOOT  powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT
+P1010RDB_NOR                 powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB
+P1010RDB_NOR_SECBOOT         powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,SECURE_BOOT
 P1010RDB_SDCARD              powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,SDCARD
 P1010RDB_SPIFLASH            powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,SPIFLASH
 P1010RDB_SPIFLASH_SECBOOT    powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,SPIFLASH,SECURE_BOOT
-P1010RDB_36BIT_SDCARD        powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SDCARD
-P1010RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SPIFLASH
-P1010RDB_36BIT_SPIFLASH_SECBOOT      powerpc     mpc85xx     p1010rdb            freescale      -           P1010RDB:P1010RDB,36BIT,SPIFLASH,SECURE_BOOT
 P1011RDB                     powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1011RDB
 P1011RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1011RDB,36BIT
 P1011RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1011RDB,36BIT,SDCARD
@@ -644,35 +641,35 @@ P1011RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freesca
 P1011RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1011RDB,SPIFLASH
 P1020MBG-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020MBG
 P1020MBG-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020MBG,36BIT
-P1020MBG-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020MBG,SDCARD
 P1020MBG-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020MBG,SDCARD,36BIT
+P1020MBG-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020MBG,SDCARD
 P1020RDB                     powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB
 P1020RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT
 P1020RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SDCARD
 P1020RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,36BIT,SPIFLASH
 P1020RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,NAND
-P1020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SDCARD
-P1020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SPIFLASH
 P1020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB
-P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,NAND
-P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SDCARD
-P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SPIFLASH
 P1020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT
 P1020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,NAND
 P1020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SDCARD
 P1020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,36BIT,SPIFLASH
+P1020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,NAND
+P1020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SDCARD
+P1020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020RDB,SPIFLASH
+P1020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SDCARD
+P1020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P1020RDB,SPIFLASH
 P1020UTM-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM
-P1020UTM-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,SDCARD
 P1020UTM-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT
 P1020UTM-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,36BIT,SDCARD
+P1020UTM-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1020UTM,SDCARD
 P1021RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB
-P1021RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,NAND
-P1021RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SDCARD
-P1021RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SPIFLASH
 P1021RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,36BIT
 P1021RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,36BIT,NAND
 P1021RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,36BIT,SDCARD
 P1021RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,36BIT,SPIFLASH
+P1021RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,NAND
+P1021RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SDCARD
+P1021RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P1021RDB,SPIFLASH
 P1022DS                      powerpc     mpc85xx     p1022ds             freescale
 P1022DS_36BIT                powerpc     mpc85xx     p1022ds             freescale      -           P1022DS:36BIT
 P1023RDS                     powerpc     mpc85xx     p1023rds            freescale      -           P1023RDS
@@ -694,6 +691,8 @@ P2010RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1_p2_rdb           freesca
 P2010RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,NAND
 P2010RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,SDCARD
 P2010RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2010RDB,SPIFLASH
+P2020COME_SDCARD             powerpc     mpc85xx     p2020come           freescale      -           P2020COME:SDCARD
+P2020COME_SPIFLASH           powerpc     mpc85xx     p2020come           freescale      -           P2020COME:SPIFLASH
 P2020DS                      powerpc     mpc85xx     p2020ds             freescale
 P2020DS_36BIT                powerpc     mpc85xx     p2020ds             freescale      -           P2020DS:36BIT
 P2020DS_DDR2                 powerpc     mpc85xx     p2020ds             freescale      -           P2020DS:DDR2
@@ -704,18 +703,16 @@ P2020RDB_36BIT               powerpc     mpc85xx     p1_p2_rdb           freesca
 P2020RDB_36BIT_SDCARD        powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,36BIT,SDCARD
 P2020RDB_36BIT_SPIFLASH      powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,36BIT,SPIFLASH
 P2020RDB_NAND                powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,NAND
-P2020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SDCARD
-P2020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SPIFLASH
 P2020RDB-PC                  powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB
-P2020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,NAND
-P2020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,SDCARD
-P2020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,SPIFLASH
 P2020RDB-PC_36BIT            powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT
 P2020RDB-PC_36BIT_NAND       powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT,NAND
 P2020RDB-PC_36BIT_SDCARD     powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT,SDCARD
 P2020RDB-PC_36BIT_SPIFLASH   powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,36BIT,SPIFLASH
-P2020COME_SDCARD             powerpc     mpc85xx     p2020come           freescale      -           P2020COME:SDCARD
-P2020COME_SPIFLASH           powerpc     mpc85xx     p2020come           freescale      -           P2020COME:SPIFLASH
+P2020RDB-PC_NAND             powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,NAND
+P2020RDB-PC_SDCARD           powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,SDCARD
+P2020RDB-PC_SPIFLASH         powerpc     mpc85xx     p1_p2_rdb_pc        freescale      -           p1_p2_rdb_pc:P2020RDB,SPIFLASH
+P2020RDB_SDCARD              powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SDCARD
+P2020RDB_SPIFLASH            powerpc     mpc85xx     p1_p2_rdb           freescale      -           P1_P2_RDB:P2020RDB,SPIFLASH
 P2041RDB                     powerpc     mpc85xx     p2041rdb            freescale
 P2041RDB_SDCARD              powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
 P2041RDB_SECURE_BOOT         powerpc     mpc85xx     p2041rdb            freescale      -           P2041RDB:SECURE_BOOT
@@ -973,6 +970,7 @@ xilinx-ppc405-generic        powerpc     ppc4xx      ppc405-generic      xilinx
 xilinx-ppc405-generic_flash  powerpc     ppc4xx      ppc405-generic      xilinx         -           xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC
 xilinx-ppc440-generic        powerpc     ppc4xx      ppc440-generic      xilinx         -           xilinx-ppc440-generic:SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1
 xilinx-ppc440-generic_flash  powerpc     ppc4xx      ppc440-generic      xilinx         -           xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC
+sandbox                      sandbox     sandbox     sandbox             sandbox        -
 rsk7203                      sh          sh2         rsk7203             renesas        -
 rsk7264                      sh          sh2         rsk7264             renesas        -
 mpr2                         sh          sh3         mpr2                -              -
@@ -982,18 +980,20 @@ espt                         sh          sh4         espt                -
 ms7722se                     sh          sh4         ms7722se            -              -
 ms7750se                     sh          sh4         ms7750se            -              -
 ap325rxa                     sh          sh4         ap325rxa            renesas        -
+ecovec                       sh          sh4         ecovec              renesas        -
+MigoR                        sh          sh4         MigoR               renesas        -
 r2dplus                      sh          sh4         r2dplus             renesas        -
 r7780mp                      sh          sh4         r7780mp             renesas        -
 sh7757lcr                    sh          sh4         sh7757lcr           renesas        -
 sh7763rdp                    sh          sh4         sh7763rdp           renesas        -
 sh7785lcr                    sh          sh4         sh7785lcr           renesas        -
 sh7785lcr_32bit              sh          sh4         sh7785lcr           renesas        -           sh7785lcr:SH_32BIT=1
-MigoR                        sh          sh4         MigoR               renesas        -
-ecovec                       sh          sh4         ecovec              renesas        -
 grsim_leon2                  sparc       leon2       -                   gaisler
 gr_cpci_ax2000               sparc       leon3       -                   gaisler
 gr_ep2s60                    sparc       leon3       -                   gaisler
 grsim                        sparc       leon3       -                   gaisler
 gr_xc3s_1500                 sparc       leon3       -                   gaisler
+eNET                         x86         x86        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x38040000
+eNET_SRAM                    x86         x86        eNET                -              sc520       eNET:SYS_TEXT_BASE=0x19000000
 # Target                     ARCH        CPU         Board name          Vendor	        SoC         Options
 ########################################################################################################################
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 06/13] board/apollon/apollon.c: Fix GCc 4.6 build warnings.
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (4 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 05/13] boards.cfg: sort list Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-10 22:09   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 07/13] board/apollon/sys_info.c: Fix GCC 4.6 build warning Wolfgang Denk
                   ` (6 subsequent siblings)
  12 siblings, 1 reply; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
apollon.c: In function 'dram_init':
apollon.c:188:29: warning: variable 'cpu' set but not used
[-Wunused-but-set-variable]
apollon.c:188:20: warning: variable 'rev' set but not used
[-Wunused-but-set-variable]
apollon.c:187:26: warning: variable 'size1' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
---
 board/apollon/apollon.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 4768f58..76626f0 100644
--- a/board/apollon/apollon.c
+++ b/board/apollon/apollon.c
@@ -184,14 +184,12 @@ eth_reset_err_out:
  **********************************************/
 int dram_init(void)
 {
-	unsigned int size0 = 0, size1 = 0;
-	u32 mtype, btype, rev = 0, cpu = 0;
+	unsigned int size;
+	u32 mtype, btype;
 #define NOT_EARLY 0
 
 	btype = get_board_type();
 	mtype = get_mem_type();
-	rev = get_cpu_rev();
-	cpu = get_cpu_type();
 
 	display_board_info(btype);
 
@@ -200,14 +198,16 @@ int dram_init(void)
 		do_sdrc_init(SDRC_CS1_OSET, NOT_EARLY);
 	}
 
-	size0 = get_sdr_cs_size(SDRC_CS0_OSET);
-	size1 = get_sdr_cs_size(SDRC_CS1_OSET);
+	size = get_sdr_cs_size(SDRC_CS0_OSET);
 
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = size0;
+	gd->bd->bi_dram[0].size = size;
 #if CONFIG_NR_DRAM_BANKS > 1
-	gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + size0;
-	gd->bd->bi_dram[1].size = size1;
+	size = get_sdr_cs_size(SDRC_CS1_OSET);
+
+	gd->bd->bi_dram[1].start = gd->bd->bi_dram[0].start +
+				   gd->bd->bi_dram[0].size;
+	gd->bd->bi_dram[1].size = size;
 #endif
 
 	return 0;
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 07/13] board/apollon/sys_info.c: Fix GCC 4.6 build warning
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (5 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 06/13] board/apollon/apollon.c: Fix GCc 4.6 build warnings Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-10 22:10   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 08/13] ARM: convert "apollon" board to use boards.cfg Wolfgang Denk
                   ` (5 subsequent siblings)
  12 siblings, 1 reply; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
sys_info.c: In function 'display_board_info':
sys_info.c:260:16: warning: variable 'db_s' set but not used
[-Wunused-but-set-variable]

Also fix resulting warnings:
sys_info.c:251:7: warning: unused variable 'db_ip' [-Wunused-variable]
sys_info.c:250:7: warning: unused variable 'db_men' [-Wunused-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
---
 board/apollon/sys_info.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/board/apollon/sys_info.c b/board/apollon/sys_info.c
index 26ac9a2..4f950ae 100644
--- a/board/apollon/sys_info.c
+++ b/board/apollon/sys_info.c
@@ -247,8 +247,6 @@ void display_board_info(u32 btype)
 	char cpu_2420[] = "2420";	/* cpu type */
 	char cpu_2422[] = "2422";
 	char cpu_2423[] = "2423";
-	char db_men[] = "Menelaus";	/* board type */
-	char db_ip[] = "IP";
 	char mem_sdr[] = "mSDR";	/* memory type */
 	char mem_ddr[] = "mDDR";
 	char t_tst[] = "TST";	/* security level */
@@ -257,7 +255,7 @@ void display_board_info(u32 btype)
 	char t_gp[] = "GP";
 	char unk[] = "?";
 
-	char *cpu_s, *db_s, *mem_s, *sec_s;
+	char *cpu_s, *mem_s, *sec_s;
 	u32 cpu, rev, sec;
 
 	rev = get_cpu_rev();
@@ -276,11 +274,6 @@ void display_board_info(u32 btype)
 	else
 		cpu_s = cpu_2420;
 
-	if (btype == BOARD_H4_MENELAUS)
-		db_s = db_men;
-	else
-		db_s = db_ip;
-
 	switch (sec) {
 	case TST_DEVICE:
 		sec_s = t_tst;
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 08/13] ARM: convert "apollon" board to use boards.cfg
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (6 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 07/13] board/apollon/sys_info.c: Fix GCC 4.6 build warning Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-10 22:10   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning Wolfgang Denk
                   ` (4 subsequent siblings)
  12 siblings, 1 reply; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
---
 MAKEALL                   |    1 -
 Makefile                  |   10 ----------
 boards.cfg                |    1 +
 include/configs/apollon.h |    2 ++
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 21b573a..0f7b820 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -317,7 +317,6 @@ LIST_ARM9="$(boards_by_cpu arm920t)	\
 ## ARM11 Systems
 #########################################################################
 LIST_ARM11="$(boards_by_cpu arm1136)	\
-	apollon			\
 	imx31_phycore		\
 	imx31_phycore_eet	\
 	mx31pdk			\
diff --git a/Makefile b/Makefile
index de65a17..e603b9a 100644
--- a/Makefile
+++ b/Makefile
@@ -708,16 +708,6 @@ scpu_config:	unconfig
 	@$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive
 
 #########################################################################
-## ARM1136 Systems
-#########################################################################
-
-apollon_config		: unconfig
-	@mkdir -p $(obj)include
-	@echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
-	@echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
-	@$(MKCONFIG) $@ arm arm1136 apollon - omap24xx
-
-#########################################################################
 ## ARM1176 Systems
 #########################################################################
 smdk6400_noUSB_config	\
diff --git a/boards.cfg b/boards.cfg
index 4a4968d..c1b0bad 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -45,6 +45,7 @@ tt01                         arm         arm1136     -                   hale
 imx31_litekit                arm         arm1136     -                   logicpd        mx31
 flea3                        arm         arm1136     -                   CarMediaLab    mx35
 mx35pdk                      arm         arm1136     -                   freescale      mx35
+apollon			     arm	 arm1136     apollon		 -	        omap24xx
 omap2420h4                   arm         arm1136     -                   ti             omap24xx
 tnetv107x_evm                arm         arm1176     tnetv107xevm        ti             tnetv107x
 integratorap_cm720t          arm         arm720t     integrator          armltd         -           integratorap:CM720T
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 7fcf437..8f06cd7 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -37,6 +37,8 @@
 #define CONFIG_APOLLON		1
 #define CONFIG_APOLLON_PLUS	1 /* If you have apollon plus 1.x */
 
+#define CONFIG_ONENAND_U_BOOT	y
+
 /* Clock config to target*/
 #define PRCM_CONFIG_I		1
 /* #define PRCM_CONFIG_II	1 */
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (7 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 08/13] ARM: convert "apollon" board to use boards.cfg Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 15:11   ` Simon Guinot
  2011-12-10 22:11   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
                   ` (3 subsequent siblings)
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
edminiv2.c: In function 'reset_phy':
edminiv2.c:98:2: warning: implicit declaration of function
'mv_phy_88e1116_init' [-Wimplicit-function-declaration]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
 board/LaCie/edminiv2/edminiv2.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index c1a01bc..1b33875 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <miiphy.h>
 #include <asm/arch/orion5x.h>
+#include "../common/common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (8 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 14:57   ` Tom Rini
  2011-12-10 22:11   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg Wolfgang Denk
                   ` (2 subsequent siblings)
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
flash.c: In function 'flash_get_offsets':
flash.c:139:10: warning: variable 'pOrgDef' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'flash_erase':
flash.c:280:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:456:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 board/ti/omap1610inn/flash.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/board/ti/omap1610inn/flash.c b/board/ti/omap1610inn/flash.c
index 1b67d08..a99a91c 100644
--- a/board/ti/omap1610inn/flash.c
+++ b/board/ti/omap1610inn/flash.c
@@ -136,9 +136,7 @@ void flash_unlock(flash_info_t * info)
 static void flash_get_offsets (ulong base, flash_info_t * info)
 {
 	int i;
-	OrgDef *pOrgDef;
 
-	pOrgDef = OrgIntel_28F256L18T;
 	if (info->flash_id == FLASH_UNKNOWN) {
 		return;
 	}
@@ -352,6 +350,9 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
 			printf (" done\n");
 		}
 	}
+	if (flag)
+		enable_interrupts();
+
 	return rcode;
 }
 
@@ -453,13 +454,13 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
 {
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
-	int flag;
+	int flag, rc = 0;
 	ulong start;
 
 	/* Check if Flash is (sufficiently) erased */
 	if ((*addr & data) != data) {
-		printf ("not erased at %08lx (%x)\n", (ulong) addr, *addr);
-		return (2);
+		printf("not erased at %08lx (%x)\n", (ulong) addr, *addr);
+		return 2;
 	}
 	/* Disable interrupts which might cause a timeout here */
 	flag = disable_interrupts ();
@@ -472,12 +473,16 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
 	/* wait while polling the status register */
 	while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
 		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-			return (1);
+			rc = 1;
+			goto done;
 		}
 	}
+done:
+	if (flag)
+		enable_interrupts();
+
 	*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-	return (0);
+	return rc;
 }
 
 void inline spin_wheel (void)
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (9 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 14:56   ` Tom Rini
  2011-12-10 22:12   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg Wolfgang Denk
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Kshitij Gupta <kshitij@ti.com>
---
 MAKEALL    |    2 --
 Makefile   |   20 --------------------
 boards.cfg |    8 ++++++++
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 0f7b820..c2b52d0 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -308,8 +308,6 @@ LIST_SA="$(boards_by_cpu sa1100)"
 LIST_ARM9="$(boards_by_cpu arm920t)	\
 	$(boards_by_cpu arm926ejs)	\
 	$(boards_by_cpu arm925t)	\
-	omap1610h2		\
-	omap1610inn		\
 	omap730p2		\
 "
 
diff --git a/Makefile b/Makefile
index e603b9a..8474ce7 100644
--- a/Makefile
+++ b/Makefile
@@ -646,26 +646,6 @@ ucname	= $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
 # ARM
 #========================================================================
 
-xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
-
-omap1610inn_config \
-omap1610inn_cs0boot_config \
-omap1610inn_cs3boot_config \
-omap1610inn_cs_autoboot_config \
-omap1610h2_config \
-omap1610h2_cs0boot_config \
-omap1610h2_cs3boot_config \
-omap1610h2_cs_autoboot_config:	unconfig
-	@mkdir -p $(obj)include
-	@if [ "$(findstring _cs0boot_, $@)" ] ; then \
-		echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
-	elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
-		echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
-	else \
-		echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
-	fi;
-	@$(MKCONFIG) -n $@ -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
-
 omap730p2_config \
 omap730p2_cs0boot_config \
 omap730p2_cs3boot_config :	unconfig
diff --git a/boards.cfg b/boards.cfg
index c1b0bad..b9cc705 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -162,6 +162,14 @@ magnesium                    arm         arm926ejs   imx27lite           logicpd
 m28evk                       arm         arm926ejs   -                   denx           mx28
 nhk8815                      arm         arm926ejs   nhk8815             st             nomadik
 nhk8815_onenand              arm         arm926ejs   nhk8815             st             nomadik       nhk8815:BOOT_ONENAND
+omap1610h2		     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS3_BOOT
+omap1610h2_cs0boot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS0_BOOT
+omap1610h2_cs3boot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS3_BOOT
+omap1610h2_cs_autoboot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS_AUTOBOOT
+omap1610inn		     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS3_BOOT
+omap1610inn_cs0boot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS0_BOOT
+omap1610inn_cs3boot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS3_BOOT
+omap1610inn_cs_autoboot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS_AUTOBOOT
 omap5912osk                  arm         arm926ejs   -                   ti             omap
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (10 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 14:58   ` Tom Rini
  2011-12-10 22:12   ` Wolfgang Denk
  2011-12-09 11:14 ` [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg Wolfgang Denk
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Fix:
flash.c: In function 'flash_get_offsets':
flash.c:122:10: warning: variable 'pOrgDef' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'flash_erase':
flash.c:263:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:439:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Dave Peverley <dpeverley@mpc-data.co.uk>
---
 board/ti/omap730p2/flash.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/board/ti/omap730p2/flash.c b/board/ti/omap730p2/flash.c
index 185bc2d..a292627 100644
--- a/board/ti/omap730p2/flash.c
+++ b/board/ti/omap730p2/flash.c
@@ -119,9 +119,7 @@ unsigned long flash_init (void)
 static void flash_get_offsets (ulong base, flash_info_t * info)
 {
 	int i;
-	OrgDef *pOrgDef;
 
-	pOrgDef = OrgIntel_28F256L18T;
 	if (info->flash_id == FLASH_UNKNOWN) {
 		return;
 	}
@@ -335,6 +333,10 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
 			printf (" done\n");
 		}
 	}
+
+	if (flag)
+		enable_interrupts();
+
 	return rcode;
 }
 
@@ -436,7 +438,7 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
 {
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
-	int flag;
+	int flag, rc = 0;
 	ulong start;
 
 	/* Check if Flash is (sufficiently) erased */
@@ -456,12 +458,15 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
 	/* wait while polling the status register */
 	while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
 		if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
-			*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-			return (1);
+			rc = 1;
+			goto done;
 		}
 	}
-	*addr = (FPW) 0x00FF00FF;	/* restore read mode */
-	return (0);
+done:
+	*addr = (FPW)0x00FF00FF;	/* restore read mode */
+	if (flag)
+		enable_interrupts();
+	return rc;
 }
 
 void inline spin_wheel (void)
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg
  2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
                   ` (11 preceding siblings ...)
  2011-12-09 11:14 ` [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
@ 2011-12-09 11:14 ` Wolfgang Denk
  2011-12-09 14:55   ` Tom Rini
  2011-12-10 22:13   ` Wolfgang Denk
  12 siblings, 2 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 11:14 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Wolfgang Denk <wd@denx.de>
Dave Peverley <dpeverley@mpc-data.co.uk>
---
 MAKEALL    |    1 -
 Makefile   |   11 -----------
 boards.cfg |    3 +++
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index c2b52d0..f735af6 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -308,7 +308,6 @@ LIST_SA="$(boards_by_cpu sa1100)"
 LIST_ARM9="$(boards_by_cpu arm920t)	\
 	$(boards_by_cpu arm926ejs)	\
 	$(boards_by_cpu arm925t)	\
-	omap730p2		\
 "
 
 #########################################################################
diff --git a/Makefile b/Makefile
index 8474ce7..c37dc03 100644
--- a/Makefile
+++ b/Makefile
@@ -646,17 +646,6 @@ ucname	= $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
 # ARM
 #========================================================================
 
-omap730p2_config \
-omap730p2_cs0boot_config \
-omap730p2_cs3boot_config :	unconfig
-	@mkdir -p $(obj)include
-	@if [ "$(findstring _cs0boot_, $@)" ] ; then \
-		echo "#define CONFIG_CS0_BOOT" >> $(obj)include/config.h ; \
-	else \
-		echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
-	fi;
-	@$(MKCONFIG) -n $@ -a omap730p2 arm arm926ejs omap730p2 ti omap
-
 spear300_config \
 spear310_config \
 spear320_config :	unconfig
diff --git a/boards.cfg b/boards.cfg
index b9cc705..9f25649 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -171,6 +171,9 @@ omap1610inn_cs0boot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:
 omap1610inn_cs3boot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS3_BOOT
 omap1610inn_cs_autoboot	     arm	 arm926ejs   omap1610inn	 ti		omap	    omap1610inn:CS_AUTOBOOT
 omap5912osk                  arm         arm926ejs   -                   ti             omap
+omap730p2		     arm         arm926ejs   omap730p2		 ti             omap        omap730p2:CS3_BOOT
+omap730p2_cs0boot	     arm         arm926ejs   omap730p2		 ti             omap        omap730p2:CS0_BOOT
+omap730p2_cs3boot	     arm         arm926ejs   omap730p2		 ti             omap        omap730p2:CS3_BOOT
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
 versatileab                  arm         arm926ejs   versatile           armltd         versatile   versatile:ARCH_VERSATILE_AB
-- 
1.7.6.4

^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug)
  2011-12-09 11:14 ` [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug) Wolfgang Denk
@ 2011-12-09 11:36   ` William Juul
  2011-12-10 22:08   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: William Juul @ 2011-12-09 11:36 UTC (permalink / raw)
  To: u-boot

Acked-by: William Juul <wiljuul@cisco.com>

And please note my new e-mail address.

Best regards
William Juul

> -----Original Message-----
> From: Wolfgang Denk [mailto:wd at denx.de]
> Sent: Friday, December 09, 2011 12:14 PM
> To: u-boot at lists.denx.de
> Cc: Wolfgang Denk; William Juul; Scott Wood
> Subject: [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile
> warning (and bug)
> 
> Fix:
> yaffs_guts.c: In function 'yaffs_GarbageCollectBlock':
> yaffs_guts.c:2761:6: warning: variable 'retVal' set but not used
> [-Wunused-but-set-variable]
> 
> Here GCC actually detected a bug.  The code was always returning OK
> instead of the previously set retrun code.  Fix that.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: William Juul <william.juul@tandberg.com>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
>  fs/yaffs2/yaffs_guts.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
> index f0ef8db..7390b40 100644
> --- a/fs/yaffs2/yaffs_guts.c
> +++ b/fs/yaffs2/yaffs_guts.c
> @@ -2976,7 +2976,7 @@ static int
yaffs_GarbageCollectBlock(yaffs_Device
> * dev, int block)
> 
>  	dev->isDoingGC = 0;
> 
> -	return YAFFS_OK;
> +	return retVal;
>  }
> 
>  /* New garbage collector
> --
> 1.7.6.4

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning
  2011-12-09 11:14 ` [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning Wolfgang Denk
@ 2011-12-09 13:48   ` Jason Hobbs
  2011-12-09 20:45     ` Wolfgang Denk
  0 siblings, 1 reply; 36+ messages in thread
From: Jason Hobbs @ 2011-12-09 13:48 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang,

On Fri, Dec 09, 2011 at 06:14:23AM -0500, Wolfgang Denk wrote:
> Fix:
> cmd_pxe.c: In function 'parse_pxefile_top':
> cmd_pxe.c:941:5: warning: 'err' may be used uninitialized in this
> function [-Wuninitialized]
> cmd_pxe.c:921:6: note: 'err' was declared here
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Jason Hobbs <jason.hobbs@calxeda.com>
> ---
>  common/cmd_pxe.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c
> index 9426f5b..eaf95bf 100644
> --- a/common/cmd_pxe.c
> +++ b/common/cmd_pxe.c
> @@ -936,6 +936,7 @@ static int parse_menu(char **c, struct pxe_menu *cfg, char *b, int nest_level)
>  	default:
>  		printf("Ignoring malformed menu command: %.*s\n",
>  				(int)(*c - s), s);
> +		err = -1;

err should either be set to 0 here, or initialized to 0 at the top of
the function. Setting it to -1 will cause the parser to give up rather
than just printing out the warning message. It doesn't have to give up,
and not giving up makes the parser more accommodating of pxelinux
commands that aren't supported in U-Boot.

Thanks,
Jason

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg
  2011-12-09 11:14 ` [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg Wolfgang Denk
@ 2011-12-09 14:55   ` Tom Rini
  2011-12-10 22:13   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2011-12-09 14:55 UTC (permalink / raw)
  To: u-boot

On Fri, Dec 9, 2011 at 4:14 AM, Wolfgang Denk <wd@denx.de> wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Dave Peverley <dpeverley@mpc-data.co.uk>

Acked-by: Tom Rini <trini@ti.com>

> ---
> ?MAKEALL ? ?| ? ?1 -
> ?Makefile ? | ? 11 -----------
> ?boards.cfg | ? ?3 +++
> ?3 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/MAKEALL b/MAKEALL
> index c2b52d0..f735af6 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -308,7 +308,6 @@ LIST_SA="$(boards_by_cpu sa1100)"
> ?LIST_ARM9="$(boards_by_cpu arm920t) ? ?\
> ? ? ? ?$(boards_by_cpu arm926ejs) ? ? ?\
> ? ? ? ?$(boards_by_cpu arm925t) ? ? ? ?\
> - ? ? ? omap730p2 ? ? ? ? ? ? ? \
> ?"
>
> ?#########################################################################
> diff --git a/Makefile b/Makefile
> index 8474ce7..c37dc03 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -646,17 +646,6 @@ ucname ? ? = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
> ?# ARM
> ?#========================================================================
>
> -omap730p2_config \
> -omap730p2_cs0boot_config \
> -omap730p2_cs3boot_config : ? ? unconfig
> - ? ? ? @mkdir -p $(obj)include
> - ? ? ? @if [ "$(findstring _cs0boot_, $@)" ] ; then \
> - ? ? ? ? ? ? ? echo "#define CONFIG_CS0_BOOT" >> $(obj)include/config.h ; \
> - ? ? ? else \
> - ? ? ? ? ? ? ? echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
> - ? ? ? fi;
> - ? ? ? @$(MKCONFIG) -n $@ -a omap730p2 arm arm926ejs omap730p2 ti omap
> -
> ?spear300_config \
> ?spear310_config \
> ?spear320_config : ? ? ?unconfig
> diff --git a/boards.cfg b/boards.cfg
> index b9cc705..9f25649 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -171,6 +171,9 @@ omap1610inn_cs0boot ? ? ?arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:
> ?omap1610inn_cs3boot ? ? ? ? arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS3_BOOT
> ?omap1610inn_cs_autoboot ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS_AUTOBOOT
> ?omap5912osk ? ? ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? ti ? ? ? ? ? ? omap
> +omap730p2 ? ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? omap730p2 ? ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap730p2:CS3_BOOT
> +omap730p2_cs0boot ? ? ? ? ? arm ? ? ? ? arm926ejs ? omap730p2 ? ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap730p2:CS0_BOOT
> +omap730p2_cs3boot ? ? ? ? ? arm ? ? ? ? arm926ejs ? omap730p2 ? ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap730p2:CS3_BOOT
> ?edminiv2 ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? LaCie ? ? ? ? ?orion5x
> ?dkb ? ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? Marvell ? ? ? ?pantheon
> ?versatileab ? ? ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? versatile ? ? ? ? ? armltd ? ? ? ? versatile ? versatile:ARCH_VERSATILE_AB
> --
> 1.7.6.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot



-- 
Tom

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg
  2011-12-09 11:14 ` [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg Wolfgang Denk
@ 2011-12-09 14:56   ` Tom Rini
  2011-12-10 22:12   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2011-12-09 14:56 UTC (permalink / raw)
  To: u-boot

On Fri, Dec 9, 2011 at 4:14 AM, Wolfgang Denk <wd@denx.de> wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Kshitij Gupta <kshitij@ti.com>

Acked-by: Tom Rini <trini@ti.com>

> ---
> ?MAKEALL ? ?| ? ?2 --
> ?Makefile ? | ? 20 --------------------
> ?boards.cfg | ? ?8 ++++++++
> ?3 files changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/MAKEALL b/MAKEALL
> index 0f7b820..c2b52d0 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -308,8 +308,6 @@ LIST_SA="$(boards_by_cpu sa1100)"
> ?LIST_ARM9="$(boards_by_cpu arm920t) ? ?\
> ? ? ? ?$(boards_by_cpu arm926ejs) ? ? ?\
> ? ? ? ?$(boards_by_cpu arm925t) ? ? ? ?\
> - ? ? ? omap1610h2 ? ? ? ? ? ? ?\
> - ? ? ? omap1610inn ? ? ? ? ? ? \
> ? ? ? ?omap730p2 ? ? ? ? ? ? ? \
> ?"
>
> diff --git a/Makefile b/Makefile
> index e603b9a..8474ce7 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -646,26 +646,6 @@ ucname ? ? = $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
> ?# ARM
> ?#========================================================================
>
> -xtract_omap1610xxx = $(subst _cs0boot,,$(subst _cs3boot,,$(subst _cs_autoboot,,$(subst _config,,$1))))
> -
> -omap1610inn_config \
> -omap1610inn_cs0boot_config \
> -omap1610inn_cs3boot_config \
> -omap1610inn_cs_autoboot_config \
> -omap1610h2_config \
> -omap1610h2_cs0boot_config \
> -omap1610h2_cs3boot_config \
> -omap1610h2_cs_autoboot_config: unconfig
> - ? ? ? @mkdir -p $(obj)include
> - ? ? ? @if [ "$(findstring _cs0boot_, $@)" ] ; then \
> - ? ? ? ? ? ? ? echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
> - ? ? ? elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
> - ? ? ? ? ? ? ? echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
> - ? ? ? else \
> - ? ? ? ? ? ? ? echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
> - ? ? ? fi;
> - ? ? ? @$(MKCONFIG) -n $@ -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn ti omap
> -
> ?omap730p2_config \
> ?omap730p2_cs0boot_config \
> ?omap730p2_cs3boot_config : ? ? unconfig
> diff --git a/boards.cfg b/boards.cfg
> index c1b0bad..b9cc705 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -162,6 +162,14 @@ magnesium ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? imx27lite ? ? ? ? ? logicpd
> ?m28evk ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? denx ? ? ? ? ? mx28
> ?nhk8815 ? ? ? ? ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? nhk8815 ? ? ? ? ? ? st ? ? ? ? ? ? nomadik
> ?nhk8815_onenand ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? nhk8815 ? ? ? ? ? ? st ? ? ? ? ? ? nomadik ? ? ? nhk8815:BOOT_ONENAND
> +omap1610h2 ? ? ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS3_BOOT
> +omap1610h2_cs0boot ? ? ? ? ?arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS0_BOOT
> +omap1610h2_cs3boot ? ? ? ? ?arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS3_BOOT
> +omap1610h2_cs_autoboot ? ? ?arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS_AUTOBOOT
> +omap1610inn ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS3_BOOT
> +omap1610inn_cs0boot ? ? ? ? arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS0_BOOT
> +omap1610inn_cs3boot ? ? ? ? arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS3_BOOT
> +omap1610inn_cs_autoboot ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? omap1610inn ? ? ? ? ti ? ? ? ? ? ? omap ? ? ? ?omap1610inn:CS_AUTOBOOT
> ?omap5912osk ? ? ? ? ? ? ? ? ?arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? ti ? ? ? ? ? ? omap
> ?edminiv2 ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? LaCie ? ? ? ? ?orion5x
> ?dkb ? ? ? ? ? ? ? ? ? ? ? ? arm ? ? ? ? arm926ejs ? - ? ? ? ? ? ? ? ? ? Marvell ? ? ? ?pantheon
> --
> 1.7.6.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot



-- 
Tom

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 ` [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
@ 2011-12-09 14:57   ` Tom Rini
  2011-12-10 22:11   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2011-12-09 14:57 UTC (permalink / raw)
  To: u-boot

On Fri, Dec 9, 2011 at 4:14 AM, Wolfgang Denk <wd@denx.de> wrote:
> Fix:
> flash.c: In function 'flash_get_offsets':
> flash.c:139:10: warning: variable 'pOrgDef' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'flash_erase':
> flash.c:280:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'write_data':
> flash.c:456:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>

Acked-by: Tom Rini <trini@ti.com>

> ---
> ?board/ti/omap1610inn/flash.c | ? 21 +++++++++++++--------
> ?1 files changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/board/ti/omap1610inn/flash.c b/board/ti/omap1610inn/flash.c
> index 1b67d08..a99a91c 100644
> --- a/board/ti/omap1610inn/flash.c
> +++ b/board/ti/omap1610inn/flash.c
> @@ -136,9 +136,7 @@ void flash_unlock(flash_info_t * info)
> ?static void flash_get_offsets (ulong base, flash_info_t * info)
> ?{
> ? ? ? ?int i;
> - ? ? ? OrgDef *pOrgDef;
>
> - ? ? ? pOrgDef = OrgIntel_28F256L18T;
> ? ? ? ?if (info->flash_id == FLASH_UNKNOWN) {
> ? ? ? ? ? ? ? ?return;
> ? ? ? ?}
> @@ -352,6 +350,9 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
> ? ? ? ? ? ? ? ? ? ? ? ?printf (" done\n");
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
> + ? ? ? if (flag)
> + ? ? ? ? ? ? ? enable_interrupts();
> +
> ? ? ? ?return rcode;
> ?}
>
> @@ -453,13 +454,13 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
> ?{
> ? ? ? ?FPWV *addr = (FPWV *) dest;
> ? ? ? ?ulong status;
> - ? ? ? int flag;
> + ? ? ? int flag, rc = 0;
> ? ? ? ?ulong start;
>
> ? ? ? ?/* Check if Flash is (sufficiently) erased */
> ? ? ? ?if ((*addr & data) != data) {
> - ? ? ? ? ? ? ? printf ("not erased at %08lx (%x)\n", (ulong) addr, *addr);
> - ? ? ? ? ? ? ? return (2);
> + ? ? ? ? ? ? ? printf("not erased at %08lx (%x)\n", (ulong) addr, *addr);
> + ? ? ? ? ? ? ? return 2;
> ? ? ? ?}
> ? ? ? ?/* Disable interrupts which might cause a timeout here */
> ? ? ? ?flag = disable_interrupts ();
> @@ -472,12 +473,16 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
> ? ? ? ?/* wait while polling the status register */
> ? ? ? ?while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
> ? ? ? ? ? ? ? ?if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
> - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
> - ? ? ? ? ? ? ? ? ? ? ? return (1);
> + ? ? ? ? ? ? ? ? ? ? ? rc = 1;
> + ? ? ? ? ? ? ? ? ? ? ? goto done;
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
> +done:
> + ? ? ? if (flag)
> + ? ? ? ? ? ? ? enable_interrupts();
> +
> ? ? ? ?*addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
> - ? ? ? return (0);
> + ? ? ? return rc;
> ?}
>
> ?void inline spin_wheel (void)
> --
> 1.7.6.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot



-- 
Tom

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 ` [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
@ 2011-12-09 14:58   ` Tom Rini
  2011-12-10 22:12   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Tom Rini @ 2011-12-09 14:58 UTC (permalink / raw)
  To: u-boot

On Fri, Dec 9, 2011 at 4:14 AM, Wolfgang Denk <wd@denx.de> wrote:
> Fix:
> flash.c: In function 'flash_get_offsets':
> flash.c:122:10: warning: variable 'pOrgDef' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'flash_erase':
> flash.c:263:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'write_data':
> flash.c:439:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Dave Peverley <dpeverley@mpc-data.co.uk>

Acked-by: Tom Rini <trini@ti.com>

> ---
> ?board/ti/omap730p2/flash.c | ? 19 ++++++++++++-------
> ?1 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/board/ti/omap730p2/flash.c b/board/ti/omap730p2/flash.c
> index 185bc2d..a292627 100644
> --- a/board/ti/omap730p2/flash.c
> +++ b/board/ti/omap730p2/flash.c
> @@ -119,9 +119,7 @@ unsigned long flash_init (void)
> ?static void flash_get_offsets (ulong base, flash_info_t * info)
> ?{
> ? ? ? ?int i;
> - ? ? ? OrgDef *pOrgDef;
>
> - ? ? ? pOrgDef = OrgIntel_28F256L18T;
> ? ? ? ?if (info->flash_id == FLASH_UNKNOWN) {
> ? ? ? ? ? ? ? ?return;
> ? ? ? ?}
> @@ -335,6 +333,10 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
> ? ? ? ? ? ? ? ? ? ? ? ?printf (" done\n");
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
> +
> + ? ? ? if (flag)
> + ? ? ? ? ? ? ? enable_interrupts();
> +
> ? ? ? ?return rcode;
> ?}
>
> @@ -436,7 +438,7 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
> ?{
> ? ? ? ?FPWV *addr = (FPWV *) dest;
> ? ? ? ?ulong status;
> - ? ? ? int flag;
> + ? ? ? int flag, rc = 0;
> ? ? ? ?ulong start;
>
> ? ? ? ?/* Check if Flash is (sufficiently) erased */
> @@ -456,12 +458,15 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
> ? ? ? ?/* wait while polling the status register */
> ? ? ? ?while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
> ? ? ? ? ? ? ? ?if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
> - ? ? ? ? ? ? ? ? ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
> - ? ? ? ? ? ? ? ? ? ? ? return (1);
> + ? ? ? ? ? ? ? ? ? ? ? rc = 1;
> + ? ? ? ? ? ? ? ? ? ? ? goto done;
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
> - ? ? ? *addr = (FPW) 0x00FF00FF; ? ? ? /* restore read mode */
> - ? ? ? return (0);
> +done:
> + ? ? ? *addr = (FPW)0x00FF00FF; ? ? ? ?/* restore read mode */
> + ? ? ? if (flag)
> + ? ? ? ? ? ? ? enable_interrupts();
> + ? ? ? return rc;
> ?}
>
> ?void inline spin_wheel (void)
> --
> 1.7.6.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot



-- 
Tom

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning
  2011-12-09 11:14 ` [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning Wolfgang Denk
@ 2011-12-09 15:11   ` Simon Guinot
  2011-12-10 22:11   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Simon Guinot @ 2011-12-09 15:11 UTC (permalink / raw)
  To: u-boot

On Fri, Dec 09, 2011 at 12:14:28PM +0100, Wolfgang Denk wrote:
> Fix:
> edminiv2.c: In function 'reset_phy':
> edminiv2.c:98:2: warning: implicit declaration of function
> 'mv_phy_88e1116_init' [-Wimplicit-function-declaration]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  board/LaCie/edminiv2/edminiv2.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
> index c1a01bc..1b33875 100644
> --- a/board/LaCie/edminiv2/edminiv2.c
> +++ b/board/LaCie/edminiv2/edminiv2.c
> @@ -27,6 +27,7 @@
>  #include <common.h>
>  #include <miiphy.h>
>  #include <asm/arch/orion5x.h>
> +#include "../common/common.h"
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  

My bad.

Acked-by: Simon Guinot <simon.guinot@sequanux.org>

> -- 
> 1.7.6.4
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20111209/44420319/attachment.pgp>

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning
  2011-12-09 13:48   ` Jason Hobbs
@ 2011-12-09 20:45     ` Wolfgang Denk
  2011-12-13 12:50       ` Jason Hobbs
  0 siblings, 1 reply; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-09 20:45 UTC (permalink / raw)
  To: u-boot

Dear Jason,

In message <20111209134819.GA26840@jhobbs-laptop> you wrote:
> 
> >  	default:
> >  		printf("Ignoring malformed menu command: %.*s\n",
> >  				(int)(*c - s), s);
> > +		err = -1;
> 
> err should either be set to 0 here, or initialized to 0 at the top of
> the function. Setting it to -1 will cause the parser to give up rather
> than just printing out the warning message. It doesn't have to give up,
> and not giving up makes the parser more accommodating of pxelinux
> commands that aren't supported in U-Boot.

You have way more experience with PXE than me, but if we runinto this
case, doesn't that mean that the whole menu setup is severely broken,
and continuing is more or less invoking random behaviour?

If you really want to see a 0 here, then please feel free to submit an
updated / fixed patch.

Thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I really hate this damned machine     It never does quite what I want
I wish that they would sell it.              But only what I tell it.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 02/13] drivers/net/at91_emac.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 ` [U-Boot] [PATCH 02/13] drivers/net/at91_emac.c: " Wolfgang Denk
@ 2011-12-10 22:08   ` Wolfgang Denk
  0 siblings, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:08 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-3-git-send-email-wd@denx.de> you wrote:
> Fix:
> at91_emac.c: In function 'at91emac_phy_init':
> at91_emac.c:244:20: warning: variable 'duplex' set but not used
> [-Wunused-but-set-variable]
> at91_emac.c:244:13: warning: variable 'speed' set but not used
> [-Wunused-but-set-variable]
> 
> Use new debug_cond() to fix these warnings.  In the result, anumber of
> inconsistent printf() formats are detected:
> 
> at91_emac.c: In function 'at91emac_read':
> at91_emac.c:147:2: warning: format '%x' expects argument of type
> 'unsigned int', but argument 2 has type 'struct at91_emac_t *'
> [-Wformat]
> at91_emac.c: In function 'at91emac_write':
> at91_emac.c:157:2: warning: format '%x' expects argument of type
> 'unsigned int', but argument 2 has type 'struct at91_emac_t *'
> [-Wformat]
> at91_emac.c:157:2: warning: format '%x' expects argument of type
> 'unsigned int', but argument 4 has type 'short unsigned int *'
> [-Wformat]
> at91_emac.c: In function 'at91emac_recv':
> at91_emac.c:451:3: warning: format '%d' expects argument of type
> 'int', but argument 2 has type 'long unsigned int' [-Wformat]
> at91_emac.c:451:3: warning: format '%x' expects argument of type
> 'unsigned int', but argument 4 has type 'long unsigned int' [-Wformat]
> 
> Fix these, too.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Jens Scharsig <js_at_ng@scharsoft.de>
> Cc: Andreas Bie?mann <andreas.devel@gmail.com>
> Cc: Reinhard Meyer <u-boot@emk-elektronik.de>
> ---
>  drivers/net/at91_emac.c |   42 +++++++++++++++++++++++-------------------
>  1 files changed, 23 insertions(+), 19 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Boykottiert Microsoft - Kauft Eure Fenster bei OBI!

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug)
  2011-12-09 11:14 ` [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug) Wolfgang Denk
  2011-12-09 11:36   ` William Juul
@ 2011-12-10 22:08   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:08 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-4-git-send-email-wd@denx.de> you wrote:
> Fix:
> yaffs_guts.c: In function 'yaffs_GarbageCollectBlock':
> yaffs_guts.c:2761:6: warning: variable 'retVal' set but not used
> [-Wunused-but-set-variable]
> 
> Here GCC actually detected a bug.  The code was always returning OK
> instead of the previously set retrun code.  Fix that.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: William Juul <william.juul@tandberg.com>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
>  fs/yaffs2/yaffs_guts.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I distrust all systematisers, and avoid them. The will  to  a  system
shows a lack of honesty.
- Friedrich Wilhelm Nietzsche _G?tzen-D?mmerung [The Twilight of  the
Idols]_ ``Maxims and Missiles'' no. 26

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 05/13] boards.cfg: sort list
  2011-12-09 11:14 ` [U-Boot] [PATCH 05/13] boards.cfg: sort list Wolfgang Denk
@ 2011-12-10 22:09   ` Wolfgang Denk
  2011-12-10 22:39   ` Mike Frysinger
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:09 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-6-git-send-email-wd@denx.de> you wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  boards.cfg |  218 ++++++++++++++++++++++++++++++------------------------------
>  1 files changed, 109 insertions(+), 109 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
We have phasers, I vote we blast 'em!
	-- Bailey, "The Corbomite Maneuver", stardate 1514.2

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 06/13] board/apollon/apollon.c: Fix GCc 4.6 build warnings.
  2011-12-09 11:14 ` [U-Boot] [PATCH 06/13] board/apollon/apollon.c: Fix GCc 4.6 build warnings Wolfgang Denk
@ 2011-12-10 22:09   ` Wolfgang Denk
  0 siblings, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:09 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-7-git-send-email-wd@denx.de> you wrote:
> Fix:
> apollon.c: In function 'dram_init':
> apollon.c:188:29: warning: variable 'cpu' set but not used
> [-Wunused-but-set-variable]
> apollon.c:188:20: warning: variable 'rev' set but not used
> [-Wunused-but-set-variable]
> apollon.c:187:26: warning: variable 'size1' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  board/apollon/apollon.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Always try to do things in chronological order; it's  less  confusing
that way.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 07/13] board/apollon/sys_info.c: Fix GCC 4.6 build warning
  2011-12-09 11:14 ` [U-Boot] [PATCH 07/13] board/apollon/sys_info.c: Fix GCC 4.6 build warning Wolfgang Denk
@ 2011-12-10 22:10   ` Wolfgang Denk
  0 siblings, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:10 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-8-git-send-email-wd@denx.de> you wrote:
> Fix:
> sys_info.c: In function 'display_board_info':
> sys_info.c:260:16: warning: variable 'db_s' set but not used
> [-Wunused-but-set-variable]
> 
> Also fix resulting warnings:
> sys_info.c:251:7: warning: unused variable 'db_ip' [-Wunused-variable]
> sys_info.c:250:7: warning: unused variable 'db_men' [-Wunused-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  board/apollon/sys_info.c |    9 +--------
>  1 files changed, 1 insertions(+), 8 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
As far as the laws of mathematics refer  to  reality,  they  are  not
certain;  and  as  far  as  they  are  certain,  they do not refer to
reality.                                           -- Albert Einstein

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 08/13] ARM: convert "apollon" board to use boards.cfg
  2011-12-09 11:14 ` [U-Boot] [PATCH 08/13] ARM: convert "apollon" board to use boards.cfg Wolfgang Denk
@ 2011-12-10 22:10   ` Wolfgang Denk
  0 siblings, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:10 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-9-git-send-email-wd@denx.de> you wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
>  MAKEALL                   |    1 -
>  Makefile                  |   10 ----------
>  boards.cfg                |    1 +
>  include/configs/apollon.h |    2 ++
>  4 files changed, 3 insertions(+), 11 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Why is an average signature file longer than an average Perl script??

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning
  2011-12-09 11:14 ` [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning Wolfgang Denk
  2011-12-09 15:11   ` Simon Guinot
@ 2011-12-10 22:11   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:11 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-10-git-send-email-wd@denx.de> you wrote:
> Fix:
> edminiv2.c: In function 'reset_phy':
> edminiv2.c:98:2: warning: implicit declaration of function
> 'mv_phy_88e1116_init' [-Wimplicit-function-declaration]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
> ---
>  board/LaCie/edminiv2/edminiv2.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
People seldom know what they want until you give them what  they  ask
for.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 ` [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
  2011-12-09 14:57   ` Tom Rini
@ 2011-12-10 22:11   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:11 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-11-git-send-email-wd@denx.de> you wrote:
> Fix:
> flash.c: In function 'flash_get_offsets':
> flash.c:139:10: warning: variable 'pOrgDef' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'flash_erase':
> flash.c:280:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'write_data':
> flash.c:456:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  board/ti/omap1610inn/flash.c |   21 +++++++++++++--------
>  1 files changed, 13 insertions(+), 8 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
HR Manager to job candidate "I see you've had no  computer  training.
Although  that  qualifies  you  for upper management, it means you're
under-qualified for our entry level positions."

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg
  2011-12-09 11:14 ` [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg Wolfgang Denk
  2011-12-09 14:56   ` Tom Rini
@ 2011-12-10 22:12   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:12 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-12-git-send-email-wd@denx.de> you wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Kshitij Gupta <kshitij@ti.com>
> ---
>  MAKEALL    |    2 --
>  Makefile   |   20 --------------------
>  boards.cfg |    8 ++++++++
>  3 files changed, 8 insertions(+), 22 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A little suffering is good for the soul.
	-- Kirk, "The Corbomite Maneuver", stardate 1514.0

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings
  2011-12-09 11:14 ` [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
  2011-12-09 14:58   ` Tom Rini
@ 2011-12-10 22:12   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:12 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-13-git-send-email-wd@denx.de> you wrote:
> Fix:
> flash.c: In function 'flash_get_offsets':
> flash.c:122:10: warning: variable 'pOrgDef' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'flash_erase':
> flash.c:263:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
> flash.c: In function 'write_data':
> flash.c:439:6: warning: variable 'flag' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Dave Peverley <dpeverley@mpc-data.co.uk>
> ---
>  board/ti/omap730p2/flash.c |   19 ++++++++++++-------
>  1 files changed, 12 insertions(+), 7 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The human mind ordinarily operates at only ten percent of its capaci-
ty - the rest is overhead for the operating system.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg
  2011-12-09 11:14 ` [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg Wolfgang Denk
  2011-12-09 14:55   ` Tom Rini
@ 2011-12-10 22:13   ` Wolfgang Denk
  1 sibling, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:13 UTC (permalink / raw)
  To: u-boot

Dear Wolfgang Denk,

In message <1323429272-26801-14-git-send-email-wd@denx.de> you wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Dave Peverley <dpeverley@mpc-data.co.uk>
> ---
>  MAKEALL    |    1 -
>  Makefile   |   11 -----------
>  boards.cfg |    3 +++
>  3 files changed, 3 insertions(+), 12 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
We fight only when there is no other choice. We prefer  the  ways  of
peaceful contact.
	-- Kirk, "Spectre of the Gun", stardate 4385.3

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 05/13] boards.cfg: sort list
  2011-12-09 11:14 ` [U-Boot] [PATCH 05/13] boards.cfg: sort list Wolfgang Denk
  2011-12-10 22:09   ` Wolfgang Denk
@ 2011-12-10 22:39   ` Mike Frysinger
  2011-12-10 22:49     ` Wolfgang Denk
  1 sibling, 1 reply; 36+ messages in thread
From: Mike Frysinger @ 2011-12-10 22:39 UTC (permalink / raw)
  To: u-boot

maybe we should have mkconfig automatically do this ?
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20111210/4f17cba6/attachment.pgp>

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 05/13] boards.cfg: sort list
  2011-12-10 22:39   ` Mike Frysinger
@ 2011-12-10 22:49     ` Wolfgang Denk
  0 siblings, 0 replies; 36+ messages in thread
From: Wolfgang Denk @ 2011-12-10 22:49 UTC (permalink / raw)
  To: u-boot

Dear Mike Frysinger,

In message <201112101739.26972.vapier@gentoo.org> you wrote:
>
> maybe we should have mkconfig automatically do this ?

No. Automatic scripts should never meddle with source files.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Anarchy may not be the best form of government, but it's better  than
no government at all.

^ permalink raw reply	[flat|nested] 36+ messages in thread

* [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning
  2011-12-09 20:45     ` Wolfgang Denk
@ 2011-12-13 12:50       ` Jason Hobbs
  0 siblings, 0 replies; 36+ messages in thread
From: Jason Hobbs @ 2011-12-13 12:50 UTC (permalink / raw)
  To: u-boot

On Fri, Dec 09, 2011 at 03:45:44PM -0500, Wolfgang Denk wrote:
> Dear Jason,
> 
> In message <20111209134819.GA26840@jhobbs-laptop> you wrote:
> > 
> > >  	default:
> > >  		printf("Ignoring malformed menu command: %.*s\n",
> > >  				(int)(*c - s), s);
> > > +		err = -1;
> > 
> > err should either be set to 0 here, or initialized to 0 at the top of
> > the function. Setting it to -1 will cause the parser to give up rather
> > than just printing out the warning message. It doesn't have to give up,
> > and not giving up makes the parser more accommodating of pxelinux
> > commands that aren't supported in U-Boot.
> 
> You have way more experience with PXE than me, but if we runinto this
> case, doesn't that mean that the whole menu setup is severely broken,
> and continuing is more or less invoking random behaviour?

It only means that an unrecognized menu command was used. It could be
something aesthetic in nature, like a menu title command.

> 
> If you really want to see a 0 here, then please feel free to submit an
> updated / fixed patch.

Heiko Schocher ended up sending a patch to do this today, which I've
acked.

Thanks,

Jason

^ permalink raw reply	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2011-12-13 12:50 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-09 11:14 [U-Boot] [PATCH 00/13] ARM: more cleanups Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 01/13] drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 02/13] drivers/net/at91_emac.c: " Wolfgang Denk
2011-12-10 22:08   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 03/13] fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug) Wolfgang Denk
2011-12-09 11:36   ` William Juul
2011-12-10 22:08   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 04/13] common/cmd_pxe.c: Fix compile warning Wolfgang Denk
2011-12-09 13:48   ` Jason Hobbs
2011-12-09 20:45     ` Wolfgang Denk
2011-12-13 12:50       ` Jason Hobbs
2011-12-09 11:14 ` [U-Boot] [PATCH 05/13] boards.cfg: sort list Wolfgang Denk
2011-12-10 22:09   ` Wolfgang Denk
2011-12-10 22:39   ` Mike Frysinger
2011-12-10 22:49     ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 06/13] board/apollon/apollon.c: Fix GCc 4.6 build warnings Wolfgang Denk
2011-12-10 22:09   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 07/13] board/apollon/sys_info.c: Fix GCC 4.6 build warning Wolfgang Denk
2011-12-10 22:10   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 08/13] ARM: convert "apollon" board to use boards.cfg Wolfgang Denk
2011-12-10 22:10   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 09/13] board/LaCie/edminiv2/edminiv2.c: Fix build warning Wolfgang Denk
2011-12-09 15:11   ` Simon Guinot
2011-12-10 22:11   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 10/13] board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
2011-12-09 14:57   ` Tom Rini
2011-12-10 22:11   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 11/13] ARM: convert "omap16xx" boards to boards.cfg Wolfgang Denk
2011-12-09 14:56   ` Tom Rini
2011-12-10 22:12   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 12/13] board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings Wolfgang Denk
2011-12-09 14:58   ` Tom Rini
2011-12-10 22:12   ` Wolfgang Denk
2011-12-09 11:14 ` [U-Boot] [PATCH 13/13] ARM: convert "omap730p2" boards to boards.cfg Wolfgang Denk
2011-12-09 14:55   ` Tom Rini
2011-12-10 22:13   ` Wolfgang Denk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.