Re: [U-Boot] [PATCH ATMEL REWORK][V2] update arm/at91rm9200 work with rework rework110202

2011-02-19 Thread Jens Scharsig 
Am 11.02.2011 21:13, schrieb Wolfgang Denk:
 Dear Reinhard Meyer,
 
 In message 4d5597a8.9050...@emk-elektronik.de you wrote:
 Dear Wolfgang Denk,
 Dear Jens Scharsig,

 In message4d5573ca.9000...@scharsoft.de  you wrote:
   * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
   * Fix: timer.c compile error io.h not found with arm/at91rm9200
   * update arm920t/at91 to ATMEL_xxx name scheme
   * update arm920t/at91 soc lib
   * update at91_emac driver
 ...
   /* Port B */
 -#define AT91_PMX_BA_ERXCK 0x0008
 -#define AT91_PMX_BA_ECOL  0x0004
 -#define AT91_PMX_BA_ERXDV 0x0002
 -#define AT91_PMX_BA_ERX3  0x0001
 -#define AT91_PMX_BA_ERX2  0x8000
 ^^^

 Please, no space before tabs
 Those lines that are being removed by the patch.
 
 Oops. I marked the wrong line.
 
 I meant this one:
 
 - checkpatch ~/Mail/U-Boot/3377
 WARNING: please, no space before tabs
 #379: FILE: arch/arm/include/asm/arch-at91/at91rm9200.h:112:
 +#define ATMEL_PMX_BA_ERX2 ^I0x8000$
 
 
 
 Best regards,
 
 Wolfgang Denk
 
I don't know, why my checkpatch version does not report this.
But I have fix this in V3 of the Patch.

Best regards,

Jens Scharsig



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

Re: [U-Boot] [PATCH ATMEL REWORK][V2] update arm/at91rm9200 work with rework rework110202

2011-02-19 Thread Wolfgang Denk 
Dear Jens Scharsig,

In message 4d5fee3d.2000...@scharsoft.de you wrote:

 I don't know, why my checkpatch version does not report this.

Try and update against curent Linux kernel version.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
In an organization, each person rises to the level of his own  incom-
petency - The Peter Principle
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH ATMEL REWORK][V2] update arm/at91rm9200 work with rework rework110202

2011-02-11 Thread Jens Scharsig 
 * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
 * Fix: timer.c compile error io.h not found with arm/at91rm9200
 * update arm920t/at91 to ATMEL_xxx name scheme
 * update arm920t/at91 soc lib
 * update at91_emac driver


Signed-off-by: Jens Scharsig js_at...@scharsoft.de
---
 arch/arm/cpu/arm920t/at91/reset.c   |2 +-
 arch/arm/cpu/arm920t/at91/timer.c   |   12 +-
 arch/arm/include/asm/arch-at91/at91_mc.h|   12 +-
 arch/arm/include/asm/arch-at91/at91_pmc.h   |   10 +-
 arch/arm/include/asm/arch-at91/at91rm9200.h |  209 ++-
 board/BuS/eb_cpux9k2/cpux9k2.c  |   52 
 board/atmel/at91rm9200ek/at91rm9200ek.c |4 +-
 board/atmel/at91rm9200ek/led.c  |   22 ++--
 drivers/net/at91_emac.c |   32 ++--
 include/configs/at91rm9200ek.h  |5 +-
 include/configs/eb_cpux9k2.h|   23 ++--
 11 files changed, 196 insertions(+), 187 deletions(-)

