Devkit8000: Fix compilation after changes in dm9000
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
In commit a45dde2293c816138e53c26eca6fd0322583f9a6 the I/O accessor for the DM9000 is changed.
The definition of __io is required to use the standard I/O accessors from asm/io.h.
--- include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
include/configs/devkit8000.h +2 -0
@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H +/* High Level Configuration Options */ #define CONFIG_ARMCORTEXA8 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */
@@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __io/* NS16550 Configuration */ #define CONFIG_SYS_NS16550
Signature · 1 line
1.6.4.4
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
Dear Thomas Weber,
Quoted 16 lines · In message <[email protected]> you wrote:
In commit
a45dde2293c816138e53c26eca6fd0322583f9a6the I/O accessor for the DM9000 is changed.The definition of
__iois required to use the standard I/O accessors fromasm/io.h.Signed-off-by Thomas Weber <[email protected]>--- include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)include/configs/devkit8000.h +0
-0
include/configs/devkit8000.h line 34
Quoted 4 lines
include/configs/devkit8000.h +1
-0@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H +
Unrelated (und unneeded) change. Please omit this.
include/configs/devkit8000.h line 83
Quoted 8 lines
include/configs/devkit8000.h +1
-0/* High Level Configuration Options */ #define CONFIG_ARMCORTEXA8 1/* This is an ARM V7 CPU core */ #define CONFIG_OMAP 1/* in a TI OMAP core */ @@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __io
Hm... the commit message says "__io is required to use the standard I/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Signature · 6 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
I've got to get something inside me. Some coffee or something. And
then the world will somehow be better.
- Terry Pratchett, _Men at Arms_PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
On 07.05.2010 17:15, Wolfgang Denk wrote:
Dear Thomas Weber,
In message <[email protected]> <[email protected]> you wrote:
In commit a45dde2293c816138e53c26eca6fd0322583f9a6 the I/O accessor for
the DM9000 is changed.
The definition of __io is required to use the standard I/O accessors from asm/io.h.
--- include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
include/configs/devkit8000.h +1 -0
@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H + Unrelated (und unneeded) change. Please omit this.
/* High Level Configuration Options */
#define CONFIG_ARMCORTEXA8 1 /* This is an ARM V7 CPU core */
#define CONFIG_OMAP 1 /* in a TI OMAP core */
@@ -79,6 +80,7 @@
#define CONFIG_DM9000_USE_16BIT 1
#define CONFIG_DM9000_NO_SROM 1
#undef CONFIG_DM9000_DEBUG
+#define __io
Hm... the commit message says "__io is required to use the standard
I/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Hi,
thanks for reviewing the patch.
Indm9000.c is <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h +201
I found #ifdef __io
but __io wasn't defined.
I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Because I have an other problem with gcc I cannot compile completely.
Thomas
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
Quoted 7 lines · On Friday 07 May 2010 12:58:34 Thomas Weber wrote:
In
dm9000.cis <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h+201
I found #ifdef__io
but__iowasn't defined.
Quoted 5 lines
I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Because I have an other problem with gcc I cannot compile completely.
i dont know the arm u-boot port at all, but perhaps the asm-arm/io.h should be changed like so:
#ifndef __io
# define __io(p) (p) #endif -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/20100507/3e66f80d/attachment.pgp
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
In reply to Thomas WeberDne P? 7. kv?tna 2010 18:58:34 Thomas Weber napsal(a):
Quoted 63 lines · Wolfgang Denk
Dear Thomas Weber,
In message <[email protected]> <[email protected]> you wrote:
In commit
a45dde2293c816138e53c26eca6fd0322583f9a6the I/O accessor for
the DM9000 is changed.The definition of
__iois required to use the standard I/O accessors fromasm/io.h.Signed-off-by Thomas Weber <[email protected]> <[email protected]>--- include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)include/configs/devkit8000.h +1
-0@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H + Unrelated (und unneeded) change. Please omit this./* High Level Configuration Options */
#defineCONFIG_ARMCORTEXA81 /* This is an ARM V7 CPU core */
#defineCONFIG_OMAP1 /* in a TI OMAP core */include/configs/devkit8000.h +1
-0@@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __io Hm... the commit message says "__io is required to use the standardI/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Hi,
thanks for reviewing the patch.In
dm9000.cis <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h+201
I found #ifdef__io
but__iowasn't defined.
Quoted 7 lines
I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Because I have an other problem with gcc I cannot compile completely.
Thomas
It's not a problem with GCC ... I get the same problem as well. And the problem appeared recently.
btw. for me, DM9000 is buggered as well.
3699c28e6d16b563629c285311a0ce62a2c4c5d0 still worked fine. I'm bisecting it.
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
In reply to Thomas WeberDne P? 7. kv?tna 2010 18:58:34 Thomas Weber napsal(a):
Quoted 63 lines · Wolfgang Denk
Dear Thomas Weber,
In message <[email protected]> <[email protected]> you wrote:
In commit
a45dde2293c816138e53c26eca6fd0322583f9a6the I/O accessor for
the DM9000 is changed.The definition of
__iois required to use the standard I/O accessors fromasm/io.h.Signed-off-by Thomas Weber <[email protected]> <[email protected]>--- include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)include/configs/devkit8000.h +1
-0@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H + Unrelated (und unneeded) change. Please omit this./* High Level Configuration Options */
#defineCONFIG_ARMCORTEXA81 /* This is an ARM V7 CPU core */
#defineCONFIG_OMAP1 /* in a TI OMAP core */include/configs/devkit8000.h +1
-0@@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __io Hm... the commit message says "__io is required to use the standardI/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Hi,
thanks for reviewing the patch.In
dm9000.cis <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h+201
I found #ifdef__io
but__iowasn't defined.
Quoted 7 lines
I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Because I have an other problem with gcc I cannot compile completely.
Thomas
52dbac69c27dee67a4c051b1055d93b0ac4e2062 <-- this one probably causes the other errors
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
Dne ?t 11. kv?tna 2010 05:28:38 Marek Vasut napsal(a):
Quoted 69 lines
Dne P? 7. kv?tna 2010 18:58:34 Thomas Weber napsal(a):
Quoted 68 lines · Wolfgang Denk
Dear Thomas Weber,
In message <[email protected]>
<[email protected]> you wrote:
In commita45dde2293c816138e53c26eca6fd0322583f9a6the I/O accessor forthe DM9000 is changed.
The definition of
__iois required to use the standard I/O accessors fromasm/io.h.Signed-off-by Thomas Weber <[email protected]> <[email protected]>---
include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)include/configs/devkit8000.h +1
-0@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H + Unrelated (und unneeded) change. Please omit this./* High Level Configuration Options */
#define
CONFIG_ARMCORTEXA81 /* This is an ARM V7 CPU core */
#defineCONFIG_OMAP1 /* in a TI OMAP core */include/configs/devkit8000.h +1
-0@@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __ioHm... the commit message says "
__iois required to use the standardI/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Hi,
thanks for reviewing the patch.
In
dm9000.cis <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h+201
I found #ifdef__io
but__iowasn't defined.I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Quoted 6 lines
Quoted 3 lines
Because I have an other problem with gcc I cannot compile completely.
Thomas
52dbac69c27dee67a4c051b1055d93b0ac4e2062<-- this one probably causes the other errors
Interesting ... the commit 'doesn't seem to be there'
It seems someone made some inccorect operation with git and some patches were forgotten/rewritten by old files.
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
Dne ?t 11. kv?tna 2010 05:47:40 Marek Vasut napsal(a):
Quoted 78 lines
Dne ?t 11. kv?tna 2010 05:28:38 Marek Vasut napsal(a):
Quoted 70 lines
Dne P? 7. kv?tna 2010 18:58:34 Thomas Weber napsal(a):
Quoted 69 lines · Wolfgang Denk
Dear Thomas Weber,
In message <[email protected]>
<[email protected]> you wrote:
In commita45dde2293c816138e53c26eca6fd0322583f9a6the I/O accessor forthe DM9000 is changed.
The definition of
__iois required to use the standard I/O accessors fromasm/io.h.Signed-off-by Thomas Weber <[email protected]> <[email protected]>---
include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/include/configs/devkit8000.hindex 7d1332f..6e53c0d 100644include/configs/devkit8000.h +1
-0@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H + Unrelated (und unneeded) change. Please omit this./* High Level Configuration Options */
#define
CONFIG_ARMCORTEXA81 /* This is an ARM V7 CPU core */
#defineCONFIG_OMAP1 /* in a TI OMAP core */include/configs/devkit8000.h +1
-0@@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __ioHm... the commit message says "
__iois required to use the standardI/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Hi,
thanks for reviewing the patch.
In
dm9000.cis <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h+201
I found #ifdef__io
but__iowasn't defined.I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Quoted 6 lines
Quoted 3 lines
Because I have an other problem with gcc I cannot compile completely.
Thomas
52dbac69c27dee67a4c051b1055d93b0ac4e2062<-- this one probably causes the other errors
Quoted 4 lines
Interesting ... the commit 'doesn't seem to be there'
It seems someone made some inccorect operation with git and some patches were forgotten/rewritten by old files.
I take what I said back, it's there, I mislooked.
But, here's a workaround-patch (unapplicable obviously). Conclusion from why it works with this is up to you:
include/common.h +0 -0
@@ -218,7 +218,7 @@ void hang (void) __attribute__
((noreturn));
/* */
phys_size_t initdram (int);
int display_options (void); -void print_size(unsigned long long, const char *); +void print_size(unsigned /*long*/ long, const char *); int print_buffer (ulong addr, void* data, uint width, uint count, uint
linelen);
/* common/main.c */
lib/display_options.c +4 -4
@@ -43,11 +43,11 @@ int display_options (void)* xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string * (like "\n") */ -void print_size (unsigned long long size,const char *s) +void print_size (unsigned /*long*/ long size,const char *s) {unsigned long m =0 , n; -static const char names[] = {'E' ,'P' ,'T' ,'G' ,'M' ,'K' }; -unsigned long long d =1ULL << (10 *ARRAY_SIZE (names)); +static const char names[] = {/*'E', 'P', 'T',*/ 'G' ,'M' ,'K' }; +unsigned long /*long*/ d =1ULL << (10 *ARRAY_SIZE (names));char c =0 ;unsigned int i;
@@ -59,7 +59,7 @@ void print_size(unsigned long long size, const char *s) }if (!c) { -printf ("%llu Bytes%s" , size, s); +printf ("%lu Bytes%s" , size, s);return ; }
PATCH 1/1 Devkit8000: Fix compilation after changes in dm9000
Hello Marek,
Quoted 124 lines · Marek Vasut
Dne ?t 11. kv?tna 2010 05:47:40 Marek Vasut napsal(a):
Quoted 78 lines
Dne ?t 11. kv?tna 2010 05:28:38 Marek Vasut napsal(a):
Quoted 70 lines
Dne P? 7. kv?tna 2010 18:58:34 Thomas Weber napsal(a):
Quoted 69 lines · Wolfgang Denk
Dear Thomas Weber,
In message <[email protected]>
<[email protected]> you wrote:
In commita45dde2293c816138e53c26eca6fd0322583f9a6the I/O accessor forthe DM9000 is changed.
The definition of
__iois required to use the standard I/O accessors fromasm/io.h.Signed-off-by Thomas Weber <[email protected]> <[email protected]>---
include/configs/devkit8000.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)(quoted diff) +0
-0
b/include/configs/devkit8000.hindex 7d1332f..6e53c0d 100644include/configs/devkit8000.h +1
-0@@ -31,6 +31,7 @@#ifndef __CONFIG_H#define __CONFIG_H + Unrelated (und unneeded) change. Please omit this./* High Level Configuration Options */
#define
CONFIG_ARMCORTEXA81 /* This is an ARM V7 CPU core */
#defineCONFIG_OMAP1 /* in a TI OMAP core */include/configs/devkit8000.h +1
-0@@ -79,6 +80,7 @@#define CONFIG_DM9000_USE_16BIT 1#define CONFIG_DM9000_NO_SROM 1#undef CONFIG_DM9000_DEBUG +#define __ioHm... the commit message says "
__iois required to use the standardI/O accessors" - but I don't see any of these in this definition here?
Best regards,
Wolfgang Denk
Hi,
thanks for reviewing the patch.
In
dm9000.cis <asm/io.h> included and outb, etc. used and inarch/arm/include/asm/io.h+201
I found #ifdef__io
but__iowasn't defined.I also think, that all arm-boards that uses the dm9000 will have this problem at the moment. I tried to compile at91sam9261 and got the same problem.
Quoted 6 lines
Quoted 3 lines
Because I have an other problem with gcc I cannot compile completely.
Thomas
52dbac69c27dee67a4c051b1055d93b0ac4e2062<-- this one probably causes the other errorsQuoted 4 lines
Interesting ... the commit 'doesn't seem to be there'
It seems someone made some inccorect operation with git and some patches were forgotten/rewritten by old files.
I take what I said back, it's there, I mislooked.
But, here's a workaround-patch (unapplicable obviously). Conclusion from why it works with this is up to you:
include/common.h +1
-1@@ -218,7 +218,7 @@ void hang (void) __attribute__ ((noreturn));/* */ phys_size_t initdram (int );int display_options (void ); -void print_size (unsigned long long ,const char *); +void print_size (unsigned /*long*/ long ,const char *);int print_buffer (ulong addr,void * data,uint width,uint count,uint linelen);/*
common/main.c*/lib/display_options.c +3
-3@@ -43,11 +43,11 @@ int display_options (void)* xxx GiB, xxx.y GiB, etc as needed; allow for optional trailing string * (like "\n") */ -void print_size (unsigned long long size,const char *s) +void print_size (unsigned /*long*/ long size,const char *s) {unsigned long m =0 , n; -static const char names[] = {'E' ,'P' ,'T' ,'G' ,'M' ,'K' }; -unsigned long long d =1ULL << (10 *ARRAY_SIZE (names)); +static const char names[] = {/*'E', 'P', 'T',*/ 'G' ,'M' ,'K' }; +unsigned long /*long*/ d =1ULL << (10 *ARRAY_SIZE (names));char c =0 ;unsigned int i;
lib/display_options.c void print_size(unsigned long long size, const char *s) · line 64
Quoted 7 lines
lib/display_options.c +1
-1@@ -59,7 +59,7 @@ void print_size(unsigned long long size, const char *s) }if (!c) { -printf ("%llu Bytes%s" , size, s); +printf ("%lu Bytes%s" , size, s);return ; }
I think you need:
Message-Id: <[email protected]>
Thomas