Fix build issues for some ARM boards

PATCH New Anatolij Gustschin 5 participants 34 messages Nov 19, 2011 – Dec 19, 2011

Share & tools

Anatolij Gustschin

author

2011-11-19 11:59 UTC #0 lore raw

cover Fix build issues for some ARM boards

Build breakage still pollutes the MAKEALL log. Fix build problems for some ARM based boards. The patches can be pulled from

git://git.denx.de/u-boot-video.git arm-fixes

I also fixed davinci_schmoogie and davinci_sonata, but there are already patches for these on the patchwork [1], [2], so I do not include them to this patch series.

[1] http://patchwork.ozlabs.org/patch/126534/
[2] http://patchwork.ozlabs.org/patch/126535/

Anatolij Gustschin (9):
ARM: a320evb: re-add MACH_TYPE_FARADAY
ARM: cerf250: re-add MACH_TYPE_PXA_CERF
ARM: cradle: re-add MACH_TYPE_HHP_CRADLE
ARM: pleb2: re-add MACH_TYPE_PLEB2
ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
ARM: xm250: re-add MACH_TYPE_XM250
ARM: cerf250: fix GCC 4.6 warings
ARM: xm250: Fix GCC 4.6 warnings

 board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
 board/calao/tny_a9260/tny_a9260.c     |    5 -----
 board/cerf250/cerf250.c               |    3 ---
 board/cerf250/flash.c                 |    7 +++----
 board/cradle/cradle.c                 |    3 ---
 board/faraday/a320evb/a320evb.c       |    1 -
 board/pleb2/pleb2.c                   |    3 ---
 board/xm250/flash.c                   |    7 +++----
 board/xm250/xm250.c                   |    3 ---
 include/configs/a320evb.h             |    3 +++
 include/configs/cerf250.h             |    3 +++
 include/configs/cradle.h              |    3 +++
 include/configs/pleb2.h               |    3 +++
 include/configs/sbc35_a9g20.h         |    3 +++
 include/configs/tny_a9260.h           |    4 ++++
 include/configs/xm250.h               |    3 +++
 16 files changed, 28 insertions(+), 27 deletions(-)

Signature · 1 line

1.7.5.4

Anatolij Gustschin

author

2011-11-19 11:59 UTC #1 lore raw

PATCH 1/9 ARM: a320evb: re-add MACH_TYPE_FARADAY

MACH_TYPE_FARADAY was removed from mach-types.h.
Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/faraday/a320evb/a320evb.c |    1 -
 include/configs/a320evb.h       |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

board/faraday/a320evb/a320evb.c +0 -1

index 2578be4..dfd186b 100644
@@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	ftsmc020_init();	/* initialize Flash */

include/configs/a320evb.h +3 -0

index 45a7c53..2904e2e 100644
@@ -37,6 +37,9 @@
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 
+#define MACH_TYPE_FARADAY	758
+#define CONFIG_MACH_TYPE	MACH_TYPE_FARADAY
+
 /*
  * Power Management Unit
  */

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 17:56 UTC #2 lore raw

PATCH 1/9 ARM: a320evb: re-add MACH_TYPE_FARADAY

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_FARADAY was removed from mach-types.h.
Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 39 lines