diff --git a/arch/arm/cpu/arm920t/at91/reset.c 
b/arch/arm/cpu/arm920t/at91/reset.c
index 51043ec..4fa0f98 100644
--- a/arch/arm/cpu/arm920t/at91/reset.c
+++ b/arch/arm/cpu/arm920t/at91/reset.c
@@ -42,7 +42,7 @@ void  __attribute__((weak)) board_reset(void)
 
 void reset_cpu(ulong ignored)
 {
-   at91_st_t *st = (at91_st_t *) AT91_ST_BASE;
+   at91_st_t *st = (at91_st_t *) ATMEL_BASE_ST;
 #if defined(CONFIG_AT91RM9200_USART)
/*shutdown the console to avoid strange chars during reset */
serial_exit();
diff --git a/arch/arm/cpu/arm920t/at91/timer.c 
b/arch/arm/cpu/arm920t/at91/timer.c
index d9a024f..f0ad7d6 100644
--- a/arch/arm/cpu/arm920t/at91/timer.c
+++ b/arch/arm/cpu/arm920t/at91/timer.c
@@ -32,7 +32,7 @@
 
 #include common.h
 
-#include asm/arch/io.h
+#include asm/io.h
 #include asm/arch/hardware.h
 #include asm/arch/at91_tc.h
 #include asm/arch/at91_pmc.h
@@ -44,11 +44,11 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int timer_init(void)
 {
-   at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
-   at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE;
+   at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
+   at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
 
/* enables TC1.0 clock */
-   writel(1  AT91_ID_TC0, pmc-pcer);   /* enable clock */
+   writel(1  ATMEL_ID_TC0, pmc-pcer);  /* enable clock */
 
writel(0, tc-bcr);
writel(AT91_TC_BMR_TC0XC0S_NONE | AT91_TC_BMR_TC1XC1S_NONE |
@@ -96,14 +96,14 @@ void __udelay(unsigned long usec)
 void reset_timer_masked(void)
 {
/* reset time */
-   at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
+   at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
gd-lastinc = readl(tc-tc[0].cv)  0x;
gd-tbl = 0;
 }
 
 ulong get_timer_raw(void)
 {
-   at91_tc_t *tc = (at91_tc_t *) AT91_TC_BASE;
+   at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
u32 now;
 
now = readl(tc-tc[0].cv)  0x;
diff --git a/arch/arm/include/asm/arch-at91/at91_mc.h 
b/arch/arm/include/asm/arch-at91/at91_mc.h
index acfbd10..e0d1320 100644
--- a/arch/arm/include/asm/arch-at91/at91_mc.h
+++ b/arch/arm/include/asm/arch-at91/at91_mc.h
@@ -23,12 +23,12 @@
 #ifndef AT91_MC_H
 #define AT91_MC_H
 
-#define AT91_ASM_MC_EBI_CSA(AT91_MC_BASE + 0x60)
-#define AT91_ASM_MC_EBI_CFG(AT91_MC_BASE + 0x64)
-#define AT91_ASM_MC_SMC_CSR0   (AT91_MC_BASE + 0x70)
-#define AT91_ASM_MC_SDRAMC_MR  (AT91_MC_BASE + 0x90)
-#define AT91_ASM_MC_SDRAMC_TR  (AT91_MC_BASE + 0x94)
-#define AT91_ASM_MC_SDRAMC_CR  (AT91_MC_BASE + 0x98)
+#define AT91_ASM_MC_EBI_CSA(ATMEL_BASE_MC + 0x60)
+#define AT91_ASM_MC_EBI_CFG(ATMEL_BASE_MC + 0x64)
+#define AT91_ASM_MC_SMC_CSR0   (ATMEL_BASE_MC + 0x70)
+#define AT91_ASM_MC_SDRAMC_MR  (ATMEL_BASE_MC + 0x90)
+#define AT91_ASM_MC_SDRAMC_TR  (ATMEL_BASE_MC + 0x94)
+#define AT91_ASM_MC_SDRAMC_CR  (ATMEL_BASE_MC + 0x98)
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm/include/asm/arch-at91/at91_pmc.h 
b/arch/arm/include/asm/arch-at91/at91_pmc.h
index fb8bb17..086cb9b 100644
--- a/arch/arm/include/asm/arch-at91/at91_pmc.h
+++ b/arch/arm/include/asm/arch-at91/at91_pmc.h
@@ -17,11 +17,11 @@
 #ifndef AT91_PMC_H
 #define AT91_PMC_H
 
-#defineAT91_ASM_PMC_MOR(AT91_PMC_BASE + 0x20)
-#defineAT91_ASM_PMC_PLLAR  (AT91_PMC_BASE + 0x28)
-#defineAT91_ASM_PMC_PLLBR  (AT91_PMC_BASE + 0x2c)
-#define AT91_ASM_PMC_MCKR  (AT91_PMC_BASE + 0x30)
-#define AT91_ASM_PMC_SR(AT91_PMC_BASE + 0x68)
+#defineAT91_ASM_PMC_MOR(ATMEL_BASE_PMC + 0x20)
+#defineAT91_ASM_PMC_PLLAR  (ATMEL_BASE_PMC + 0x28)
+#defineAT91_ASM_PMC_PLLBR  (ATMEL_BASE_PMC + 0x2c)
+#define AT91_ASM_PMC_MCKR  (ATMEL_BASE_PMC + 0x30)
+#define AT91_ASM_PMC_SR(ATMEL_BASE_PMC + 0x68)
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm/include/asm/arch-at91/at91rm9200.h 
b/arch/arm/include/asm/arch-at91/at91rm9200.h
index 1bee6f2..19ad7f4 100644
---

Re: [U-Boot] [PATCH ATMEL REWORK][V2] update arm/at91rm9200 work with rework rework110202

2011-02-11 Thread Wolfgang Denk 
Dear Jens Scharsig,

In message 4d5573ca.9000...@scharsoft.de you wrote:
  * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
  * Fix: timer.c compile error io.h not found with arm/at91rm9200
  * update arm920t/at91 to ATMEL_xxx name scheme
  * update arm920t/at91 soc lib
  * update at91_emac driver
...
  /* Port B */
 -#define AT91_PMX_BA_ERXCK0x0008
 -#define AT91_PMX_BA_ECOL 0x0004
 -#define AT91_PMX_BA_ERXDV0x0002
 -#define AT91_PMX_BA_ERX3 0x0001
 -#define AT91_PMX_BA_ERX2 0x8000
^^^

Please, no space before tabs


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
Gewöhnlich glaubt der Mensch,  wenn er nur Worte hört,  es müsse sich
dabei doch auch was denken lassen. -- Goethe, Faust I
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH ATMEL REWORK][V2] update arm/at91rm9200 work with rework rework110202

2011-02-11 Thread Reinhard Meyer 
Dear Wolfgang Denk,
 Dear Jens Scharsig,

 In message4d5573ca.9000...@scharsoft.de  you wrote:
   * convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
   * Fix: timer.c compile error io.h not found with arm/at91rm9200
   * update arm920t/at91 to ATMEL_xxx name scheme
   * update arm920t/at91 soc lib
   * update at91_emac driver
 ...
   /* Port B */
 -#define AT91_PMX_BA_ERXCK   0x0008
 -#define AT91_PMX_BA_ECOL0x0004
 -#define AT91_PMX_BA_ERXDV   0x0002
 -#define AT91_PMX_BA_ERX30x0001
 -#define AT91_PMX_BA_ERX20x8000
 ^^^

 Please, no space before tabs
Those lines that are being removed by the patch.
Best Regards,
Reinhard
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH ATMEL REWORK][V2] update arm/at91rm9200 work with rework rework110202

2011-02-11 Thread Wolfgang Denk 
Dear Reinhard Meyer,

In message 4d5597a8.9050...@emk-elektronik.de you wrote:
 Dear Wolfgang Denk,
  Dear Jens Scharsig,
 
  In message4d5573ca.9000...@scharsoft.de  you wrote:
* convert at91rm9200ek and eb_cpux9k2 board to ATMEL_xxx name scheme
* Fix: timer.c compile error io.h not found with arm/at91rm9200
* update arm920t/at91 to ATMEL_xxx name scheme
* update arm920t/at91 soc lib
* update at91_emac driver
  ...
/* Port B */
  -#define AT91_PMX_BA_ERXCK 0x0008
  -#define AT91_PMX_BA_ECOL  0x0004
  -#define AT91_PMX_BA_ERXDV 0x0002
  -#define AT91_PMX_BA_ERX3  0x0001
  -#define AT91_PMX_BA_ERX2  0x8000
  ^^^
 
  Please, no space before tabs
 Those lines that are being removed by the patch.

Oops. I marked the wrong line.

I meant this one:

- checkpatch ~/Mail/U-Boot/3377
WARNING: please, no space before tabs
#379: FILE: arch/arm/include/asm/arch-at91/at91rm9200.h:112:
+#define ATMEL_PMX_BA_ERX2 ^I0x8000$



Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
EMACS belongs in sys/errno.h: Editor too big!
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot