All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards
@ 2011-11-19 11:59 Anatolij Gustschin
  2011-11-19 11:59 ` [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY Anatolij Gustschin
                   ` (9 more replies)
  0 siblings, 10 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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(-)

-- 
1.7.5.4

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 17:56   ` Simon Glass
  2011-11-21 18:46   ` Anatolij Gustschin
  2011-11-19 11:59 ` [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF Anatolij Gustschin
                   ` (8 subsequent siblings)
  9 siblings, 2 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/faraday/a320evb/a320evb.c |    1 -
 include/configs/a320evb.h       |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
index 2578be4..dfd186b 100644
--- a/board/faraday/a320evb/a320evb.c
+++ b/board/faraday/a320evb/a320evb.c
@@ -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 */
diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 45a7c53..2904e2e 100644
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -37,6 +37,9 @@
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 
+#define MACH_TYPE_FARADAY	758
+#define CONFIG_MACH_TYPE	MACH_TYPE_FARADAY
+
 /*
  * Power Management Unit
  */
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
  2011-11-19 11:59 ` [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 17:56   ` Simon Glass
  2011-11-19 11:59 ` [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE Anatolij Gustschin
                   ` (7 subsequent siblings)
  9 siblings, 1 reply; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/cerf250/cerf250.c   |    3 ---
 include/configs/cerf250.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
index 043afea..615c288 100644
--- a/board/cerf250/cerf250.c
+++ b/board/cerf250/cerf250.c
@@ -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;
 
diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index 70427da..dde9e14 100644
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -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

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
  2011-11-19 11:59 ` [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY Anatolij Gustschin
  2011-11-19 11:59 ` [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 17:57   ` Simon Glass
  2011-11-21 22:28   ` Marek Vasut
  2011-11-19 11:59 ` [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2 Anatolij Gustschin
                   ` (6 subsequent siblings)
  9 siblings, 2 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/cradle/cradle.c    |    3 ---
 include/configs/cradle.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c
index 2bbf2d5..e9f38f8 100644
--- a/board/cradle/cradle.c
+++ b/board/cradle/cradle.c
@@ -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;
 
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index 25be616..d56deee 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -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 */
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (2 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 17:57   ` Simon Glass
  2011-11-21 22:29   ` Marek Vasut
  2011-11-19 11:59 ` [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20 Anatolij Gustschin
                   ` (5 subsequent siblings)
  9 siblings, 2 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/pleb2/pleb2.c     |    3 ---
 include/configs/pleb2.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c
index 5a16cc7..ebb6180 100644
--- a/board/pleb2/pleb2.c
+++ b/board/pleb2/pleb2.c
@@ -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;
 
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 2aeb7fb..4031d61 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -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
 
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (3 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2 Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 17:58   ` Simon Glass
                     ` (2 more replies)
  2011-11-19 11:59 ` [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 Anatolij Gustschin
                   ` (4 subsequent siblings)
  9 siblings, 3 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
 include/configs/sbc35_a9g20.h         |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
index 5f448d9..446afb2 100644
--- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
+++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
@@ -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;
 
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index 1e355a8..cdf8659 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -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 */
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (4 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20 Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 18:00   ` Simon Glass
                     ` (2 more replies)
  2011-11-19 11:59 ` [U-Boot] [PATCH 7/9] ARM: xm250: re-add MACH_TYPE_XM250 Anatolij Gustschin
                   ` (3 subsequent siblings)
  9 siblings, 3 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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 <agust@denx.de>
---
 board/calao/tny_a9260/tny_a9260.c |    5 -----
 include/configs/tny_a9260.h       |    4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
index ab51a33..a472b91 100644
--- a/board/calao/tny_a9260/tny_a9260.c
+++ b/board/calao/tny_a9260/tny_a9260.c
@@ -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;
 
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 986aeba..c632de6 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -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 */
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 7/9] ARM: xm250: re-add MACH_TYPE_XM250
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (5 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 18:01   ` Simon Glass
  2011-11-19 11:59 ` [U-Boot] [PATCH 8/9] ARM: cerf250: fix GCC 4.6 warings Anatolij Gustschin
                   ` (2 subsequent siblings)
  9 siblings, 1 reply; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/xm250/xm250.c     |    3 ---
 include/configs/xm250.h |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/xm250/xm250.c b/board/xm250/xm250.c
index 3188cf2..ac32176 100644
--- a/board/xm250/xm250.c
+++ b/board/xm250/xm250.c
@@ -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;
 
diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index a35bce3..59a8e69 100644
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -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
 
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 8/9] ARM: cerf250: fix GCC 4.6 warings
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (6 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 7/9] ARM: xm250: re-add MACH_TYPE_XM250 Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 18:04   ` Simon Glass
  2011-11-19 11:59 ` [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings Anatolij Gustschin
  2011-11-21 16:45 ` [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Albert ARIBAUD
  9 siblings, 1 reply; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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 <agust@denx.de>
---
 board/cerf250/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
index e1e7807..bf8f0c9 100644
--- a/board/cerf250/flash.c
+++ b/board/cerf250/flash.c
@@ -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;
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (7 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 8/9] ARM: cerf250: fix GCC 4.6 warings Anatolij Gustschin
@ 2011-11-19 11:59 ` Anatolij Gustschin
  2011-11-19 18:05   ` Simon Glass
  2011-11-21 22:39   ` Marek Vasut
  2011-11-21 16:45 ` [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Albert ARIBAUD
  9 siblings, 2 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-19 11:59 UTC (permalink / raw)
  To: u-boot

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 <agust@denx.de>
---
 board/xm250/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/board/xm250/flash.c b/board/xm250/flash.c
index e825aba..b953502 100644
--- a/board/xm250/flash.c
+++ b/board/xm250/flash.c
@@ -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;
-- 
1.7.5.4

^ permalink raw reply related	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY
  2011-11-19 11:59 ` [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY Anatolij Gustschin
@ 2011-11-19 17:56   ` Simon Glass
  2011-11-21 18:46   ` Anatolij Gustschin
  1 sibling, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 17:56 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_FARADAY was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/faraday/a320evb/a320evb.c | ? ?1 -
> ?include/configs/a320evb.h ? ? ? | ? ?3 +++
> ?2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
> index 2578be4..dfd186b 100644
> --- a/board/faraday/a320evb/a320evb.c
> +++ b/board/faraday/a320evb/a320evb.c
> @@ -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 */
> diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
> index 45a7c53..2904e2e 100644
> --- a/include/configs/a320evb.h
> +++ b/include/configs/a320evb.h
> @@ -37,6 +37,9 @@
>
> ?#undef CONFIG_SKIP_LOWLEVEL_INIT
>
> +#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
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF
  2011-11-19 11:59 ` [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF Anatolij Gustschin
@ 2011-11-19 17:56   ` Simon Glass
  2011-11-20  0:09     ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Simon Glass @ 2011-11-19 17:56 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_PXA_CERF was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/cerf250/cerf250.c ? | ? ?3 ---
> ?include/configs/cerf250.h | ? ?3 +++
> ?2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
> index 043afea..615c288 100644
> --- a/board/cerf250/cerf250.c
> +++ b/board/cerf250/cerf250.c
> @@ -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;
>
> diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
> index 70427da..dde9e14 100644
> --- a/include/configs/cerf250.h
> +++ b/include/configs/cerf250.h
> @@ -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
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE
  2011-11-19 11:59 ` [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE Anatolij Gustschin
@ 2011-11-19 17:57   ` Simon Glass
  2011-11-21 22:28   ` Marek Vasut
  1 sibling, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 17:57 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_HHP_CRADLE was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/cradle/cradle.c ? ?| ? ?3 ---
> ?include/configs/cradle.h | ? ?3 +++
> ?2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c
> index 2bbf2d5..e9f38f8 100644
> --- a/board/cradle/cradle.c
> +++ b/board/cradle/cradle.c
> @@ -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;
>
> diff --git a/include/configs/cradle.h b/include/configs/cradle.h
> index 25be616..d56deee 100644
> --- a/include/configs/cradle.h
> +++ b/include/configs/cradle.h
> @@ -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 */
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2
  2011-11-19 11:59 ` [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2 Anatolij Gustschin
@ 2011-11-19 17:57   ` Simon Glass
  2011-11-21 22:29   ` Marek Vasut
  1 sibling, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 17:57 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_PLEB2 was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/pleb2/pleb2.c ? ? | ? ?3 ---
> ?include/configs/pleb2.h | ? ?3 +++
> ?2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c
> index 5a16cc7..ebb6180 100644
> --- a/board/pleb2/pleb2.c
> +++ b/board/pleb2/pleb2.c
> @@ -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;
>
> diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
> index 2aeb7fb..4031d61 100644
> --- a/include/configs/pleb2.h
> +++ b/include/configs/pleb2.h
> @@ -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
>
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
  2011-11-19 11:59 ` [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20 Anatolij Gustschin
@ 2011-11-19 17:58   ` Simon Glass
  2011-11-21 18:55   ` Anatolij Gustschin
  2011-12-19 10:58   ` Albert ARIBAUD
  2 siblings, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 17:58 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/calao/sbc35_a9g20/sbc35_a9g20.c | ? ?1 -
> ?include/configs/sbc35_a9g20.h ? ? ? ? | ? ?3 +++
> ?2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index 5f448d9..446afb2 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -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;
>
> diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
> index 1e355a8..cdf8659 100644
> --- a/include/configs/sbc35_a9g20.h
> +++ b/include/configs/sbc35_a9g20.h
> @@ -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 */
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
  2011-11-19 11:59 ` [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 Anatolij Gustschin
@ 2011-11-19 18:00   ` Simon Glass
  2011-11-21 18:57   ` Anatolij Gustschin
  2011-12-19 10:58   ` Albert ARIBAUD
  2 siblings, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 18:00 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> 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 <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/calao/tny_a9260/tny_a9260.c | ? ?5 -----
> ?include/configs/tny_a9260.h ? ? ? | ? ?4 ++++
> ?2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index ab51a33..a472b91 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -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;
>
> diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
> index 986aeba..c632de6 100644
> --- a/include/configs/tny_a9260.h
> +++ b/include/configs/tny_a9260.h
> @@ -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

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

>
> ?/* 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
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 7/9] ARM: xm250: re-add MACH_TYPE_XM250
  2011-11-19 11:59 ` [U-Boot] [PATCH 7/9] ARM: xm250: re-add MACH_TYPE_XM250 Anatolij Gustschin
@ 2011-11-19 18:01   ` Simon Glass
  0 siblings, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 18:01 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_XM250 was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/xm250/xm250.c ? ? | ? ?3 ---
> ?include/configs/xm250.h | ? ?3 +++
> ?2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/board/xm250/xm250.c b/board/xm250/xm250.c
> index 3188cf2..ac32176 100644
> --- a/board/xm250/xm250.c
> +++ b/board/xm250/xm250.c
> @@ -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;
>
> diff --git a/include/configs/xm250.h b/include/configs/xm250.h
> index a35bce3..59a8e69 100644
> --- a/include/configs/xm250.h
> +++ b/include/configs/xm250.h
> @@ -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
>
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 8/9] ARM: cerf250: fix GCC 4.6 warings
  2011-11-19 11:59 ` [U-Boot] [PATCH 8/9] ARM: cerf250: fix GCC 4.6 warings Anatolij Gustschin
@ 2011-11-19 18:04   ` Simon Glass
  0 siblings, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 18:04 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> 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 <agust@denx.de>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/cerf250/flash.c | ? ?7 +++----
> ?1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/board/cerf250/flash.c b/board/cerf250/flash.c
> index e1e7807..bf8f0c9 100644
> --- a/board/cerf250/flash.c
> +++ b/board/cerf250/flash.c
> @@ -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;
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings
  2011-11-19 11:59 ` [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings Anatolij Gustschin
@ 2011-11-19 18:05   ` Simon Glass
  2011-11-21 22:39   ` Marek Vasut
  1 sibling, 0 replies; 34+ messages in thread
From: Simon Glass @ 2011-11-19 18:05 UTC (permalink / raw)
  To: u-boot

On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> 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 <agust@denx.de>

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

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/xm250/flash.c | ? ?7 +++----
> ?1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/board/xm250/flash.c b/board/xm250/flash.c
> index e825aba..b953502 100644
> --- a/board/xm250/flash.c
> +++ b/board/xm250/flash.c
> @@ -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;
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF
  2011-11-19 17:56   ` Simon Glass
@ 2011-11-20  0:09     ` Marek Vasut
  2011-11-20  0:18       ` Marek Vasut
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2011-11-20  0:09 UTC (permalink / raw)
  To: u-boot

> On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> > MACH_TYPE_PXA_CERF was removed from mach-types.h.
> > Add it to the board config file.
> > 
> > Signed-off-by: Anatolij Gustschin <agust@denx.de>
> 
> I built this and it fixes the failure. I did not test on hardware.
> 
> Acked-by: Simon Glass <sjg@chromium.org>

Good, CCing original maintainer.

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

M

> 
> > ---
> >  board/cerf250/cerf250.c   |    3 ---
> >  include/configs/cerf250.h |    3 +++
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
> > index 043afea..615c288 100644
> > --- a/board/cerf250/cerf250.c
> > +++ b/board/cerf250/cerf250.c
> > @@ -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;
> > 
> > diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
> > index 70427da..dde9e14 100644
> > --- a/include/configs/cerf250.h
> > +++ b/include/configs/cerf250.h
> > @@ -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
> > 
> > _______________________________________________
> > 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

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF
  2011-11-20  0:09     ` Marek Vasut
@ 2011-11-20  0:18       ` Marek Vasut
  2011-11-21 16:44         ` Albert ARIBAUD
  0 siblings, 1 reply; 34+ messages in thread
From: Marek Vasut @ 2011-11-20  0:18 UTC (permalink / raw)
  To: u-boot

> > On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> > > MACH_TYPE_PXA_CERF was removed from mach-types.h.
> > > Add it to the board config file.
> > > 
> > > Signed-off-by: Anatolij Gustschin <agust@denx.de>
> > 
> > I built this and it fixes the failure. I did not test on hardware.
> > 
> > Acked-by: Simon Glass <sjg@chromium.org>
> 
> 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?

M
> 
> > > ---
> > > 
> > >  board/cerf250/cerf250.c   |    3 ---
> > >  include/configs/cerf250.h |    3 +++
> > >  2 files changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
> > > index 043afea..615c288 100644
> > > --- a/board/cerf250/cerf250.c
> > > +++ b/board/cerf250/cerf250.c
> > > @@ -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;
> > > 
> > > diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
> > > index 70427da..dde9e14 100644
> > > --- a/include/configs/cerf250.h
> > > +++ b/include/configs/cerf250.h
> > > @@ -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
> > > 
> > > _______________________________________________
> > > 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

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF
  2011-11-20  0:18       ` Marek Vasut
@ 2011-11-21 16:44         ` Albert ARIBAUD
  0 siblings, 0 replies; 34+ messages in thread
From: Albert ARIBAUD @ 2011-11-21 16:44 UTC (permalink / raw)
  To: u-boot

Hi Marek,

> 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,
-- 
Albert.

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards
  2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
                   ` (8 preceding siblings ...)
  2011-11-19 11:59 ` [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings Anatolij Gustschin
@ 2011-11-21 16:45 ` Albert ARIBAUD
  2011-11-21 19:24   ` Anatolij Gustschin
  9 siblings, 1 reply; 34+ messages in thread
From: Albert ARIBAUD @ 2011-11-21 16:45 UTC (permalink / raw)
  To: u-boot

Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a ?crit :
> 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

Can you Cc: the respective board maintainers?

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY
  2011-11-19 11:59 ` [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY Anatolij Gustschin
  2011-11-19 17:56   ` Simon Glass
@ 2011-11-21 18:46   ` Anatolij Gustschin
  2011-11-22  3:18     ` Po-Yu Chuang
  1 sibling, 1 reply; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-21 18:46 UTC (permalink / raw)
  To: u-boot

Dear Po-Yu Chuang,

On Sat, 19 Nov 2011 12:59:08 +0100
Anatolij Gustschin <agust@denx.de> 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

> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/faraday/a320evb/a320evb.c |    1 -
>  include/configs/a320evb.h       |    3 +++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
> index 2578be4..dfd186b 100644
> --- a/board/faraday/a320evb/a320evb.c
> +++ b/board/faraday/a320evb/a320evb.c
> @@ -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 */
> diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
> index 45a7c53..2904e2e 100644
> --- a/include/configs/a320evb.h
> +++ b/include/configs/a320evb.h
> @@ -37,6 +37,9 @@
>  
>  #undef CONFIG_SKIP_LOWLEVEL_INIT
>  
> +#define MACH_TYPE_FARADAY	758
> +#define CONFIG_MACH_TYPE	MACH_TYPE_FARADAY
> +
>  /*
>   * Power Management Unit
>   */

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
  2011-11-19 11:59 ` [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20 Anatolij Gustschin
  2011-11-19 17:58   ` Simon Glass
@ 2011-11-21 18:55   ` Anatolij Gustschin
  2011-12-19 10:58   ` Albert ARIBAUD
  2 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-21 18:55 UTC (permalink / raw)
  To: u-boot

Dear Albin Tonnerre,

On Sat, 19 Nov 2011 12:59:12 +0100
Anatolij Gustschin <agust@denx.de> 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

> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
>  include/configs/sbc35_a9g20.h         |    3 +++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index 5f448d9..446afb2 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -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;
>  
> diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
> index 1e355a8..cdf8659 100644
> --- a/include/configs/sbc35_a9g20.h
> +++ b/include/configs/sbc35_a9g20.h
> @@ -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 */

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
  2011-11-19 11:59 ` [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 Anatolij Gustschin
  2011-11-19 18:00   ` Simon Glass
@ 2011-11-21 18:57   ` Anatolij Gustschin
  2011-12-19 10:58   ` Albert ARIBAUD
  2 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-21 18:57 UTC (permalink / raw)
  To: u-boot

Dear Albin Tonnerre,

On Sat, 19 Nov 2011 12:59:13 +0100
Anatolij Gustschin <agust@denx.de> 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

> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/calao/tny_a9260/tny_a9260.c |    5 -----
>  include/configs/tny_a9260.h       |    4 ++++
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index ab51a33..a472b91 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -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;
>  
> diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
> index 986aeba..c632de6 100644
> --- a/include/configs/tny_a9260.h
> +++ b/include/configs/tny_a9260.h
> @@ -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 */

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards
  2011-11-21 16:45 ` [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Albert ARIBAUD
@ 2011-11-21 19:24   ` Anatolij Gustschin
  0 siblings, 0 replies; 34+ messages in thread
From: Anatolij Gustschin @ 2011-11-21 19:24 UTC (permalink / raw)
  To: u-boot

Hi Albert,

On Mon, 21 Nov 2011 17:45:51 +0100
Albert ARIBAUD <albert.u.boot@aribaud.net> wrote:
...
> >    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 <ratbert@faraday-tech.com> 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

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE
  2011-11-19 11:59 ` [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE Anatolij Gustschin
  2011-11-19 17:57   ` Simon Glass
@ 2011-11-21 22:28   ` Marek Vasut
  1 sibling, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2011-11-21 22:28 UTC (permalink / raw)
  To: u-boot

> MACH_TYPE_HHP_CRADLE was removed from mach-types.h.
> Add it to the board config file.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/cradle/cradle.c    |    3 ---
>  include/configs/cradle.h |    3 +++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c
> index 2bbf2d5..e9f38f8 100644
> --- a/board/cradle/cradle.c
> +++ b/board/cradle/cradle.c
> @@ -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;
> 
> diff --git a/include/configs/cradle.h b/include/configs/cradle.h
> index 25be616..d56deee 100644
> --- a/include/configs/cradle.h
> +++ b/include/configs/cradle.h
> @@ -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).

M

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2
  2011-11-19 11:59 ` [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2 Anatolij Gustschin
  2011-11-19 17:57   ` Simon Glass
@ 2011-11-21 22:29   ` Marek Vasut
  1 sibling, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2011-11-21 22:29 UTC (permalink / raw)
  To: u-boot

> MACH_TYPE_PLEB2 was removed from mach-types.h.
> Add it to the board config file.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/pleb2/pleb2.c     |    3 ---
>  include/configs/pleb2.h |    3 +++
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/board/pleb2/pleb2.c b/board/pleb2/pleb2.c
> index 5a16cc7..ebb6180 100644
> --- a/board/pleb2/pleb2.c
> +++ b/board/pleb2/pleb2.c
> @@ -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;
> 
> diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
> index 2aeb7fb..4031d61 100644
> --- a/include/configs/pleb2.h
> +++ b/include/configs/pleb2.h
> @@ -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

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

M

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings
  2011-11-19 11:59 ` [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings Anatolij Gustschin
  2011-11-19 18:05   ` Simon Glass
@ 2011-11-21 22:39   ` Marek Vasut
  1 sibling, 0 replies; 34+ messages in thread
From: Marek Vasut @ 2011-11-21 22:39 UTC (permalink / raw)
  To: u-boot

> 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 <agust@denx.de>
> ---
>  board/xm250/flash.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/board/xm250/flash.c b/board/xm250/flash.c
> index e825aba..b953502 100644
> --- a/board/xm250/flash.c
> +++ b/board/xm250/flash.c
> @@ -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;

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

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY
  2011-11-21 18:46   ` Anatolij Gustschin
@ 2011-11-22  3:18     ` Po-Yu Chuang
  2011-11-22  3:45       ` Po-Yu Chuang
  0 siblings, 1 reply; 34+ messages in thread
From: Po-Yu Chuang @ 2011-11-22  3:18 UTC (permalink / raw)
  To: u-boot

Dear Anatolij,

On Tue, Nov 22, 2011 at 2:46 AM, Anatolij Gustschin <agust@denx.de> wrote:
> Dear Po-Yu Chuang,
>
> On Sat, 19 Nov 2011 12:59:08 +0100
> Anatolij Gustschin <agust@denx.de> 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
>
>>
>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>> ---
>> ?board/faraday/a320evb/a320evb.c | ? ?1 -
>> ?include/configs/a320evb.h ? ? ? | ? ?3 +++
>> ?2 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c
>> index 2578be4..dfd186b 100644
>> --- a/board/faraday/a320evb/a320evb.c
>> +++ b/board/faraday/a320evb/a320evb.c
>> @@ -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 */
>> diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
>> index 45a7c53..2904e2e 100644
>> --- a/include/configs/a320evb.h
>> +++ b/include/configs/a320evb.h
>> @@ -37,6 +37,9 @@
>>
>> ?#undef CONFIG_SKIP_LOWLEVEL_INIT
>>
>> +#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 <ratbert.chuang@gmail.com>

Best regards,
Po-Yu Chuang

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY
  2011-11-22  3:18     ` Po-Yu Chuang
@ 2011-11-22  3:45       ` Po-Yu Chuang
  0 siblings, 0 replies; 34+ messages in thread
From: Po-Yu Chuang @ 2011-11-22  3:45 UTC (permalink / raw)
  To: u-boot

Dear Anatolij,

On Tue, Nov 22, 2011 at 11:18 AM, Po-Yu Chuang <ratbert.chuang@gmail.com> wrote:
> Dear Anatolij,
>
> On Tue, Nov 22, 2011 at 2:46 AM, Anatolij Gustschin <agust@denx.de> wrote:
>> Dear Po-Yu Chuang,
>>
>> On Sat, 19 Nov 2011 12:59:08 +0100
>> Anatolij Gustschin <agust@denx.de> 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
>>
>>>
>>> Signed-off-by: Anatolij Gustschin <agust@denx.de>

[snip]

>
> Thanks for your patch and sorry I did not notice it.
>
> Acked-by: Po-Yu Chuang <ratbert.chuang@gmail.com>
>
> 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

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260
  2011-11-19 11:59 ` [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 Anatolij Gustschin
  2011-11-19 18:00   ` Simon Glass
  2011-11-21 18:57   ` Anatolij Gustschin
@ 2011-12-19 10:58   ` Albert ARIBAUD
  2 siblings, 0 replies; 34+ messages in thread
From: Albert ARIBAUD @ 2011-12-19 10:58 UTC (permalink / raw)
  To: u-boot

Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a ?crit :
> 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<agust@denx.de>
> ---
>   board/calao/tny_a9260/tny_a9260.c |    5 -----
>   include/configs/tny_a9260.h       |    4 ++++
>   2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index ab51a33..a472b91 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -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;
>
> diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
> index 986aeba..c632de6 100644
> --- a/include/configs/tny_a9260.h
> +++ b/include/configs/tny_a9260.h
> @@ -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 */

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

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 34+ messages in thread
* [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20
  2011-11-19 11:59 ` [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20 Anatolij Gustschin
  2011-11-19 17:58   ` Simon Glass
  2011-11-21 18:55   ` Anatolij Gustschin
@ 2011-12-19 10:58   ` Albert ARIBAUD
  2 siblings, 0 replies; 34+ messages in thread
From: Albert ARIBAUD @ 2011-12-19 10:58 UTC (permalink / raw)
  To: u-boot

Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a ?crit :
> MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin<agust@denx.de>
> ---
>   board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
>   include/configs/sbc35_a9g20.h         |    3 +++
>   2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index 5f448d9..446afb2 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -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;
>
> diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
> index 1e355a8..cdf8659 100644
> --- a/include/configs/sbc35_a9g20.h
> +++ b/include/configs/sbc35_a9g20.h
> @@ -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,
-- 
Albert.

^ permalink raw reply	[flat|nested] 34+ messages in thread
end of thread, other threads:[~2011-12-19 10:58 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-19 11:59 [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Anatolij Gustschin
2011-11-19 11:59 ` [U-Boot] [PATCH 1/9] ARM: a320evb: re-add MACH_TYPE_FARADAY Anatolij Gustschin
2011-11-19 17:56   ` Simon Glass
2011-11-21 18:46   ` Anatolij Gustschin
2011-11-22  3:18     ` Po-Yu Chuang
2011-11-22  3:45       ` Po-Yu Chuang
2011-11-19 11:59 ` [U-Boot] [PATCH 2/9] ARM: cerf250: re-add MACH_TYPE_PXA_CERF Anatolij Gustschin
2011-11-19 17:56   ` Simon Glass
2011-11-20  0:09     ` Marek Vasut
2011-11-20  0:18       ` Marek Vasut
2011-11-21 16:44         ` Albert ARIBAUD
2011-11-19 11:59 ` [U-Boot] [PATCH 3/9] ARM: cradle: re-add MACH_TYPE_HHP_CRADLE Anatolij Gustschin
2011-11-19 17:57   ` Simon Glass
2011-11-21 22:28   ` Marek Vasut
2011-11-19 11:59 ` [U-Boot] [PATCH 4/9] ARM: pleb2: re-add MACH_TYPE_PLEB2 Anatolij Gustschin
2011-11-19 17:57   ` Simon Glass
2011-11-21 22:29   ` Marek Vasut
2011-11-19 11:59 ` [U-Boot] [PATCH 5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20 Anatolij Gustschin
2011-11-19 17:58   ` Simon Glass
2011-11-21 18:55   ` Anatolij Gustschin
2011-12-19 10:58   ` Albert ARIBAUD
2011-11-19 11:59 ` [U-Boot] [PATCH 6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 Anatolij Gustschin
2011-11-19 18:00   ` Simon Glass
2011-11-21 18:57   ` Anatolij Gustschin
2011-12-19 10:58   ` Albert ARIBAUD
2011-11-19 11:59 ` [U-Boot] [PATCH 7/9] ARM: xm250: re-add MACH_TYPE_XM250 Anatolij Gustschin
2011-11-19 18:01   ` Simon Glass
2011-11-19 11:59 ` [U-Boot] [PATCH 8/9] ARM: cerf250: fix GCC 4.6 warings Anatolij Gustschin
2011-11-19 18:04   ` Simon Glass
2011-11-19 11:59 ` [U-Boot] [PATCH 9/9] ARM: xm250: Fix GCC 4.6 warnings Anatolij Gustschin
2011-11-19 18:05   ` Simon Glass
2011-11-21 22:39   ` Marek Vasut
2011-11-21 16:45 ` [U-Boot] [PATCH 0/9] Fix build issues for some ARM boards Albert ARIBAUD
2011-11-21 19:24   ` Anatolij Gustschin

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