---
?board/faraday/a320evb/a320evb.c | ? ?1 -
?include/configs/a320evb.h ? ? ? | ? ?3 +++
?2 files changed, 3 insertions(+), 1 deletions(-)
board/faraday/a320evb/a320evb.c +0 -1
index 2578be4..dfd186b 100644
@@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 ?int board_init(void)
 ?{
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
 ? ? ? ?gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
? ? ? ?ftsmc020_init(); ? ? ? ?/* initialize Flash */
include/configs/a320evb.h +0 -0
index 45a7c53..2904e2e 100644
@@ -37,6 +37,9 @@
 
?#undef CONFIG_SKIP_LOWLEVEL_INIT
include/configs/a320evb.h +3 -0
+#define MACH_TYPE_FARADAY ? ? ?758
+#define CONFIG_MACH_TYPE ? ? ? MACH_TYPE_FARADAY
+
?/*
?* Power Management Unit
?*/
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Anatolij Gustschin

author

2011-11-21 18:46 UTC #3 lore raw

PATCH 1/9 ARM: a320evb: re-add MACH_TYPE_FARADAY

In reply to Anatolij Gustschin

Dear Po-Yu Chuang,

Quoted 2 lines · On Sat, 19 Nov 2011 12:59:08 +0100 Anatolij Gustschin <[email protected]> wrote:

MACH_TYPE_FARADAY was removed from mach-types.h.
Add it to the board config file.

Could you please look at this patch and send your
Acked-by if the patch is okay.

Thanks,
Anatolij

Quoted 33 lines

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/faraday/a320evb/a320evb.c |    1 -
 include/configs/a320evb.h       |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

board/faraday/a320evb/a320evb.c +0 -1

index 2578be4..dfd186b 100644
@@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	ftsmc020_init();	/* initialize Flash */

include/configs/a320evb.h +3 -0

index 45a7c53..2904e2e 100644
@@ -37,6 +37,9 @@
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 
+#define MACH_TYPE_FARADAY	758
+#define CONFIG_MACH_TYPE	MACH_TYPE_FARADAY
+
 /*
  * Power Management Unit
  */

Po-Yu Chuang

2011-11-22 03:18 UTC #4 lore raw

PATCH 1/9 ARM: a320evb: re-add MACH_TYPE_FARADAY

Dear Anatolij,

Quoted 39 lines · Anatolij Gustschin

Dear Po-Yu Chuang,
Quoted 2 lines · On Sat, 19 Nov 2011 12:59:08 +0100 Anatolij Gustschin <[email protected]> wrote:
MACH_TYPE_FARADAY was removed from mach-types.h.
Add it to the board config file.
Could you please look at this patch and send your
Acked-by if the patch is okay.
Thanks,
Anatolij
Quoted 25 lines
Signed-off-by Anatolij Gustschin <[email protected]>
---
?board/faraday/a320evb/a320evb.c | ? ?1 -
?include/configs/a320evb.h ? ? ? | ? ?3 +++
?2 files changed, 3 insertions(+), 1 deletions(-)
board/faraday/a320evb/a320evb.c +0 -1
index 2578be4..dfd186b 100644
@@ -31,7 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 ?int board_init(void)
 ?{
- ? ? gd->bd->bi_arch_number = MACH_TYPE_FARADAY;
 ? ? ? gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
? ? ? ftsmc020_init(); ? ? ? ?/* initialize Flash */
include/configs/a320evb.h +0 -0
index 45a7c53..2904e2e 100644
@@ -37,6 +37,9 @@
 

Quoted 8 lines

Quoted 8 lines
?#undef CONFIG_SKIP_LOWLEVEL_INIT
include/configs/a320evb.h +3 -0
+#define MACH_TYPE_FARADAY ? ?758
+#define CONFIG_MACH_TYPE ? ? MACH_TYPE_FARADAY
+
?/*
? * Power Management Unit
? */

Thanks for your patch and sorry I did not notice it.

Acked-by Po-Yu Chuang <[email protected]>

Best regards,
Po-Yu Chuang

Po-Yu Chuang

2011-11-22 03:45 UTC #5 lore raw

PATCH 1/9 ARM: a320evb: re-add MACH_TYPE_FARADAY

Dear Anatolij,

Quoted 19 lines · Po-Yu Chuang

Dear Anatolij,
Quoted 16 lines · Anatolij Gustschin
Dear Po-Yu Chuang,
Quoted 2 lines · On Sat, 19 Nov 2011 12:59:08 +0100 Anatolij Gustschin <[email protected]> wrote:
MACH_TYPE_FARADAY was removed from mach-types.h.
Add it to the board config file.
Could you please look at this patch and send your
Acked-by if the patch is okay.
Thanks,
Anatolij
Quoted 2 lines
Signed-off-by Anatolij Gustschin <[email protected]>

[snip]

Quoted 8 lines

Thanks for your patch and sorry I did not notice it.
Acked-by Po-Yu Chuang <[email protected]>
Best regards,
Po-Yu Chuang

Andrew told me that he had submitted a very same patch two weeks ago:

http://www.mail-archive.com/u-boot at lists.denx.de/msg68553.html

I think his patch should be applied instead.

BTW, I have leaved my job. Andrew is currently the maintainer of a320evb.

Best regards,
Po-Yu Chuang

Anatolij Gustschin

author

2011-11-19 11:59 UTC #6 lore raw

PATCH 2/9 ARM: cerf250: re-add MACH_TYPE_PXA_CERF

In reply to Anatolij Gustschin

MACH_TYPE_PXA_CERF was removed from mach-types.h.
Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/cerf250/cerf250.c   |    3 ---
 include/configs/cerf250.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/cerf250/cerf250.c +0 -3

index 043afea..615c288 100644
@@ -43,9 +43,6 @@ int board_init (void)
 	dcache_disable();
 	icache_disable();
 
-	/* arch number of cerf PXA Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;

include/configs/cerf250.h +3 -0

index 70427da..dde9e14 100644
@@ -42,6 +42,9 @@
 
 #undef	CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
 
+#define MACH_TYPE_PXA_CERF	139
+#define CONFIG_MACH_TYPE	MACH_TYPE_PXA_CERF
+
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_DCACHE_OFF

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 17:56 UTC #7 lore raw

PATCH 2/9 ARM: cerf250: re-add MACH_TYPE_PXA_CERF

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_PXA_CERF was removed from mach-types.h.
Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 41 lines

---
?board/cerf250/cerf250.c ? | ? ?3 ---
?include/configs/cerf250.h | ? ?3 +++
?2 files changed, 3 insertions(+), 3 deletions(-)
board/cerf250/cerf250.c +0 -3
index 043afea..615c288 100644
@@ -43,9 +43,6 @@ int board_init (void)
 ? ? ? ?dcache_disable();
 ? ? ? ?icache_disable();
 
- ? ? ? /* arch number of cerf PXA Board */
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
-
? ? ? ?/* adress of boot parameters */
? ? ? ?gd->bd->bi_boot_params = 0xa0000100;
include/configs/cerf250.h +0 -0
index 70427da..dde9e14 100644
@@ -42,6 +42,9 @@
 
?#undef CONFIG_USE_IRQ ? ? ? ? ? ? ? ? ?/* we don't need IRQ/FIQ stuff */
include/configs/cerf250.h +3 -0
+#define MACH_TYPE_PXA_CERF ? ? 139
+#define CONFIG_MACH_TYPE ? ? ? MACH_TYPE_PXA_CERF
+
?/* we will never enable dcache, because we have to setup MMU first */ ?#define CONFIG_SYS_DCACHE_OFF
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Marek Vasut

2011-11-20 00:09 UTC #8 lore raw

PATCH 2/9 ARM: cerf250: re-add MACH_TYPE_PXA_CERF

Quoted 9 lines · Anatolij Gustschin

Quoted 4 lines
MACH_TYPE_PXA_CERF was removed from mach-types.h.
Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>
I built this and it fixes the failure. I did not test on hardware.
Acked-by Simon Glass <[email protected]>

Good, CCing original maintainer.

Is the device still activelly used or can we drop it?

Quoted 46 lines

Quoted 37 lines

---
 board/cerf250/cerf250.c   |    3 ---
 include/configs/cerf250.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/cerf250/cerf250.c +0 -3

index 043afea..615c288 100644
@@ -43,9 +43,6 @@ int board_init (void)
       dcache_disable();
       icache_disable();
 
-       /* arch number of cerf PXA Board */
-       gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
-
       /* adress of boot parameters */
       gd->bd->bi_boot_params = 0xa0000100;

include/configs/cerf250.h +3 -1

index 70427da..dde9e14 100644
@@ -42,6 +42,9 @@
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff */
 
+#define MACH_TYPE_PXA_CERF     139
+#define CONFIG_MACH_TYPE       MACH_TYPE_PXA_CERF
+
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_DCACHE_OFF
 
--

1.7.5.4

Quoted 4 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Marek Vasut

2011-11-20 00:18 UTC #9 lore raw

PATCH 2/9 ARM: cerf250: re-add MACH_TYPE_PXA_CERF

Quoted 8 lines

Quoted 8 lines · Anatolij Gustschin
Quoted 4 lines
MACH_TYPE_PXA_CERF was removed from mach-types.h.
Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>
I built this and it fixes the failure. I did not test on hardware.

Quoted 7 lines

Quoted 1 line
Acked-by Simon Glass <[email protected]>
Good, CCing original maintainer.
Is the device still activelly used or can we drop it?
M

I see delivery failure to the address, this board is dead. Time for a good-bye patch?

Quoted 51 lines

Quoted 39 lines

---

 board/cerf250/cerf250.c   |    3 ---
 include/configs/cerf250.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/cerf250/cerf250.c +0 -3

index 043afea..615c288 100644
@@ -43,9 +43,6 @@ int board_init (void)
 
       dcache_disable();
       icache_disable();
 
-       /* arch number of cerf PXA Board */
-       gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
-
 
       /* adress of boot parameters */

       gd->bd->bi_boot_params = 0xa0000100;

include/configs/cerf250.h +3 -0

index 70427da..dde9e14 100644
@@ -42,6 +42,9 @@
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff
 */
 
+#define MACH_TYPE_PXA_CERF     139
+#define CONFIG_MACH_TYPE       MACH_TYPE_PXA_CERF
+
 
 /* we will never enable dcache, because we have to setup MMU first */

#define CONFIG_SYS_DCACHE_OFF

Quoted 7 lines

--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Albert ARIBAUD

2011-11-21 16:44 UTC #10 lore raw

PATCH 2/9 ARM: cerf250: re-add MACH_TYPE_PXA_CERF

Hi Marek,

Quoted 2 lines

I see delivery failure to the address, this board is dead. Time for a good-bye patch?

Yes, let us drop the board. If someone wants to resurrect it, they can step forward any time.

Amicalement,

Signature · 1 line

Albert.

Anatolij Gustschin

author

2011-11-19 11:59 UTC #11 lore raw

PATCH 3/9 ARM: cradle: re-add MACH_TYPE_HHP_CRADLE

In reply to Anatolij Gustschin

MACH_TYPE_HHP_CRADLE was removed from mach-types.h. Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/cradle/cradle.c    |    3 ---
 include/configs/cradle.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/cradle/cradle.c +0 -3

index 2bbf2d5..e9f38f8 100644
@@ -191,9 +191,6 @@ board_init (void)
 
 	led_code (0xf, YELLOW);
 
-	/* arch number of HHP Cradle */
-	gd->bd->bi_arch_number = MACH_TYPE_HHP_CRADLE;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;

include/configs/cradle.h +3 -0

index 25be616..d56deee 100644
@@ -35,6 +35,9 @@
 #define CONFIG_PXA250           1       /* This is an PXA250 CPU    */
 #define CONFIG_HHP_CRADLE       1       /* on an Cradle Board       */
 
+#define MACH_TYPE_HHP_CRADLE	210
+#define CONFIG_MACH_TYPE	MACH_TYPE_HHP_CRADLE
+
 #undef CONFIG_USE_IRQ                   /* we don't need IRQ/FIQ stuff */
 
 /* we will never enable dcache, because we have to setup MMU first */

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 17:57 UTC #12 lore raw

PATCH 3/9 ARM: cradle: re-add MACH_TYPE_HHP_CRADLE

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_HHP_CRADLE was removed from mach-types.h. Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 41 lines

---
?board/cradle/cradle.c ? ?| ? ?3 ---
?include/configs/cradle.h | ? ?3 +++
?2 files changed, 3 insertions(+), 3 deletions(-)
board/cradle/cradle.c +0 -3
index 2bbf2d5..e9f38f8 100644
@@ -191,9 +191,6 @@ board_init (void)
 
 ? ? ? ?led_code (0xf, YELLOW);
 
- ? ? ? /* arch number of HHP Cradle */
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_HHP_CRADLE;
-
? ? ? ?/* adress of boot parameters */
? ? ? ?gd->bd->bi_boot_params = 0xa0000100;
include/configs/cradle.h +0 -0
index 25be616..d56deee 100644
@@ -35,6 +35,9 @@
?#define CONFIG_PXA250 ? ? ? ? ? 1 ? ? ? /* This is an PXA250 CPU ? ?*/ ?#define CONFIG_HHP_CRADLE ? ? ? 1 ? ? ? /* on an Cradle Board ? ? ? */
include/configs/cradle.h +3 -0
+#define MACH_TYPE_HHP_CRADLE ? 210
+#define CONFIG_MACH_TYPE ? ? ? MACH_TYPE_HHP_CRADLE
+
?#undef CONFIG_USE_IRQ ? ? ? ? ? ? ? ? ? /* we don't need IRQ/FIQ stuff */
?/* we will never enable dcache, because we have to setup MMU first */ --
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Marek Vasut

2011-11-21 22:28 UTC #13 lore raw

PATCH 3/9 ARM: cradle: re-add MACH_TYPE_HHP_CRADLE

In reply to Anatolij Gustschin

Quoted 28 lines

MACH_TYPE_HHP_CRADLE was removed from mach-types.h. Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/cradle/cradle.c    |    3 ---
 include/configs/cradle.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/cradle/cradle.c +0 -3

index 2bbf2d5..e9f38f8 100644
@@ -191,9 +191,6 @@ board_init (void)
 
 	led_code (0xf, YELLOW);
 
-	/* arch number of HHP Cradle */
-	gd->bd->bi_arch_number = MACH_TYPE_HHP_CRADLE;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;

include/configs/cradle.h +0 -0

index 25be616..d56deee 100644

include/configs/cradle.h line 43

Quoted 9 lines

include/configs/cradle.h +3 -0

@@ -35,6 +35,9 @@
 #define CONFIG_PXA250           1       /* This is an PXA250 CPU    */
 #define CONFIG_HHP_CRADLE       1       /* on an Cradle Board       */
 
+#define MACH_TYPE_HHP_CRADLE	210
+#define CONFIG_MACH_TYPE	MACH_TYPE_HHP_CRADLE
+
 #undef CONFIG_USE_IRQ                   /* we don't need IRQ/FIQ stuff */
 
 /* we will never enable dcache, because we have to setup MMU first */

Hey,

this thing too ... is the maintainer still alive ? If not, time for a good-bye patch too (according to the MAINTAINERS file, it's time for a good bye patch).

Anatolij Gustschin

author

2011-11-19 11:59 UTC #14 lore raw

PATCH 4/9 ARM: pleb2: re-add MACH_TYPE_PLEB2

In reply to Anatolij Gustschin

MACH_TYPE_PLEB2 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/pleb2/pleb2.c     |    3 ---
 include/configs/pleb2.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/pleb2/pleb2.c +0 -3

index 5a16cc7..ebb6180 100644
@@ -40,9 +40,6 @@ int board_init (void)
 	dcache_disable();
 	icache_disable();
 
-	/* arch number of Lubbock-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PLEB2;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;

include/configs/pleb2.h +3 -0

index 2aeb7fb..4031d61 100644
@@ -43,6 +43,9 @@
 
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff */
 
+#define MACH_TYPE_PLEB2		587
+#define CONFIG_MACH_TYPE	MACH_TYPE_PLEB2
+
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_DCACHE_OFF

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 17:57 UTC #15 lore raw

PATCH 4/9 ARM: pleb2: re-add MACH_TYPE_PLEB2

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_PLEB2 was removed from mach-types.h.
Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 41 lines

---
?board/pleb2/pleb2.c ? ? | ? ?3 ---
?include/configs/pleb2.h | ? ?3 +++
?2 files changed, 3 insertions(+), 3 deletions(-)
board/pleb2/pleb2.c +0 -3
index 5a16cc7..ebb6180 100644
@@ -40,9 +40,6 @@ int board_init (void)
 ? ? ? ?dcache_disable();
 ? ? ? ?icache_disable();
 
- ? ? ? /* arch number of Lubbock-Board */
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_PLEB2;
-
? ? ? ?/* adress of boot parameters */
? ? ? ?gd->bd->bi_boot_params = 0xa0000100;
include/configs/pleb2.h +0 -0
index 2aeb7fb..4031d61 100644
@@ -43,6 +43,9 @@
 
?#undef CONFIG_USE_IRQ ? ? ? ? ? ? ? ? ?/* we don't need IRQ/FIQ stuff */
include/configs/pleb2.h +3 -0
+#define MACH_TYPE_PLEB2 ? ? ? ? ? ? ? ?587
+#define CONFIG_MACH_TYPE ? ? ? MACH_TYPE_PLEB2
+
?/* we will never enable dcache, because we have to setup MMU first */ ?#define CONFIG_SYS_DCACHE_OFF
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Marek Vasut

2011-11-21 22:29 UTC #16 lore raw

PATCH 4/9 ARM: pleb2: re-add MACH_TYPE_PLEB2

In reply to Anatolij Gustschin

Quoted 28 lines

MACH_TYPE_PLEB2 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/pleb2/pleb2.c     |    3 ---
 include/configs/pleb2.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/pleb2/pleb2.c +0 -3

index 5a16cc7..ebb6180 100644
@@ -40,9 +40,6 @@ int board_init (void)
 	dcache_disable();
 	icache_disable();
 
-	/* arch number of Lubbock-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_PLEB2;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;

include/configs/pleb2.h +0 -0

index 2aeb7fb..4031d61 100644

include/configs/pleb2.h line 44

Quoted 2 lines

include/configs/pleb2.h +0 -0

@@ -43,6 +43,9 @@
 
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff

include/configs/pleb2.h line 50

Quoted 6 lines

include/configs/pleb2.h +3 -0

+#define MACH_TYPE_PLEB2		587
+#define CONFIG_MACH_TYPE	MACH_TYPE_PLEB2
+
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_DCACHE_OFF

I don't even see maintainer entry for this one ... good bye ?

Anatolij Gustschin

author

2011-11-19 11:59 UTC #17 lore raw

PATCH 5/9 ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

In reply to Anatolij Gustschin

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h. Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
 include/configs/sbc35_a9g20.h         |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

board/calao/sbc35_a9g20/sbc35_a9g20.c +0 -1

index 5f448d9..446afb2 100644
@@ -152,7 +152,6 @@ int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-	gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

include/configs/sbc35_a9g20.h +3 -0

index 1e355a8..cdf8659 100644
@@ -36,6 +36,9 @@
 #define CONFIG_ENV_IS_IN_EEPROM
 #endif
 
+#define MACH_TYPE_SBC35_A9G20		1848
+#define CONFIG_MACH_TYPE		MACH_TYPE_SBC35_A9G20
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12.000 MHz crystal */

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 17:58 UTC #18 lore raw

PATCH 5/9 ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h. Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 39 lines

---
?board/calao/sbc35_a9g20/sbc35_a9g20.c | ? ?1 -
?include/configs/sbc35_a9g20.h ? ? ? ? | ? ?3 +++
?2 files changed, 3 insertions(+), 1 deletions(-)
board/calao/sbc35_a9g20/sbc35_a9g20.c +0 -0
index 5f448d9..446afb2 100644
@@ -152,7 +152,6 @@ int board_init(void)
? ? ? ?/* Enable Ctrlc */
? ? ? ?console_init_f();
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20; ? ? ? ?/* adress of boot parameters */
? ? ? ?gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
include/configs/sbc35_a9g20.h +0 -0
index 1e355a8..cdf8659 100644
@@ -36,6 +36,9 @@
?#define CONFIG_ENV_IS_IN_EEPROM
?#endif
include/configs/sbc35_a9g20.h +3 -0
+#define MACH_TYPE_SBC35_A9G20 ? ? ? ? ?1848
+#define CONFIG_MACH_TYPE ? ? ? ? ? ? ? MACH_TYPE_SBC35_A9G20
+
?/* ARM asynchronous clock */
?#define CONFIG_SYS_AT91_SLOW_CLOCK ? ? 32768 ? ? ? ? ? /* slow clock xtal */ ?#define CONFIG_SYS_AT91_MAIN_CLOCK ? ? 12000000 ? ? ? ?/* 12.000 MHz crystal */ --
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Anatolij Gustschin

author

2011-11-21 18:55 UTC #19 lore raw

PATCH 5/9 ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

In reply to Anatolij Gustschin

Dear Albin Tonnerre,

Quoted 2 lines · On Sat, 19 Nov 2011 12:59:12 +0100 Anatolij Gustschin <[email protected]> wrote:

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h. Add it to the board config file.

Could you please look at this patch and send your
Acked-by if the patch is okay?

Thanks,
Anatolij

Quoted 33 lines

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
 include/configs/sbc35_a9g20.h         |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

board/calao/sbc35_a9g20/sbc35_a9g20.c +0 -1

index 5f448d9..446afb2 100644
@@ -152,7 +152,6 @@ int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-	gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

include/configs/sbc35_a9g20.h +3 -0

index 1e355a8..cdf8659 100644
@@ -36,6 +36,9 @@
 #define CONFIG_ENV_IS_IN_EEPROM
 #endif
 
+#define MACH_TYPE_SBC35_A9G20		1848
+#define CONFIG_MACH_TYPE		MACH_TYPE_SBC35_A9G20
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12.000 MHz crystal */

Albert ARIBAUD

2011-12-19 10:58 UTC #20 lore raw

PATCH 5/9 ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

In reply to Anatolij Gustschin

Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a ?crit :

Quoted 26 lines

MACH_TYPE_SBC35_A9G20 was removed from mach-types.h. Add it to the board config file.

Signed-off-by Anatolij Gustschin<[email protected]>

---
  board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
  include/configs/sbc35_a9g20.h         |    3 +++
  2 files changed, 3 insertions(+), 1 deletions(-)

board/calao/sbc35_a9g20/sbc35_a9g20.c +0 -1

index 5f448d9..446afb2 100644
@@ -152,7 +152,6 @@ int board_init(void)
  	/* Enable Ctrlc */
  	console_init_f();
 
-	gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
  	/* adress of boot parameters */
  	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

include/configs/sbc35_a9g20.h +0 -0

index 1e355a8..cdf8659 100644

include/configs/sbc35_a9g20.h line 44

Quoted 9 lines

include/configs/sbc35_a9g20.h +3 -0

@@ -36,6 +36,9 @@
  #define CONFIG_ENV_IS_IN_EEPROM
  #endif
 
+#define MACH_TYPE_SBC35_A9G20		1848
+#define CONFIG_MACH_TYPE		MACH_TYPE_SBC35_A9G20
+
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12.000 MHz crystal */

Applied to u-boot-arm/master, thanks!

Amicalement,

Signature · 1 line

Albert.

Anatolij Gustschin

author

2011-11-19 11:59 UTC #21 lore raw

PATCH 6/9 ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

In reply to Anatolij Gustschin

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed from mach-types.h. Add them to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/calao/tny_a9260/tny_a9260.c |    5 -----
 include/configs/tny_a9260.h       |    4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

board/calao/tny_a9260/tny_a9260.c +0 -5

index ab51a33..a472b91 100644
@@ -86,11 +86,6 @@ int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-#if defined(CONFIG_TNY_A9260)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
-#elif defined(CONFIG_TNY_A9G20)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
-#endif
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

include/configs/tny_a9260.h +4 -0

index 986aeba..c632de6 100644
@@ -45,8 +45,12 @@
 /* Define actual evaluation board type from used processor type */
 #ifdef CONFIG_AT91SAM9G20
 # define CONFIG_TNY_A9G20
+# define MACH_TYPE_TNY_A9G20		2059
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9G20
 #else
 # define CONFIG_TNY_A9260
+# define MACH_TYPE_TNY_A9260		2058
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9260
 #endif
 
 /* ARM asynchronous clock */

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 18:00 UTC #22 lore raw

PATCH 6/9 ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed from mach-types.h. Add them to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 35 lines

---
?board/calao/tny_a9260/tny_a9260.c | ? ?5 -----
?include/configs/tny_a9260.h ? ? ? | ? ?4 ++++
?2 files changed, 4 insertions(+), 5 deletions(-)
board/calao/tny_a9260/tny_a9260.c +0 -0
index ab51a33..a472b91 100644
@@ -86,11 +86,6 @@ int board_init(void)
? ? ? ?/* Enable Ctrlc */
? ? ? ?console_init_f();
board/calao/tny_a9260/tny_a9260.c +0 -5
-#if defined(CONFIG_TNY_A9260)
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
-#elif defined(CONFIG_TNY_A9G20)
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
-#endif
? ? ? ?/* adress of boot parameters */
? ? ? ?gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
include/configs/tny_a9260.h +0 -0
index 986aeba..c632de6 100644
@@ -45,8 +45,12 @@
?/* Define actual evaluation board type from used processor type */ ?#ifdef CONFIG_AT91SAM9G20
?# define CONFIG_TNY_A9G20
include/configs/tny_a9260.h +2 -0
+# define MACH_TYPE_TNY_A9G20 ? ? ? ? ? 2059
+# define CONFIG_MACH_TYPE ? ? ? ? ? ? ?MACH_TYPE_TNY_A9G20
?#else
?# define CONFIG_TNY_A9260
include/configs/tny_a9260.h +2 -0
+# define MACH_TYPE_TNY_A9260 ? ? ? ? ? 2058
+# define CONFIG_MACH_TYPE ? ? ? ? ? ? ?MACH_TYPE_TNY_A9260

Quoted 1 line

?#endif

Seems odd to me to have the #define MACH_TYPE_TNY_ inside the #ifdef also, but ok.

Quoted 10 lines

?/* ARM asynchronous clock */
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Anatolij Gustschin

author

2011-11-21 18:57 UTC #23 lore raw

PATCH 6/9 ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

In reply to Anatolij Gustschin

Dear Albin Tonnerre,

Quoted 2 lines · On Sat, 19 Nov 2011 12:59:13 +0100 Anatolij Gustschin <[email protected]> wrote:

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed from mach-types.h. Add them to the board config file.

Could you please look at this patch and send your
Acked-by if the patch is okay?

Thanks,
Anatolij

Quoted 40 lines

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/calao/tny_a9260/tny_a9260.c |    5 -----
 include/configs/tny_a9260.h       |    4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

board/calao/tny_a9260/tny_a9260.c +0 -5

index ab51a33..a472b91 100644
@@ -86,11 +86,6 @@ int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-#if defined(CONFIG_TNY_A9260)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
-#elif defined(CONFIG_TNY_A9G20)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
-#endif
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

include/configs/tny_a9260.h +4 -0

index 986aeba..c632de6 100644
@@ -45,8 +45,12 @@
 /* Define actual evaluation board type from used processor type */
 #ifdef CONFIG_AT91SAM9G20
 # define CONFIG_TNY_A9G20
+# define MACH_TYPE_TNY_A9G20		2059
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9G20
 #else
 # define CONFIG_TNY_A9260
+# define MACH_TYPE_TNY_A9260		2058
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9260
 #endif
 
 /* ARM asynchronous clock */

Albert ARIBAUD

2011-12-19 10:58 UTC #24 lore raw

PATCH 6/9 ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

In reply to Anatolij Gustschin

Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a ?crit :

Quoted 32 lines

MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed from mach-types.h. Add them to the board config file.

Signed-off-by Anatolij Gustschin<[email protected]>

---
  board/calao/tny_a9260/tny_a9260.c |    5 -----
  include/configs/tny_a9260.h       |    4 ++++
  2 files changed, 4 insertions(+), 5 deletions(-)

board/calao/tny_a9260/tny_a9260.c +0 -5

index ab51a33..a472b91 100644
@@ -86,11 +86,6 @@ int board_init(void)
  	/* Enable Ctrlc */
  	console_init_f();
 
-#if defined(CONFIG_TNY_A9260)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
-#elif defined(CONFIG_TNY_A9G20)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
-#endif
  	/* adress of boot parameters */
  	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;

include/configs/tny_a9260.h +0 -0

index 986aeba..c632de6 100644
@@ -45,8 +45,12 @@
  /* Define actual evaluation board type from used processor type */
  #ifdef CONFIG_AT91SAM9G20

include/configs/tny_a9260.h line 56

Quoted 10 lines

include/configs/tny_a9260.h +4 -0

  # define CONFIG_TNY_A9G20
+# define MACH_TYPE_TNY_A9G20		2059
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9G20
  #else
  # define CONFIG_TNY_A9260
+# define MACH_TYPE_TNY_A9260		2058
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9260
  #endif
 
  /* ARM asynchronous clock */

Applied to u-boot-arm/master, thanks!

Amicalement,

Signature · 1 line

Albert.

Anatolij Gustschin

author

2011-11-19 11:59 UTC #25 lore raw

PATCH 7/9 ARM: xm250: re-add MACH_TYPE_XM250

In reply to Anatolij Gustschin

MACH_TYPE_XM250 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/xm250/xm250.c     |    3 ---
 include/configs/xm250.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

board/xm250/xm250.c +0 -3

index 3188cf2..ac32176 100644
@@ -60,9 +60,6 @@ board_init (void)
 	dcache_disable();
 	icache_disable();
 
-	/* arch number of MicroSys XM250 */
-	gd->bd->bi_arch_number = MACH_TYPE_XM250;
-
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;

include/configs/xm250.h +3 -0

index a35bce3..59a8e69 100644
@@ -37,6 +37,9 @@
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
 #define	CONFIG_SYS_TEXT_BASE	0x0
 
+#define MACH_TYPE_XM250		444
+#define CONFIG_MACH_TYPE	MACH_TYPE_XM250
+
 /* we will never enable dcache, because we have to setup MMU first */
 #define CONFIG_SYS_DCACHE_OFF

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 18:01 UTC #26 lore raw

PATCH 7/9 ARM: xm250: re-add MACH_TYPE_XM250

Quoted 4 lines · Anatolij Gustschin

MACH_TYPE_XM250 was removed from mach-types.h.
Add it to the board config file.
Signed-off-by Anatolij Gustschin <[email protected]>

I built this and it fixes the failure. I did not test on hardware.

Acked-by Simon Glass <[email protected]>

Quoted 41 lines

---
?board/xm250/xm250.c ? ? | ? ?3 ---
?include/configs/xm250.h | ? ?3 +++
?2 files changed, 3 insertions(+), 3 deletions(-)
board/xm250/xm250.c +0 -3
index 3188cf2..ac32176 100644
@@ -60,9 +60,6 @@ board_init (void)
 ? ? ? ?dcache_disable();
 ? ? ? ?icache_disable();
 
- ? ? ? /* arch number of MicroSys XM250 */
- ? ? ? gd->bd->bi_arch_number = MACH_TYPE_XM250;
-
? ? ? ?/* adress of boot parameters */
? ? ? ?gd->bd->bi_boot_params = 0xa0000100;
include/configs/xm250.h +0 -0
index a35bce3..59a8e69 100644
@@ -37,6 +37,9 @@
?#undef CONFIG_USE_IRQ ? ? ? ? ? ? ? ? ?/* we don't need IRQ/FIQ stuff ?*/ ?#define ? ? ? ?CONFIG_SYS_TEXT_BASE ? ?0x0
include/configs/xm250.h +3 -0
+#define MACH_TYPE_XM250 ? ? ? ? ? ? ? ?444
+#define CONFIG_MACH_TYPE ? ? ? MACH_TYPE_XM250
+
?/* we will never enable dcache, because we have to setup MMU first */ ?#define CONFIG_SYS_DCACHE_OFF
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Anatolij Gustschin

author

2011-11-19 11:59 UTC #27 lore raw

PATCH 8/9 ARM: cerf250: fix GCC 4.6 warings

In reply to Anatolij Gustschin

Fix:
flash.c: In function 'flash_erase':
flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/cerf250/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

board/cerf250/flash.c +3 -4

index e1e7807..bf8f0c9 100644
@@ -220,7 +220,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
 int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
-	int flag, prot, sect;
+	int prot, sect;
 	ulong type, start;
 	int rcode = 0;

@@ -255,7 +255,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 	}
 
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect <= s_last; sect++) {

@@ -389,7 +389,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 {
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
-	int flag;
 	ulong start;
 
 	/* Check if Flash is (sufficiently) erased */

@@ -398,7 +397,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	*addr = (FPW) 0x00400040;	/* write setup */
 	*addr = data;

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 18:04 UTC #28 lore raw

PATCH 8/9 ARM: cerf250: fix GCC 4.6 warings

Quoted 9 lines · Anatolij Gustschin

Fix:
flash.c: In function 'flash_erase':
flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
Signed-off-by Anatolij Gustschin <[email protected]>

Acked-by Simon Glass <[email protected]>

Quoted 51 lines

---
?board/cerf250/flash.c | ? ?7 +++----
?1 files changed, 3 insertions(+), 4 deletions(-)
board/cerf250/flash.c +1 -1
index e1e7807..bf8f0c9 100644
@@ -220,7 +220,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
 ?int flash_erase (flash_info_t *info, int s_first, int s_last)
 ?{
- ? ? ? int flag, prot, sect;
+ ? ? ? int prot, sect;
 ? ? ? ?ulong type, start;
 ? ? ? ?int rcode = 0;
 
@@ -255,7 +255,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 ? ? ? ?}
 
? ? ? ?/* Disable interrupts which might cause a timeout here */
- ? ? ? flag = disable_interrupts ();
+ ? ? ? disable_interrupts();
? ? ? ?/* Start erase on unprotected sectors */ ? ? ? ?for (sect = s_first; sect <= s_last; sect++) {
board/cerf250/flash.c +0 -1
@@ -389,7 +389,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 ?{
 ? ? ? ?FPWV *addr = (FPWV *) dest;
 ? ? ? ?ulong status;
- ? ? ? int flag;
 ? ? ? ?ulong start;
 
? ? ? ?/* Check if Flash is (sufficiently) erased */
board/cerf250/flash.c +0 -0
@@ -398,7 +397,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 ? ? ? ? ? ? ? ?return (2);
 ? ? ? ?}
? ? ? ?/* Disable interrupts which might cause a timeout here */
- ? ? ? flag = disable_interrupts ();
+ ? ? ? disable_interrupts();
? ? ? ?*addr = (FPW) 0x00400040; ? ? ? /* write setup */ ? ? ? ?*addr = data;
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Anatolij Gustschin

author

2011-11-19 11:59 UTC #29 lore raw

PATCH 9/9 ARM: xm250: Fix GCC 4.6 warnings

In reply to Anatolij Gustschin

Fix:
flash.c: In function 'flash_erase':
flash.c:252:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:421:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/xm250/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

board/xm250/flash.c +3 -4

index e825aba..b953502 100644
@@ -249,7 +249,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
 int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
-	int flag, prot, sect;
+	int prot, sect;
 	ulong type, start;
 	int rcode = 0;

@@ -284,7 +284,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 	}
 
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect <= s_last; sect++) {

@@ -418,7 +418,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 {
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
-	int flag;
 	ulong start;
 
 	/* Check if Flash is (sufficiently) erased */

@@ -427,7 +426,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	*addr = (FPW) 0x00400040;	/* write setup */
 	*addr = data;

Signature · 1 line

1.7.5.4

Simon Glass

2011-11-19 18:05 UTC #30 lore raw

PATCH 9/9 ARM: xm250: Fix GCC 4.6 warnings

Quoted 9 lines · Anatolij Gustschin

Fix:
flash.c: In function 'flash_erase':
flash.c:252:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:421:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
Signed-off-by Anatolij Gustschin <[email protected]>

I don't actually see this warning with my compiler, but it looks right.

Acked-by Simon Glass <[email protected]>

Quoted 51 lines

---
?board/xm250/flash.c | ? ?7 +++----
?1 files changed, 3 insertions(+), 4 deletions(-)
board/xm250/flash.c +1 -1
index e825aba..b953502 100644
@@ -249,7 +249,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
 ?int flash_erase (flash_info_t *info, int s_first, int s_last)
 ?{
- ? ? ? int flag, prot, sect;
+ ? ? ? int prot, sect;
 ? ? ? ?ulong type, start;
 ? ? ? ?int rcode = 0;
 
@@ -284,7 +284,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 ? ? ? ?}
 
? ? ? ?/* Disable interrupts which might cause a timeout here */
- ? ? ? flag = disable_interrupts ();
+ ? ? ? disable_interrupts();
? ? ? ?/* Start erase on unprotected sectors */ ? ? ? ?for (sect = s_first; sect <= s_last; sect++) {
board/xm250/flash.c +0 -1
@@ -418,7 +418,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 ?{
 ? ? ? ?FPWV *addr = (FPWV *) dest;
 ? ? ? ?ulong status;
- ? ? ? int flag;
 ? ? ? ?ulong start;
 
? ? ? ?/* Check if Flash is (sufficiently) erased */
board/xm250/flash.c +0 -0
@@ -427,7 +426,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 ? ? ? ? ? ? ? ?return (2);
 ? ? ? ?}
? ? ? ?/* Disable interrupts which might cause a timeout here */
- ? ? ? flag = disable_interrupts ();
+ ? ? ? disable_interrupts();
? ? ? ?*addr = (FPW) 0x00400040; ? ? ? /* write setup */ ? ? ? ?*addr = data;
--
1.7.5.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Marek Vasut

2011-11-21 22:39 UTC #31 lore raw

PATCH 9/9 ARM: xm250: Fix GCC 4.6 warnings

In reply to Anatolij Gustschin

Quoted 45 lines

Signed-off-by Anatolij Gustschin <[email protected]>

---
 board/xm250/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

board/xm250/flash.c +2 -3

index e825aba..b953502 100644
@@ -249,7 +249,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t
 *info)
 
 int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
-	int flag, prot, sect;
+	int prot, sect;
 	ulong type, start;
 	int rcode = 0;

@@ -284,7 +284,7 @@ int flash_erase (flash_info_t *info, int s_first, int
 s_last) }
 
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect <= s_last; sect++) {

@@ -418,7 +418,6 @@ static int write_data (flash_info_t *info, ulong dest,
 FPW data) {
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
-	int flag;
 	ulong start;
 
 	/* Check if Flash is (sufficiently) erased */

board/xm250/flash.c static int write_data (flash_info_t *info, ulong dest, · line 432

Quoted 8 lines

board/xm250/flash.c +1 -1

@@ -427,7 +426,7 @@ static int write_data (flash_info_t *info, ulong dest,
 FPW data) return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	*addr = (FPW) 0x00400040;	/* write setup */
 	*addr = data;

This one might as well be removed too ? No maintainer in MAINTAINERS so I guess it can.

Albert ARIBAUD

2011-11-21 16:45 UTC #32 lore raw

cover Fix build issues for some ARM boards

In reply to Anatolij Gustschin

Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a ?crit :

Quoted 13 lines

Build breakage still pollutes the MAKEALL log. Fix build problems for some ARM based boards. The patches can be pulled from
git://git.denx.de/u-boot-video.git arm-fixes
I also fixed davinci_schmoogie and davinci_sonata, but there are already patches for these on the patchwork [1], [2], so I do not include them to this patch series.
[1] http://patchwork.ozlabs.org/patch/126534/
[2] http://patchwork.ozlabs.org/patch/126535/

Quoted 10 lines

Anatolij Gustschin (9):
ARM: a320evb: re-add MACH_TYPE_FARADAY
ARM: cerf250: re-add MACH_TYPE_PXA_CERF
ARM: cradle: re-add MACH_TYPE_HHP_CRADLE
ARM: pleb2: re-add MACH_TYPE_PLEB2
ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
ARM: xm250: re-add MACH_TYPE_XM250
ARM: cerf250: fix GCC 4.6 warings
ARM: xm250: Fix GCC 4.6 warnings

Can you Cc: the respective board maintainers?

Amicalement,

Signature · 1 line

Albert.

Anatolij Gustschin

author

2011-11-21 19:24 UTC #33 lore raw

cover Fix build issues for some ARM boards

Hi Albert,

On Mon, 21 Nov 2011 17:45:51 +0100
Albert ARIBAUD <[email protected]> wrote:
...

Quoted 11 lines

Quoted 9 lines
ARM: a320evb: re-add MACH_TYPE_FARADAY
ARM: cerf250: re-add MACH_TYPE_PXA_CERF
ARM: cradle: re-add MACH_TYPE_HHP_CRADLE
ARM: pleb2: re-add MACH_TYPE_PLEB2
ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
ARM: xm250: re-add MACH_TYPE_XM250
ARM: cerf250: fix GCC 4.6 warings
ARM: xm250: Fix GCC 4.6 warnings
Can you Cc: the respective board maintainers?

There is no maintainer for cerf250, cradle, pleb2 and xm250. The address <[email protected]> of the a320evb board maintainer doesn't exist. I've send an email to sbc35_a9g20 and tny_a9260 maintainer and asked for review.

Thanks,
Anatolij