Skip to contentSkip to conversation

MPC8xx: Fix libfdt support introduced in commit 77ff7b74

PATCH In review Jean-Christophe PLAGNIOL-VILLARD 6 participants 23 messages Apr 2, 2008 – Apr 18, 2008 Real time clock (RTC)

lore
Share & tools
lore

Jean-Christophe PLAGNIOL-VILLARD

author
#0 lore raw

cover MPC8xx: Fix libfdt support introduced in commit 77ff7b74

fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
cpu/mpc8xx/Makefile +23 -10
index dbdc2e0..5f70459 100644
@@ -27,16 +27,29 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(CPU).a
 
-START	= start.o kgdb.o
-COBJS	= bedbug_860.o commproc.o cpu.o cpu_init.o	\
-	  fec.o fdt.o i2c.o interrupts.o lcd.o scc.o	\
-	  serial.o speed.o spi.o \
-	  traps.o upatch.o video.o
-SOBJS	= plprcr_write.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
+START-y	+= start.o
+START-y	+= kgdb.o
+COBJS-y	+= bedbug_860.o
+COBJS-y	+= commproc.o
+COBJS-y	+= cpu.o
+COBJS-y	+= cpu_init.o
+COBJS-y	+= fec.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS-y	+= i2c.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= lcd.o
+COBJS-y	+= scc.o
+COBJS-y	+= serial.o
+COBJS-y	+= speed.o
+COBJS-y	+= spi.o
+COBJS-y	+= traps.o
+COBJS-y	+= upatch.o
+COBJS-y	+= video.o
+SOBJS-y	+= plprcr_write.o
+
+SRCS	:= $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+START	:= $(addprefix $(obj),$(START-y))
 
 all:	$(obj).depend $(START) $(LIB)
Signature · 1 line
1.5.4.5
author
#1 lore raw

PATCH 1/2 cmd_log.c: Fix assignment differ in signedness

In function 'logbuff_init_ptrs':
cmd_log.c:79: warning: pointer targets in assignment differ in signedness

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
common/cmd_log.c +1 -1
index 34b36ff..b9f9ba0 100644
@@ -76,7 +76,7 @@ void logbuff_init_ptrs (void)
 	lbuf = (char *)CONFIG_ALT_LB_ADDR;
 #else
 	log = (logbuff_t *)(gd->bd->bi_memsize-LOGBUFF_LEN) - 1;
-	lbuf = log->buf;
+	lbuf = (char *)log->buf;
 #endif
 
 	/* Set up log version */
Signature · 1 line
1.5.4.5
author
#2 lore raw

PATCH 2/2 ds174x: Fix warning on return in rtc_get and rtc_set function

ds174x.c: In function 'rtc_get':
ds174x.c:117: warning: no return statement in function returning non-void ds174x.c: In function 'rtc_set':
ds174x.c:146: warning: 'return' with a value, in function returning void

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
drivers/rtc/ds174x.c +1 -2
index 81a9cb3..eb3ca88 100644
@@ -114,6 +114,7 @@ int rtc_get( struct rtc_time *tmp )
 		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 		tmp->tm_hour, tmp->tm_min, tmp->tm_sec );
 #endif
+	return 0;
 }
 
 void rtc_set( struct rtc_time *tmp )

@@ -142,8 +143,6 @@ void rtc_set( struct rtc_time *tmp )
 
 	/* unlock clock registers after read */
 	rtc_write( RTC_CONTROLA, ( reg_a  & ~RTC_CA_WRITE ));
-
-	return 0;
 }
 
 void rtc_reset (void)
Signature · 1 line
1.5.4.5
author
#3 lore raw

PATCH 1/1 cmd_nand: Fix warning: dereferencing type-punned pointer will break strict-aliasing rules

cmd_nand.c:353: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_nand.c:356: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
common/cmd_nand.c +8 -6
index 7b1f830..2906aed 100644
@@ -84,7 +84,7 @@ static int nand_dump(nand_info_t *nand, ulong off)
 
 /* ------------------------------------------------------------------------- */
 
-static inline int str2long(char *p, ulong *num)
+static inline int str2long(char *p, loff_t *num)
 {
 	char *endptr;
 

@@ -93,7 +93,7 @@ static inline int str2long(char *p, ulong *num)
 }
 
 static int
-arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
+arg_off_size(int argc, char *argv[], nand_info_t *nand, loff_t *off, size_t *size)
 {
 	int idx = nand_curr_device;
 #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)

@@ -136,7 +136,7 @@ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
 	}
 
 	if (argc >= 2) {
-		if (!(str2long(argv[1], size))) {
+		if (!(str2long(argv[1], (loff_t*)size))) {
 			printf("'%s' is not a number\n", argv[1]);
 			return -1;
 		}

@@ -158,7 +158,9 @@ out:
 int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	int i, dev, ret;
-	ulong addr, off, size;
+	ulong addr;
+	loff_t off;
+	size_t size;
 	char *cmd, *s;
 	nand_info_t *nand;
 #ifdef CFG_NAND_QUIET

@@ -477,11 +479,11 @@ U_BOOT_CMD(nand, 5, 1, do_nand,
 	"nand unlock [offset] [size] - unlock section\n");
 
 static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
-			   ulong offset, ulong addr, char *cmd)
+			   loff_t offset, ulong addr, char *cmd)
 {
 	int r;
 	char *ep, *s;
-	ulong cnt;
+	size_t cnt;
 	image_header_t *hdr;
 	int jffs2 = 0;
 #if defined(CONFIG_FIT)
include/nand.h +12 -12
index 3c0752e..b4ee14f 100644
@@ -34,22 +34,22 @@ extern int nand_curr_device;
 extern nand_info_t nand_info[];
 extern void nand_init(void);
 
-static inline int nand_read(nand_info_t *info, ulong ofs, ulong *len, u_char *buf)
+static inline int nand_read(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf)
 {
-	return info->read(info, ofs, *len, (size_t *)len, buf);
+	return info->read(info, ofs, *len, len, buf);
 }
 
-static inline int nand_write(nand_info_t *info, ulong ofs, ulong *len, u_char *buf)
+static inline int nand_write(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf)
 {
-	return info->write(info, ofs, *len, (size_t *)len, buf);
+	return info->write(info, ofs, *len, len, buf);
 }
 
-static inline int nand_block_isbad(nand_info_t *info, ulong ofs)
+static inline int nand_block_isbad(nand_info_t *info, loff_t ofs)
 {
 	return info->block_isbad(info, ofs);
 }
 
-static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
+static inline int nand_erase(nand_info_t *info, loff_t off, ulong size)
 {
 	struct erase_info instr;
 

@@ -68,8 +68,8 @@ static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
 
 struct nand_write_options {
 	u_char *buffer;		/* memory block containing image to write */
-	ulong length;		/* number of bytes to write */
-	ulong offset;		/* start address in NAND */
+	size_t length;		/* number of bytes to write */
+	loff_t offset;		/* start address in NAND */
 	int quiet;		/* don't display progress messages */
 	int autoplace;		/* if true use auto oob layout */
 	int forcejffs2;		/* force jffs2 oob layout */

@@ -85,8 +85,8 @@ typedef struct nand_write_options nand_write_options_t;
 
 struct nand_read_options {
 	u_char *buffer;		/* memory block in which read image is written*/
-	ulong length;		/* number of bytes to read */
-	ulong offset;		/* start address in NAND */
+	size_t length;		/* number of bytes to read */
+	loff_t offset;		/* start address in NAND */
 	int quiet;		/* don't display progress messages */
 	int readoob;		/* put oob data in image */
 };

@@ -94,8 +94,8 @@ struct nand_read_options {
 typedef struct nand_read_options nand_read_options_t;
 
 struct nand_erase_options {
-	ulong length;		/* number of bytes to erase */
-	ulong offset;		/* first address in NAND to erase */
+	size_t length;		/* number of bytes to erase */
+	loff_t offset;		/* first address in NAND to erase */
 	int quiet;		/* don't display progress messages */
 	int jffs2;		/* if true: format for jffs2 usage
 				 * (write appropriate cleanmarker blocks) */
Signature · 1 line
1.5.4.5
author
#4 lore raw

PATCH 1/1 mpc837xerdb: Fix warning: implicit declaration of function 'fdt_fixup_dr_usb'

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
board/freescale/mpc837xerdb/mpc837xerdb.c +1 -1
index 83fb60d..965bb67 100644
@@ -16,10 +16,10 @@
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
+#include <fdt_support.h>
 #include <spd_sdram.h>
 #include <vsc7385.h>
 
-
 #if defined(CFG_DRAM_TEST)
 int
 testdram(void)
Signature · 1 line
1.5.4.5
#6 lore raw

[U-Boot-Users] unassigned-patches/13: [PATCH] mpc837xerdb: Fix warning: implicit declaration of function 'fdt_fixup_dr_usb'

In reply to Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
Added to GNATS database as unassigned-patches/13

Quoted 5 lines
Responsible:    patch-coord
Message-Id:     <[email protected]>
In-Reply-To:    <[email protected]>
References:     <[email protected]>
Patch-Date:     Wed Apr 02 13:41:21 +0200 2008
board/freescale/mpc837xerdb/mpc837xerdb.c +1 -1
index 83fb60d..965bb67 100644
@@ -16,10 +16,10 @@
 #include <i2c.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
+#include <fdt_support.h>
 #include <spd_sdram.h>
 #include <vsc7385.h>
 
-
 #if defined(CFG_DRAM_TEST)
 int
 testdram(void)
Signature · 12 lines
1.5.4.5


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
NAK
#7 lore raw

PATCH 1/1 cmd_nand: Fix warning: dereferencing type-punned pointer will break strict-aliasing rules

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD

cmd_nand.c:353: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_nand.c:356: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

NAK.

Patch doesn't work. After applying I get the following messages on Kilauea:

=> nand write 100000 0 100000

NAND write: device 0 offset 0x0, size 0x0
0 bytes written: OK
=> nand read 200000 0 100000

NAND read: device 0 offset 0x0, size 0x0
0 bytes read: OK

So nothing is read/written at all. This is how it behaves without this patch:

=> nand write 100000 0 100000

NAND write: device 0 offset 0x0, size 0x100000
1048576 bytes written: OK
=> nand read 200000 0 100000

NAND read: device 0 offset 0x0, size 0x100000
1048576 bytes read: OK

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

NAK
#8 lore raw

PATCH 1/1 cmd_nand: Fix warning: dereferencing type-punned pointer will break strict-aliasing rules

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 10 lines · In message <[email protected]> you wrote:

cmd_nand.c:353: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_nand.c:356: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
common/cmd_nand.c +0 -0
index 7b1f830..2906aed 100644

common/cmd_nand.c static int nand_dump(nand_info_t *nand, ulong off) · line 87

Quoted 5 lines
common/cmd_nand.c +1 -1
@@ -84,7 +84,7 @@ static int nand_dump(nand_info_t *nand, ulong off)
 
 /* ------------------------------------------------------------------------- */
 
-static inline int str2long(char *p, ulong *num)
+static inline int str2long(char *p, loff_t *num)

I think this is plain wrong. It may silence the warning, but it is wrong.

The type is the result of calling simple_strtoul(), and this function returns, um, and unsigned long. And not an offset type.

common/cmd_nand.c static inline int str2long(char *p, ulong *num) · line 96

Quoted 2 lines
common/cmd_nand.c +1 -1
-arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
+arg_off_size(int argc, char *argv[], nand_info_t *nand, loff_t *off, size_t *size)

No. That's all wrong.

NAK.

Best regards,

Wolfgang Denk

Signature · 5 lines
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 IQ of the group is the lowest IQ of a member of the group divided
by the number of people in the group.
author
#9 lore raw

PATCH 1/1 cmd_nand: Fix warning: dereferencing type-punned pointer will break strict-aliasing rules

Quoted 14 lines · Wolfgang Denk
Quoted 13 lines · In message <[email protected]> you wrote:

cmd_nand.c:353: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_nand.c:356: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
common/cmd_nand.c +0 -0
index 7b1f830..2906aed 100644
@@ -84,7 +84,7 @@ static int nand_dump(nand_info_t *nand, ulong off)
 
 /* ------------------------------------------------------------------------- */
Quoted 8 lines

common/cmd_nand.c static int nand_dump(nand_info_t *nand, ulong off) · line 87

Quoted 2 lines
common/cmd_nand.c +1 -1
-static inline int str2long(char *p, ulong *num)
+static inline int str2long(char *p, loff_t *num)

I think this is plain wrong. It may silence the warning, but it is wrong.

The type is the result of calling simple_strtoul(), and this function returns, um, and unsigned long. And not an offset type.

I agree

Quoted 5 lines

common/cmd_nand.c static inline int str2long(char *p, ulong *num) · line 96

Quoted 3 lines
common/cmd_nand.c +1 -1
-arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
+arg_off_size(int argc, char *argv[], nand_info_t *nand, loff_t *off, size_t *size)

No. That's all wrong.

I disagree, the true type of the offest is loff_t and size is size_t in the linux/mtd.

Maybe we need to do the cast to ulong in this function.

Best Regards,
J.

#10 lore raw

[U-Boot-Users] unassigned-patches/11: [PATCH] cmd_nand: Fix warning: dereferencing type-punned pointer will break strict-aliasing rules

In reply to Jean-Christophe PLAGNIOL-VILLARD

cmd_nand.c:353: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_nand.c:356: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
Added to GNATS database as unassigned-patches/11

Quoted 5 lines
Responsible:    patch-coord
Message-Id:     <[email protected]>
In-Reply-To:    <[email protected]>
References:     <[email protected]>
Patch-Date:     Wed Apr 02 13:37:50 +0200 2008
common/cmd_nand.c +8 -6
index 7b1f830..2906aed 100644
@@ -84,7 +84,7 @@ static int nand_dump(nand_info_t *nand, ulong off)
 
 /* ------------------------------------------------------------------------- */
 
-static inline int str2long(char *p, ulong *num)
+static inline int str2long(char *p, loff_t *num)
 {
 	char *endptr;
 

@@ -93,7 +93,7 @@ static inline int str2long(char *p, ulong *num)
 }
 
 static int
-arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
+arg_off_size(int argc, char *argv[], nand_info_t *nand, loff_t *off, size_t *size)
 {
 	int idx = nand_curr_device;
 #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)

@@ -136,7 +136,7 @@ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
 	}
 
 	if (argc >= 2) {
-		if (!(str2long(argv[1], size))) {
+		if (!(str2long(argv[1], (loff_t*)size))) {
 			printf("'%s' is not a number\n", argv[1]);
 			return -1;
 		}

@@ -158,7 +158,9 @@ out:
 int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	int i, dev, ret;
-	ulong addr, off, size;
+	ulong addr;
+	loff_t off;
+	size_t size;
 	char *cmd, *s;
 	nand_info_t *nand;
 #ifdef CFG_NAND_QUIET

@@ -477,11 +479,11 @@ U_BOOT_CMD(nand, 5, 1, do_nand,
 	"nand unlock [offset] [size] - unlock section\n");
 
 static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
-			   ulong offset, ulong addr, char *cmd)
+			   loff_t offset, ulong addr, char *cmd)
 {
 	int r;
 	char *ep, *s;
-	ulong cnt;
+	size_t cnt;
 	image_header_t *hdr;
 	int jffs2 = 0;
 #if defined(CONFIG_FIT)
include/nand.h +12 -12
index 3c0752e..b4ee14f 100644
@@ -34,22 +34,22 @@ extern int nand_curr_device;
 extern nand_info_t nand_info[];
 extern void nand_init(void);
 
-static inline int nand_read(nand_info_t *info, ulong ofs, ulong *len, u_char *buf)
+static inline int nand_read(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf)
 {
-	return info->read(info, ofs, *len, (size_t *)len, buf);
+	return info->read(info, ofs, *len, len, buf);
 }
 
-static inline int nand_write(nand_info_t *info, ulong ofs, ulong *len, u_char *buf)
+static inline int nand_write(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf)
 {
-	return info->write(info, ofs, *len, (size_t *)len, buf);
+	return info->write(info, ofs, *len, len, buf);
 }
 
-static inline int nand_block_isbad(nand_info_t *info, ulong ofs)
+static inline int nand_block_isbad(nand_info_t *info, loff_t ofs)
 {
 	return info->block_isbad(info, ofs);
 }
 
-static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
+static inline int nand_erase(nand_info_t *info, loff_t off, ulong size)
 {
 	struct erase_info instr;
 

@@ -68,8 +68,8 @@ static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
 
 struct nand_write_options {
 	u_char *buffer;		/* memory block containing image to write */
-	ulong length;		/* number of bytes to write */
-	ulong offset;		/* start address in NAND */
+	size_t length;		/* number of bytes to write */
+	loff_t offset;		/* start address in NAND */
 	int quiet;		/* don't display progress messages */
 	int autoplace;		/* if true use auto oob layout */
 	int forcejffs2;		/* force jffs2 oob layout */

@@ -85,8 +85,8 @@ typedef struct nand_write_options nand_write_options_t;
 
 struct nand_read_options {
 	u_char *buffer;		/* memory block in which read image is written*/
-	ulong length;		/* number of bytes to read */
-	ulong offset;		/* start address in NAND */
+	size_t length;		/* number of bytes to read */
+	loff_t offset;		/* start address in NAND */
 	int quiet;		/* don't display progress messages */
 	int readoob;		/* put oob data in image */
 };

@@ -94,8 +94,8 @@ struct nand_read_options {
 typedef struct nand_read_options nand_read_options_t;
 
 struct nand_erase_options {
-	ulong length;		/* number of bytes to erase */
-	ulong offset;		/* first address in NAND to erase */
+	size_t length;		/* number of bytes to erase */
+	loff_t offset;		/* first address in NAND to erase */
 	int quiet;		/* don't display progress messages */
 	int jffs2;		/* if true: format for jffs2 usage
 				 * (write appropriate cleanmarker blocks) */
Signature · 12 lines
1.5.4.5


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
#11 lore raw

PATCH 1/1 cmd_nand: Fix warning: dereferencing type-punned pointer will break strict-aliasing rules

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 10 lines · In message <[email protected]> you wrote:

cmd_nand.c:353: warning: dereferencing type-punned pointer will break strict-aliasing rules cmd_nand.c:356: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
common/cmd_nand.c +0 -0
index 7b1f830..2906aed 100644

common/cmd_nand.c static int nand_dump(nand_info_t *nand, ulong off) · line 87

Quoted 5 lines
common/cmd_nand.c +1 -1
@@ -84,7 +84,7 @@ static int nand_dump(nand_info_t *nand, ulong off)
 
 /* ------------------------------------------------------------------------- */
 
-static inline int str2long(char *p, ulong *num)
+static inline int str2long(char *p, loff_t *num)

We discussed this before.

string-to-long converts into a "long" type, not into an offset type.

Best regards,

Wolfgang Denk

Signature · 4 lines
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
Above all else -- sky.
#12 lore raw

[U-Boot-Users] unassigned-patches/12: [PATCH 2/2] ds174x: Fix warning on return in rtc_get and rtc_set function

In reply to Jean-Christophe PLAGNIOL-VILLARD

ds174x.c: In function 'rtc_get':
ds174x.c:117: warning: no return statement in function returning non-void ds174x.c: In function 'rtc_set':
ds174x.c:146: warning: 'return' with a value, in function returning void

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
Added to GNATS database as unassigned-patches/12

Quoted 5 lines
Responsible:    patch-coord
Message-Id:     <[email protected]>
In-Reply-To:    <[email protected]>
References:     <[email protected]>	<[email protected]>
Patch-Date:     Wed Apr 02 08:03:58 +0200 2008
drivers/rtc/ds174x.c +1 -2
index 81a9cb3..eb3ca88 100644
@@ -114,6 +114,7 @@ int rtc_get( struct rtc_time *tmp )
 		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 		tmp->tm_hour, tmp->tm_min, tmp->tm_sec );
 #endif
+	return 0;
 }
 
 void rtc_set( struct rtc_time *tmp )

@@ -142,8 +143,6 @@ void rtc_set( struct rtc_time *tmp )
 
 	/* unlock clock registers after read */
 	rtc_write( RTC_CONTROLA, ( reg_a  & ~RTC_CA_WRITE ));
-
-	return 0;
 }
 
 void rtc_reset (void)
Signature · 12 lines
1.5.4.5


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
#13 lore raw

PATCH 2/2 ds174x: Fix warning on return in rtc_get and rtc_set function

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 20 lines · In message <[email protected]> you wrote:

ds174x.c: In function 'rtc_get':
ds174x.c:117: warning: no return statement in function returning non-void ds174x.c: In function 'rtc_set':
ds174x.c:146: warning: 'return' with a value, in function returning void

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
drivers/rtc/ds174x.c +1 -0
index 81a9cb3..eb3ca88 100644
@@ -114,6 +114,7 @@ int rtc_get( struct rtc_time *tmp )
 		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 		tmp->tm_hour, tmp->tm_min, tmp->tm_sec );
 #endif
+	return 0;
 }
 
 void rtc_set( struct rtc_time *tmp )

drivers/rtc/ds174x.c void rtc_set( struct rtc_time *tmp ) · line 148

Quoted 8 lines
drivers/rtc/ds174x.c +0 -2
@@ -142,8 +143,6 @@ void rtc_set( struct rtc_time *tmp )
 
 	/* unlock clock registers after read */
 	rtc_write( RTC_CONTROLA, ( reg_a  & ~RTC_CA_WRITE ));
-
-	return 0;
 }
 
 void rtc_reset (void)

I think this is actually not the right fix.

To make things right, both rtc_set() and rtc_get() should return "int".

Yes, I'm aware that this is far beyond the scope of your fixes here, but I wanted to at least note that.

Note that this is no NAK.

Best regards,

Wolfgang Denk

Signature · 7 lines
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 word "fit", as I understand it, means "appropriate to a purpose",
and I would say the body of the Dean is supremely appropriate to  the
purpose of sitting around all day and eating big heavy meals.
                                 - Terry Pratchett, _Moving Pictures_
author
#14 lore raw

PATCH 2/2 ds174x: Fix warning on return in rtc_get and rtc_set function

Quoted 32 lines · Wolfgang Denk
Quoted 20 lines · In message <[email protected]> you wrote:

ds174x.c: In function 'rtc_get':
ds174x.c:117: warning: no return statement in function returning non-void ds174x.c: In function 'rtc_set':
ds174x.c:146: warning: 'return' with a value, in function returning void

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
drivers/rtc/ds174x.c +1 -0
index 81a9cb3..eb3ca88 100644
@@ -114,6 +114,7 @@ int rtc_get( struct rtc_time *tmp )
 		tmp->tm_year, tmp->tm_mon, tmp->tm_mday, tmp->tm_wday,
 		tmp->tm_hour, tmp->tm_min, tmp->tm_sec );
 #endif
+	return 0;
 }
 
 void rtc_set( struct rtc_time *tmp )

drivers/rtc/ds174x.c void rtc_set( struct rtc_time *tmp ) · line 148

Quoted 8 lines
drivers/rtc/ds174x.c +0 -2
@@ -142,8 +143,6 @@ void rtc_set( struct rtc_time *tmp )
 
 	/* unlock clock registers after read */
 	rtc_write( RTC_CONTROLA, ( reg_a  & ~RTC_CA_WRITE ));
-
-	return 0;
 }
 
 void rtc_reset (void)

I think this is actually not the right fix.

Quoted 8 lines

To make things right, both rtc_set() and rtc_get() should return "int".

Yes, I'm aware that this is far beyond the scope of your fixes here, but I wanted to at least note that.

Note that this is no NAK.

I can add it in my task for this fix window or in the next merge windows

Best Regards,
J.

#15 lore raw

PATCH 2/2 ds174x: Fix warning on return in rtc_get and rtc_set function

Quoted 10 lines · In message <[email protected]> you wrote:
Quoted 9 lines

To make things right, both rtc_set() and rtc_get() should return "int".

Yes, I'm aware that this is far beyond the scope of your fixes here, but I wanted to at least note that.

Note that this is no NAK.

I can add it in my task for this fix window or in the next merge windows

That would be great - next window, please. Thanks in advance.

Best regards,

Wolfgang Denk

Signature · 5 lines
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
Testing can show the presense of bugs, but not their absence.
                                                   -- Edsger Dijkstra
Applied
#16 lore raw

PATCH 2/2 ds174x: Fix warning on return in rtc_get and rtc_set function

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 6 lines · In message <[email protected]> you wrote:

ds174x.c: In function 'rtc_get':
ds174x.c:117: warning: no return statement in function returning non-void ds174x.c: In function 'rtc_set':
ds174x.c:146: warning: 'return' with a value, in function returning void

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
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
Anything free is worth what you pay for it.
#17 lore raw

[U-Boot-Users] unassigned-patches/10: [PATCH 1/2] cmd_log.c: Fix assignment differ in signedness

In reply to Jean-Christophe PLAGNIOL-VILLARD

In function 'logbuff_init_ptrs':
cmd_log.c:79: warning: pointer targets in assignment differ in signedness

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
Added to GNATS database as unassigned-patches/10

Quoted 5 lines
Responsible:    patch-coord
Message-Id:     <[email protected]>
In-Reply-To:    <[email protected]>
References:     <[email protected]>
Patch-Date:     Wed Apr 02 08:03:57 +0200 2008
common/cmd_log.c +1 -1
index 34b36ff..b9f9ba0 100644
@@ -76,7 +76,7 @@ void logbuff_init_ptrs (void)
 	lbuf = (char *)CONFIG_ALT_LB_ADDR;
 #else
 	log = (logbuff_t *)(gd->bd->bi_memsize-LOGBUFF_LEN) - 1;
-	lbuf = log->buf;
+	lbuf = (char *)log->buf;
 #endif
 
 	/* Set up log version */
Signature · 12 lines
1.5.4.5


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
Applied
#18 lore raw

PATCH 1/2 cmd_log.c: Fix assignment differ in signedness

In reply to Jean-Christophe PLAGNIOL-VILLARD

common/cmd_log.c

Quoted 9 lines · In message <[email protected]> you wrote:

In function 'logbuff_init_ptrs':
cmd_log.c:79: warning: pointer targets in assignment differ in signedness

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
common/cmd_log.c +0 -0
index 34b36ff..b9f9ba0 100644

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
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
Contrary to popular belief, thinking does not cause brain damage.
#19 lore raw

cover MPC8xx: Fix libfdt support introduced in commit 77ff7b74

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 41 lines · Jean-Christophe PLAGNIOL-VILLARD

fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
cpu/mpc8xx/Makefile +15 -10
index dbdc2e0..5f70459 100644
@@ -27,16 +27,29 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(CPU).a
 
-START	= start.o kgdb.o
-COBJS	= bedbug_860.o commproc.o cpu.o cpu_init.o	\
-	  fec.o fdt.o i2c.o interrupts.o lcd.o scc.o	\
-	  serial.o speed.o spi.o \
-	  traps.o upatch.o video.o
-SOBJS	= plprcr_write.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
+START-y	+= start.o
+START-y	+= kgdb.o
+COBJS-y	+= bedbug_860.o
+COBJS-y	+= commproc.o
+COBJS-y	+= cpu.o
+COBJS-y	+= cpu_init.o
+COBJS-y	+= fec.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS-y	+= i2c.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= lcd.o
+COBJS-y	+= scc.o
+COBJS-y	+= serial.o
+COBJS-y	+= speed.o
+COBJS-y	+= spi.o

cpu/mpc8xx/Makefile include $(TOPDIR)/config.mk · line 54

Quoted 10 lines
cpu/mpc8xx/Makefile +8 -0
+COBJS-y	+= traps.o
+COBJS-y	+= upatch.o
+COBJS-y	+= video.o
+SOBJS-y	+= plprcr_write.o
+
+SRCS	:= $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+START	:= $(addprefix $(obj),$(START-y))
 
 all:	$(obj).depend $(START) $(LIB)

I did this too, but did not do as good a job (I did not change SOBJS to SOBJS-y and START to START-y). Reference for my version:
<http://article.gmane.org/gmane.comp.boot-loaders.u-boot/38885/>

I've replaced my version with J-C's version in u-boot-fdt.

Acked-by Gerald Van Baren <[email protected]>

P.S. Thanks, Jean-Christophe, for doing a bunch of warning clean up.

#20 lore raw

[U-Boot-Users] unassigned-patches/9: [PATCH 0/2] MPC8xx: Fix libfdt support introduced in commit 77ff7b74

In reply to Jean-Christophe PLAGNIOL-VILLARD

fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

---
Added to GNATS database as unassigned-patches/9

Quoted 5 lines
Responsible:    patch-coord
Message-Id:     <[email protected]>

In-Reply-To:
References:
Patch-Date: Wed Apr 02 08:03:56 +0200 2008

cpu/mpc8xx/Makefile +23 -10
index dbdc2e0..5f70459 100644
@@ -27,16 +27,29 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(CPU).a
 
-START	= start.o kgdb.o
-COBJS	= bedbug_860.o commproc.o cpu.o cpu_init.o	\
-	  fec.o fdt.o i2c.o interrupts.o lcd.o scc.o	\
-	  serial.o speed.o spi.o \
-	  traps.o upatch.o video.o
-SOBJS	= plprcr_write.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
+START-y	+= start.o
+START-y	+= kgdb.o
+COBJS-y	+= bedbug_860.o
+COBJS-y	+= commproc.o
+COBJS-y	+= cpu.o
+COBJS-y	+= cpu_init.o
+COBJS-y	+= fec.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS-y	+= i2c.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= lcd.o
+COBJS-y	+= scc.o
+COBJS-y	+= serial.o
+COBJS-y	+= speed.o
+COBJS-y	+= spi.o
+COBJS-y	+= traps.o
+COBJS-y	+= upatch.o
+COBJS-y	+= video.o
+SOBJS-y	+= plprcr_write.o
+
+SRCS	:= $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+START	:= $(addprefix $(obj),$(START-y))
 
 all:	$(obj).depend $(START) $(LIB)
Signature · 12 lines
1.5.4.5


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
NAK
#21 lore raw

cover MPC8xx: Fix libfdt support introduced in commit 77ff7b74

In reply to Jean-Christophe PLAGNIOL-VILLARD
Quoted 41 lines · In message <[email protected]> you wrote:

fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
cpu/mpc8xx/Makefile +15 -10
index dbdc2e0..5f70459 100644
@@ -27,16 +27,29 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(CPU).a
 
-START	= start.o kgdb.o
-COBJS	= bedbug_860.o commproc.o cpu.o cpu_init.o	\
-	  fec.o fdt.o i2c.o interrupts.o lcd.o scc.o	\
-	  serial.o speed.o spi.o \
-	  traps.o upatch.o video.o
-SOBJS	= plprcr_write.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
+START-y	+= start.o
+START-y	+= kgdb.o
+COBJS-y	+= bedbug_860.o
+COBJS-y	+= commproc.o
+COBJS-y	+= cpu.o
+COBJS-y	+= cpu_init.o
+COBJS-y	+= fec.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS-y	+= i2c.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= lcd.o
+COBJS-y	+= scc.o
+COBJS-y	+= serial.o
+COBJS-y	+= speed.o
+COBJS-y	+= spi.o

cpu/mpc8xx/Makefile include $(TOPDIR)/config.mk · line 54

Quoted 10 lines
cpu/mpc8xx/Makefile +8 -0
+COBJS-y	+= traps.o
+COBJS-y	+= upatch.o
+COBJS-y	+= video.o
+SOBJS-y	+= plprcr_write.o
+
+SRCS	:= $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+START	:= $(addprefix $(obj),$(START-y))
 
 all:	$(obj).depend $(START) $(LIB)

I cannot see any correlation between your commit message and the actual changes???

NAK.

Best regards,

Wolfgang Denk

Signature · 5 lines
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
"Plan to throw one away.  You will anyway."
                              - Fred Brooks, "The Mythical Man Month"
#22 lore raw

cover MPC8xx: Fix libfdt support introduced in commit 77ff7b74

Quoted 57 lines · Wolfgang Denk
Quoted 41 lines · In message <[email protected]> you wrote:

fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
cpu/mpc8xx/Makefile +15 -10
index dbdc2e0..5f70459 100644
@@ -27,16 +27,29 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(CPU).a
 
-START	= start.o kgdb.o
-COBJS	= bedbug_860.o commproc.o cpu.o cpu_init.o	\
-	  fec.o fdt.o i2c.o interrupts.o lcd.o scc.o	\
-	  serial.o speed.o spi.o \
-	  traps.o upatch.o video.o
-SOBJS	= plprcr_write.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
+START-y	+= start.o
+START-y	+= kgdb.o
+COBJS-y	+= bedbug_860.o
+COBJS-y	+= commproc.o
+COBJS-y	+= cpu.o
+COBJS-y	+= cpu_init.o
+COBJS-y	+= fec.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS-y	+= i2c.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= lcd.o
+COBJS-y	+= scc.o
+COBJS-y	+= serial.o
+COBJS-y	+= speed.o
+COBJS-y	+= spi.o

cpu/mpc8xx/Makefile include $(TOPDIR)/config.mk · line 54

Quoted 10 lines
cpu/mpc8xx/Makefile +8 -0
+COBJS-y	+= traps.o
+COBJS-y	+= upatch.o
+COBJS-y	+= video.o
+SOBJS-y	+= plprcr_write.o
+
+SRCS	:= $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+START	:= $(addprefix $(obj),$(START-y))
 
 all:	$(obj).depend $(START) $(LIB)

I cannot see any correlation between your commit message and the actual changes???

Quoted 5 lines

NAK.

Best regards,

Wolfgang Denk

Actually, I've already slipped this one in through the u-boot-fdt repository (I took the liberty since it was a problem with fdt.o and CONFIG_OF_LIBFDT).

<http://article.gmane.org/gmane.comp.boot-loaders.u-boot/39261/>

The problem is that only a couple of 8xx boards are using libfdt, but they were *all* compiling fdt.c. The result for the boards that did not have CONFIG_OF_LIBFDT was the compilation warnings on the (erroneously compiled) fdt.c.

I had fixed it independently, but Jean-Christophe's fix was better (more complete), so I dropped my patch and picked up his.

Best regards,
gvb