Skip to contentSkip to conversation

new BSP for at91rm9200ek

PATCH Superseded Andreas Bießmann 3 participants 18 messages Oct 16, 2010 – Oct 19, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover new BSP for at91rm9200ek

This patch series introduce new board support for at91rm9200ek. The derived code is now converted to new at91 code. Arm relocation is also implemented.

There where some tradeoffs regarding device support. Currently the code basis does not support all devices supported before. This includes
a) remove support for dataflash since i can not test it (yet, should follow in some weeks)
b) preloader support is disabled since NOR booting does not need any first stage loader
c) MMC/SD-card is currently not supported (but was not before)

Next steps are:
- get dataflash running
- remove at91rm9200_usart driver (should merge with atmel_usart)
- support MMC/SD-Card (also merge with current AT91/AVR32 implementation)
- merge emac/macb

Andreas Bie?mann (3):
at91rm9200ek: convert to at91
at91rm9200: enable USB support
at91rm9200ek: enbable USB support

 MAINTAINERS                               |    4 +
 arch/arm/include/asm/arch-at91/hardware.h |    1 +
 board/atmel/at91rm9200ek/Makefile         |    1 -
 board/atmel/at91rm9200ek/at91rm9200ek.c   |   58 ++-----
 board/atmel/at91rm9200ek/config.mk        |    3 +-
 board/atmel/at91rm9200ek/led.c            |   58 ++++----
 board/atmel/at91rm9200ek/misc.c           |   50 ------
 boards.cfg                                |    2 +-
 include/configs/at91rm9200ek.h            |  233 ++++++++---------------------
 9 files changed, 118 insertions(+), 292 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/misc.c
Signature · 1 line
1.7.3.1
#1 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

This patch removes some functionality from at91rm9200ek board but the remaining functionality does now work with newer at91 code and arm-relocation.

Currently missing features are:
- dataflash booting (due to missing HW for testing)
- MMC/SD-Card
- first stage bootloader support is completely removed (not needed for NOR)

Cause this board was (some days ago) reference for all at91rm9200 based boards this should be a good starting point to convert all remaining at91rm9200 borads to at91 code. Aside from that this is a good base to get some drivers between at91sam/at91rm/avr32 merged.

---
 MAINTAINERS                             |    4 +
 board/atmel/at91rm9200ek/Makefile       |    1 -
 board/atmel/at91rm9200ek/at91rm9200ek.c |   58 +++------
 board/atmel/at91rm9200ek/config.mk      |    3 +-
 board/atmel/at91rm9200ek/led.c          |   58 ++++----
 board/atmel/at91rm9200ek/misc.c         |   50 -------
 boards.cfg                              |    2 +-
 include/configs/at91rm9200ek.h          |  222 ++++++++-----------------------
 8 files changed, 104 insertions(+), 294 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/misc.c
MAINTAINERS +4 -0
index aabd871..38a0dd3 100644
@@ -568,6 +568,10 @@ Rishi Bhattacharya <[email protected]>
 
 	omap5912osk	ARM926EJS
 
+Andreas Bie?mann <[email protected]>
+
+	at91rm9200ek	at91rm9200
+
 Cliff Brake <[email protected]>
 
 	pxa255_idp	xscale
board/atmel/at91rm9200ek/Makefile +0 -1
index 500ce72..db54a32 100644
@@ -27,7 +27,6 @@ LIB	= $(obj)lib$(BOARD).a
 
 COBJS-y += $(BOARD).o
 COBJS-y += led.o
-COBJS-y += misc.o
 ifdef CONFIG_HAS_DATAFLASH
 COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += mux.o
 COBJS-y += partition.o
board/atmel/at91rm9200ek/at91rm9200ek.c +16 -42

96 lines not on this page · raw message

board/atmel/at91rm9200ek/config.mk +2 -1
index 9ce161e..7b99e02 100644
@@ -1 +1,2 @@
-TEXT_BASE = 0x21f00000
+# currently only NOR flash booting is supported
+TEXT_BASE = 0x10000000
board/atmel/at91rm9200ek/led.c +28 -30

101 lines not on this page · raw message

board/atmel/at91rm9200ek/misc.c deleted +0 -50

50 lines not on this page · raw message

boards.cfg +1 -1
index 132d178..c2b4c14 100644
@@ -232,7 +232,7 @@ modnet50	arm	arm720t
 lpc2292sodimm	arm	arm720t		-		-		lpc2292
 eb_cpux9k2	arm	arm920t		-		BuS		at91
 at91rm9200dk	arm	arm920t		-		atmel		at91rm9200
-at91rm9200ek	arm	arm920t		-		atmel		at91rm9200
+at91rm9200ek	arm	arm920t		-		atmel		at91
 sbc2410x	arm	arm920t		-		-		s3c24x0
 smdk2400	arm	arm920t		-		samsung		s3c24x0
 smdk2410	arm	arm920t		-		samsung		s3c24x0
include/configs/at91rm9200ek.h +53 -169

327 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#2 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Andreas Bie?mann,

Quoted 1 line

+Andreas Bie?mann<[email protected]>

On my e-Mail client the sharp-s in the commit shows wrongly, however it does show ok in the e-mail header itself.

board/atmel/at91rm9200ek/at91rm9200ek.c line 45

Quoted 7 lines
  int board_init (void)
  {
board/atmel/at91rm9200ek/at91rm9200ek.c +3 -1
+	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+
  	/* Enable Ctrlc */
-	console_init_f ();
+	console_init_f();

I think that console_init_f is done in the arm/board.c already, please verify that.

board/atmel/at91rm9200ek/config.mk line 2

Quoted 8 lines
board/atmel/at91rm9200ek/config.mk +2 -1
index 9ce161e..7b99e02 100644
@@ -1 +1,2 @@
-TEXT_BASE = 0x21f00000
+# currently only NOR flash booting is supported
+TEXT_BASE = 0x10000000

Currently TEXT_BASE is being changed to CONFIG_ and moved to the <board>.h file, thus removing the need for a <board>/config.mk.

I'm not sure when to pick up this patch and how it will merge. Wolfgang?

Quoted 4 lines
include/configs/at91rm9200ek.h +0 -0
index 145c3c3..8e9db92 100644

...

include/configs/at91rm9200ek.h line 43

Quoted 13 lines

/* ARM asynchronous clock */
/*
* from 18.432 MHz crystal
* (18432000 / 4 * 39)
*/

include/configs/at91rm9200ek.h +2 -2
-#define AT91C_MAIN_CLOCK	179712000
+#define AT91C_MAIN_CLOCK		179712000
  /*
   * peripheral clock
   * (AT91C_MASTER_CLOCK / 3)
   */
-#define AT91C_MASTER_CLOCK	59904000
+#define AT91C_MASTER_CLOCK		59904000

I wonder if it would be possible to do the calculations in the defines like #define AT91C_MAIN_CLOCK ((AT91C_XTAL_CLOCK/4)*39).
You get the idea...

Quoted 9 lines
include/configs/at91rm9200ek.h +5 -3
-#define AT91_SLOW_CLOCK		32768	/* slow clock */
+#define CONFIG_ARM920T			1 /* This is an ARM920T Core */
+#define CONFIG_AT91RM9200		1 /* It's an Atmel AT91RM9200 SoC */
+#define CONFIG_AT91RM9200EK		1 /* on an AT91RM9200EK Board */
+#define CONFIG_CPUAT91			1 /* we use newer AT91 code */
+#define USE_920T_MMU			1
 
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/

include/configs/at91rm9200ek.h line 53

Quoted 10 lines
include/configs/at91rm9200ek.h +3 -6
-#define CONFIG_AT91RM9200EK	1	/* on an AT91RM9200EK Board	*/
-#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-#define USE_920T_MMU		1
+#define CONFIG_CMDLINE_TAG		1 /* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS	1
+#define CONFIG_INITRD_TAG		1
 
-#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG	1

On all files we touch, we want to change "#define SOMETHING 1" into "#define SOMETHING" when the value itself is not used. Please try to fix that globally.

include/configs/at91rm9200ek.h line 114

Quoted 4 lines
include/configs/at91rm9200ek.h +0 -0
@@ -113,10 +112,6 @@
  #define CONFIG_DBGU
  #undef CONFIG_USART0
  #undef CONFIG_USART1

Don't #undef what has never been defined.

include/configs/at91rm9200ek.h line 115

Quoted 1 line
include/configs/at91rm9200ek.h +1 -0
+#include<asm/arch/hardware.h>	/* needed for port definitions */

Are you sure that is needed in the midst of <board>.h?

Best Regards,
Reinhard

#3 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Reinhard Meyer,

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

board/atmel/at91rm9200ek/config.mk line 2

Quoted 7 lines
board/atmel/at91rm9200ek/config.mk +2 -1
@@ -1 +1,2 @@
-TEXT_BASE = 0x21f00000
+# currently only NOR flash booting is supported
+TEXT_BASE = 0x10000000

Currently TEXT_BASE is being changed to CONFIG_ and moved to the <board>.h file, thus removing the need for a <board>/config.mk.

Quoted 1 line

I'm not sure when to pick up this patch and how it will merge. Wolfgang?

The patch was submitted while the MW was open, so it should go in now (assuming there are no issues that need to be fixed first).

If needed I will try to resolve any merge conflicts, but as I cannot test this, and as it seems that other fixes are needed anyway, it would make sense that a resubmission is based on top of the Makefile-cleanup patch series.

Best regards,

Wolfgang Denk

Signature · 9 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
'What shall we do?' said Twoflower.  'Panic?'  said  Rincewind  hope-
fully. He always held that panic was the best means of survival; back
in  the  olden days, his theory went, people faced with hungry sabre-
toothed tigers could be divided very simply in those who panicked and
those who stood there saying 'What a magnificent  brute!'  or  'Here,
pussy.'                      - Terry Pratchett, _The Light Fantastic_
#4 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Wolfgang Denk,

Am 17.10.2010 um 20:40 schrieb Wolfgang Denk:

Quoted 8 lines

Dear Reinhard Meyer,

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

I'm not sure when to pick up this patch and how it will merge. Wolfgang?

The patch was submitted while the MW was open, so it should go in now (assuming there are no issues that need to be fixed first).

sorry for being late. Is it OK to get the address changes integrated til monday evening?

regards

Andreas Bie?mann

#5 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Andreas,

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

The patch was submitted while the MW was open, so it should go in now (assuming there are no issues that need to be fixed first).

sorry for being late. Is it OK to get the address changes integrated til monday evening?

Sure.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Intel's new motto: United we stand. Divided we fall!
#6 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

In reply to Reinhard Meyer

Dear Reinhard Meyer,

Am 17.10.2010 um 20:06 schrieb Reinhard Meyer:

Quoted 6 lines

Dear Andreas Bie?mann,

Quoted 1 line

+Andreas Bie?mann<[email protected]>

On my e-Mail client the sharp-s in the commit shows wrongly, however it does show ok in the e-mail header itself.

Quoted 10 lines

board/atmel/at91rm9200ek/at91rm9200ek.c line 45

Quoted 7 lines

int board_init (void)
{

(quoted diff) +2 -0
+	at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+
	/* Enable Ctrlc */
board/atmel/at91rm9200ek/at91rm9200ek.c +1 -1
-	console_init_f ();
+	console_init_f();

I think that console_init_f is done in the arm/board.c already, please verify that.

Yes it is really. The call on this place is historic and caused no errors therefore I left it there. But it should be removed.

Quoted 11 lines

board/atmel/at91rm9200ek/config.mk line 2

Quoted 8 lines
board/atmel/at91rm9200ek/config.mk +2 -1
index 9ce161e..7b99e02 100644
@@ -1 +1,2 @@
-TEXT_BASE = 0x21f00000
+# currently only NOR flash booting is supported
+TEXT_BASE = 0x10000000

Currently TEXT_BASE is being changed to CONFIG_ and moved to the <board>.h file, thus removing the need for a <board>/config.mk.

Yes I know. But when submitting this patch the rework for boards.cfg was not upstream.

Quoted 1 line

I'm not sure when to pick up this patch and how it will merge. Wolfgang?

I would prefer to get this patch in 2010.12, I could do the requested changes til monday evening. This board Is the basis for getting the messy at91rm9200 stuff cleaned up. I hope to get most drivers merged with current at91 code basis for 2011.03.

Quoted 16 lines
Quoted 4 lines
include/configs/at91rm9200ek.h +0 -0
index 145c3c3..8e9db92 100644

...

Quoted 9 lines

/* ARM asynchronous clock */
/*
* from 18.432 MHz crystal
* (18432000 / 4 * 39)
*/

include/configs/at91rm9200ek.h +1 -1
-#define AT91C_MAIN_CLOCK	179712000
+#define AT91C_MAIN_CLOCK		179712000

/*
* peripheral clock

Quoted 8 lines

include/configs/at91rm9200ek.h line 43

Quoted 4 lines

* (AT91C_MASTER_CLOCK / 3)
*/

include/configs/at91rm9200ek.h +1 -1
-#define AT91C_MASTER_CLOCK	59904000
+#define AT91C_MASTER_CLOCK		59904000

I wonder if it would be possible to do the calculations in the defines like #define AT91C_MAIN_CLOCK ((AT91C_XTAL_CLOCK/4)*39).
You get the idea...

Sounds better ...

Quoted 16 lines
Quoted 16 lines
include/configs/at91rm9200ek.h +8 -6
-#define AT91_SLOW_CLOCK		32768	/* slow clock */
+#define CONFIG_ARM920T			1 /* This is an ARM920T Core */
+#define CONFIG_AT91RM9200		1 /* It's an Atmel AT91RM9200 SoC */
+#define CONFIG_AT91RM9200EK		1 /* on an AT91RM9200EK Board */
+#define CONFIG_CPUAT91			1 /* we use newer AT91 code */
+#define USE_920T_MMU			1
 
-#define CONFIG_ARM920T		1	/* This is an ARM920T Core	*/
-#define CONFIG_AT91RM9200	1	/* It's an Atmel AT91RM9200 SoC	*/
-#define CONFIG_AT91RM9200EK	1	/* on an AT91RM9200EK Board	*/
-#undef  CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-#define USE_920T_MMU		1
+#define CONFIG_CMDLINE_TAG		1 /* enable passing of ATAGs */
+#define CONFIG_SETUP_MEMORY_TAGS	1
+#define CONFIG_INITRD_TAG		1
Quoted 7 lines

include/configs/at91rm9200ek.h line 53

Quoted 3 lines
include/configs/at91rm9200ek.h +0 -3
-#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG	1

On all files we touch, we want to change "#define SOMETHING 1" into "#define SOMETHING" when the value itself is not used. Please try to fix that globally.

NP

Quoted 6 lines

include/configs/at91rm9200ek.h line 114

Quoted 4 lines
include/configs/at91rm9200ek.h +0 -0
@@ -113,10 +112,6 @@
 #define CONFIG_DBGU
 #undef CONFIG_USART0
 #undef CONFIG_USART1

Don't #undef what has never been defined.

You know this is historic. This are the three possible interfaces for USART on this board. At least at91rm9200 known about DBGU ;) This will be addressed when merging at91rm9200/at91 and maybe avr32 usart implementation.

Quoted 3 lines

include/configs/at91rm9200ek.h line 115

Quoted 1 line
include/configs/at91rm9200ek.h +1 -0
+#include<asm/arch/hardware.h>	/* needed for port definitions */

Are you sure that is needed in the midst of <board>.h?

Should move some lines up ...

Regards

Andreas Bie?mann

#7 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Andreas Bie?mann,

Quoted 1 line

Yes it is really. The call on this place is historic and caused no errors therefore I left it there. But it should be removed.

The same issue is in other AT91 boards as well.

Quoted 7 lines
Quoted 5 lines

include/configs/at91rm9200ek.h line 114

Quoted 4 lines
include/configs/at91rm9200ek.h +0 -0
@@ -113,10 +112,6 @@
 #define CONFIG_DBGU
 #undef CONFIG_USART0
 #undef CONFIG_USART1

Don't #undef what has never been defined.

You know this is historic. This are the three possible interfaces for USART on this board. At least at91rm9200 known about DBGU ;) This will be addressed when merging at91rm9200/at91 and maybe avr32 usart implementation.

I know, its like that in almost all Atmel based boards. Even worse is the AT91 method, since some AT91 can have 6 UARTs. However unlikely that they are going to be used as console, this is awfully bad = <at91sam9260_ek.h>:

#define CONFIG_ATMEL_USART 1
#undef CONFIG_USART0
#undef CONFIG_USART1
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
Notice the last define !!!

I once tried to cleanup that a bit, but it really would affect files all across AT91.

Best Regards,
Reinhard

#8 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Reinhard Meyer,

Am 18.10.2010 10:40, schrieb Reinhard Meyer:

Quoted 14 lines

Dear Andreas Bie?mann,

Quoted 7 lines
Quoted 5 lines

include/configs/at91rm9200ek.h line 114

Quoted 4 lines
include/configs/at91rm9200ek.h +0 -0
@@ -113,10 +112,6 @@
 #define CONFIG_DBGU
 #undef CONFIG_USART0
 #undef CONFIG_USART1

Don't #undef what has never been defined.

You know this is historic. This are the three possible interfaces for USART on this board. At least at91rm9200 known about DBGU ;) This will be addressed when merging at91rm9200/at91 and maybe avr32 usart implementation.

I know, its like that in almost all Atmel based boards. Even worse is the AT91 method, since some AT91 can have 6 UARTs. However unlikely that they are going to be used as console, this is awfully bad = <at91sam9260_ek.h>:

Quoted 6 lines

#define CONFIG_ATMEL_USART 1
#undef CONFIG_USART0
#undef CONFIG_USART1
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
Notice the last define !!!

I know that ...

Quoted 1 line

I once tried to cleanup that a bit, but it really would affect files all across AT91.

I plan to merge at91rm9200_usart and at91_usart for 2011.03. It will introduce clear naming scheme in at91 (USRT3 vs DBGU). Also I plan to remove the necessity to hardcode the base addresses in header of at91_usart.c. But to do this we need a clean basis to test the changes. Eg. at91rm9200ek and at91sam9260ek (i can get one from time to time) or your at91sam9263 based boards. I also think a lot of avr32 stuff could merge into the same drivers ... will have a look for that in future.

I do all of this in spare time at home therefore I go only little steps ... But currently are all arm boards broken (relocation), therefore is now the time to introduce new interfaces. Do you think the same way?

regards

Andreas Bie?mann

#9 lore raw

PATCH 1/3 at91rm9200ek: convert to at91

Dear Andreas Bie?mann,

Quoted 4 lines

I plan to merge at91rm9200_usart and at91_usart for 2011.03. It will introduce clear naming scheme in at91 (USRT3 vs DBGU). Also I plan to remove the necessity to hardcode the base addresses in header of at91_usart.c. But to do this we need a clean basis to test the changes.

at91sam9* uses "atmel_usart", not "at91_usart". You should merge the "rm" usart into "atmel_usart" which currently works for AT91SAM9 and AVR32.

#10 lore raw

PATCH 2/3 at91rm9200: enable USB support

In reply to Andreas Bießmann

This patch fixes arch-at91/hardware.h to have the relevant defines for at91rm9200 devices to support existing at91 usb driver.

---
 arch/arm/include/asm/arch-at91/hardware.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-at91/hardware.h +1 -0
index 9f732a7..f5f80e0 100644
@@ -18,6 +18,7 @@
 
 #if defined(CONFIG_AT91RM9200)
 #include <asm/arch-at91/at91rm9200.h>
+#define AT91_PMC_UHP	AT91RM9200_PMC_UHP
 #elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
 #include <asm/arch/at91sam9260.h>
 #define AT91_BASE_MCI	AT91SAM9260_BASE_MCI
Signature · 1 line
1.7.3.1
#11 lore raw

PATCH 3/3 at91rm9200ek: enbable USB support

In reply to Andreas Bießmann

This patch enables USB for at91rm9200ek board.

---
 include/configs/at91rm9200ek.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
include/configs/at91rm9200ek.h +15 -0
index 8e9db92..d1565be 100644
@@ -125,6 +125,7 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
 #undef CONFIG_CMD_FPGA
 
 #include <asm/arch/hardware.h>	/* needed for port definitions */
@@ -150,6 +151,20 @@
 #define CONFIG_SYS_FLASH_PROTECTION
 
 /*
+ * USB Config
+ */
+#define CONFIG_USB_ATMEL			1
+#define CONFIG_USB_OHCI_NEW			1
+#define CONFIG_USB_KEYBOARD			1
+#define CONFIG_USB_STORAGE			1
+#define CONFIG_DOS_PARTITION			1
+
+#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
+#define CONFIG_SYS_USB_OHCI_REGS_BASE		AT91_USB_HOST_BASE
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91rm9200"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
+
+/*
  * Environment Settings
  */
 #define CONFIG_ENV_IS_IN_FLASH		1
Signature · 1 line
1.7.3.1
#12 lore raw

PATCH v2 1/3 at91rm9200ek: convert to at91

In reply to Andreas Bießmann

This patch removes some functionality from at91rm9200ek board but the remaining functionality does now work with newer at91 code and arm-relocation.

Currently missing features are:
- dataflash booting (due to missing HW for testing)
- MMC/SD-Card
- first stage bootloader support is completely removed (not needed for NOR)

Cause this board was (some days ago) reference for all at91rm9200 based boards this should be a good starting point to convert all remaining at91rm9200 borads to at91 code. Aside from that this is a good base to get some drivers between at91sam/at91rm/avr32 merged.

---
v2:
- address changes in config-header/main implementation file
- additionally remove mux.c/partitions.c, these files are unneeded cause dataflash support is currently disabled
- minor comment changes
- config.mk is based on top of current u-boot-testing.git/Makefile-cleanup

 MAINTAINERS                             |    4 +
 board/atmel/at91rm9200ek/Makefile       |    5 -
 board/atmel/at91rm9200ek/at91rm9200ek.c |   60 ++-----
 board/atmel/at91rm9200ek/config.mk      |    3 +-
 board/atmel/at91rm9200ek/led.c          |   58 +++----
 board/atmel/at91rm9200ek/misc.c         |   50 ------
 board/atmel/at91rm9200ek/mux.c          |   38 -----
 board/atmel/at91rm9200ek/partition.c    |   38 -----
 boards.cfg                              |    2 +-
 include/configs/at91rm9200ek.h          |  275 ++++++++----------------------
 10 files changed, 124 insertions(+), 409 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/misc.c
 delete mode 100644 board/atmel/at91rm9200ek/mux.c
 delete mode 100644 board/atmel/at91rm9200ek/partition.c
MAINTAINERS +4 -0
index e003226..771e120 100644
@@ -563,6 +563,10 @@ Rishi Bhattacharya <[email protected]>
 
 	omap5912osk	ARM926EJS
 
+Andreas Bie?mann <[email protected]>
+
+	at91rm9200ek	at91rm9200
+
 Cliff Brake <[email protected]>
 
 	pxa255_idp	xscale
board/atmel/at91rm9200ek/Makefile +0 -5
index 500ce72..96a0f05 100644
@@ -27,11 +27,6 @@ LIB	= $(obj)lib$(BOARD).a
 
 COBJS-y += $(BOARD).o
 COBJS-y += led.o
-COBJS-y += misc.o
-ifdef CONFIG_HAS_DATAFLASH
-COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += mux.o
-COBJS-y += partition.o
-endif
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS-y))
board/atmel/at91rm9200ek/at91rm9200ek.c +15 -45

97 lines not on this page · raw message

board/atmel/at91rm9200ek/config.mk +2 -1
index 2077692..c7323fe 100644
@@ -1 +1,2 @@
-CONFIG_SYS_TEXT_BASE = 0x21f00000
+# currently only NOR flash booting is supported
+CONFIG_SYS_TEXT_BASE = 0x10000000
board/atmel/at91rm9200ek/led.c +28 -30

101 lines not on this page · raw message

board/atmel/at91rm9200ek/misc.c deleted +0 -50

50 lines not on this page · raw message

board/atmel/at91rm9200ek/mux.c deleted +0 -38
deleted file mode 100644
index bdd44e8..0000000
@@ -1,38 +0,0 @@
-#include <config.h>
-#include <common.h>
-#include <asm/hardware.h>
-#include <asm/io.h>
-#include <dataflash.h>
-
-int AT91F_GetMuxStatus(void)
-{
-	/* Set in PIO mode */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_PER);
-	/* Configure in output */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_OER);
-
-	if(readl(AT91C_BASE_PIOB->PIO_ODSR) & CONFIG_SYS_DATAFLASH_MMC_PIO)
-		return 1;
-
-	return 0;
-}
-
-void AT91F_SelectMMC(void)
-{
-	/* Set in PIO mode */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_PER);
-	/* Configure in output */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_OER);
-	/* Set Output */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_SODR);
-}
-
-void AT91F_SelectSPI(void)
-{
-	/* Set in PIO mode */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_PER);
-	/* Configure in output */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_OER);
-	/* Clear Output */
-	writel(CONFIG_SYS_DATAFLASH_MMC_PIO, AT91C_BASE_PIOB->PIO_CODR);
-}
board/atmel/at91rm9200ek/partition.c deleted +0 -38
deleted file mode 100644
index 990cbcf..0000000
@@ -1,38 +0,0 @@
-/*
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- */
-#include <common.h>
-#include <config.h>
-#include <asm/hardware.h>
-#include <dataflash.h>
-
-AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
-
-struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
-	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
-	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3, 3}
-};
-
-/*define the area offsets*/
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,	0, "Bootstrap"},
-	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR,	0, "Environment"},
-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,	0, "U-Boot"},
-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR,	0, "Kernel"},
-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR,	0, "FS"},
-};
boards.cfg +1 -1
index 2bbb742..4cff202 100644
@@ -343,7 +343,7 @@ modnet50	arm	arm720t
 lpc2292sodimm	arm	arm720t		-		-		lpc2292
 eb_cpux9k2	arm	arm920t		-		BuS		at91
 at91rm9200dk	arm	arm920t		-		atmel		at91rm9200
-at91rm9200ek	arm	arm920t		-		atmel		at91rm9200
+at91rm9200ek	arm	arm920t		-		atmel		at91
 sbc2410x	arm	arm920t		-		-		s3c24x0
 smdk2400	arm	arm920t		-		samsung		s3c24x0
 smdk2410	arm	arm920t		-		samsung		s3c24x0
include/configs/at91rm9200ek.h +74 -201

365 lines not on this page · raw message

Signature · 1 line
1.7.3.1
#13 lore raw

PATCH v2 2/3 at91rm9200: enable USB support

This patch fixes arch-at91/hardware.h to have the relevant defines for at91rm9200 devices to support existing at91 usb driver.

---
v2: no changes since v1

 arch/arm/include/asm/arch-at91/hardware.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-at91/hardware.h +1 -0
index 9f732a7..f5f80e0 100644
@@ -18,6 +18,7 @@
 
 #if defined(CONFIG_AT91RM9200)
 #include <asm/arch-at91/at91rm9200.h>
+#define AT91_PMC_UHP	AT91RM9200_PMC_UHP
 #elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
 #include <asm/arch/at91sam9260.h>
 #define AT91_BASE_MCI	AT91SAM9260_BASE_MCI
Signature · 1 line
1.7.3.1
#14 lore raw

PATCH v2 3/3 at91rm9200ek: enbable USB support

In reply to Andreas Bießmann

This patch enables USB for at91rm9200ek board.

---
v2: no changes since v1

 include/configs/at91rm9200ek.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
include/configs/at91rm9200ek.h +15 -0
index 6b2dd63..b386057 100644
@@ -122,6 +122,7 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
 #undef CONFIG_CMD_FPGA
 
 /*
@@ -146,6 +147,20 @@
 #define CONFIG_SYS_FLASH_PROTECTION
 
 /*
+ * USB Config
+ */
+#define CONFIG_USB_ATMEL			1
+#define CONFIG_USB_OHCI_NEW			1
+#define CONFIG_USB_KEYBOARD			1
+#define CONFIG_USB_STORAGE			1
+#define CONFIG_DOS_PARTITION			1
+
+#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
+#define CONFIG_SYS_USB_OHCI_REGS_BASE		AT91_USB_HOST_BASE
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91rm9200"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
+
+/*
  * Environment Settings
  */
 #define CONFIG_ENV_IS_IN_FLASH
Signature · 1 line
1.7.3.1
#15 lore raw

PATCH v2 1/3 at91rm9200ek: convert to at91

In reply to Andreas Bießmann

Dear Andreas Bie?mann,

Quoted 2 lines

+Andreas Bie?mann<[email protected]>

in the 2nd line the "?" does not show here (a "FFFD" box is shown instead. Is it only me or
do others have similar problems? I think that line was produced in a different code page? Maybe we should refrain from using non ASCII characters within source code?

Reinhard

#16 lore raw

PATCH v2 1/3 at91rm9200ek: convert to at91

Dear Reinhard Meyer,

Am 18.10.2010 23:37, schrieb Reinhard Meyer:

Quoted 2 lines

Dear Andreas Bie?mann,

Quoted 1 line

This is correct UTF8 coded line

Quoted 1 line
Quoted 1 line

+Andreas Bie?mann<[email protected]>

This is a patch to a latin1 coded file. When you e.g. save this mail and look through it with 'cat <file> | less' you may see 'Andreas Bie<DF>mann <[email protected]>'.
When you then look for latin1 coding table you may see <DF> is '?'. So this is correct here. Some other files in the patch are still coded in utf-8 (as the mail is), therefore your MUA represents the stuff correct to you.
The file MAINTAINERS is in latin1 coding cause a lot of/some other contributors also have non-ASCII characters in their names. A short test will show this to you:

open MAINTAINERS in vim; :set fileencoding=utf8; save; git diff

Quoted 3 lines

in the 2nd line the "?" does not show here (a "FFFD" box is shown instead. Is it only me or
do others have similar problems?

No, everyone with correct configured MUA should see this

Quoted 2 lines

I think that line was produced
in a different code page?

Yes, the file MAINTAINERS is in latin1 while the mail and some other files touched are in utf-8.

Quoted 2 lines

Maybe we should refrain from using non
ASCII characters within source code?

I don't know. But my surname is Bie?mann and _not_ Biessmann.

Shouldn't we change the coding for all files to utf-8 instead?

regards

Andreas Bie?mann

#17 lore raw

cover new BSP for at91rm9200ek

In reply to Andreas Bießmann

Dear Andreas Bie?mann,

Quoted 23 lines

This patch series introduce new board support for at91rm9200ek. The derived code is now converted to new at91 code. Arm relocation is also implemented.

There where some tradeoffs regarding device support. Currently the code basis does not support all devices supported before. This includes
a) remove support for dataflash since i can not test it (yet, should follow in some weeks)
b) preloader support is disabled since NOR booting does not need any first stage loader
c) MMC/SD-card is currently not supported (but was not before)

Next steps are:
- get dataflash running
- remove at91rm9200_usart driver (should merge with atmel_usart)
- support MMC/SD-Card (also merge with current AT91/AVR32 implementation)
- merge emac/macb

Andreas Bie?mann (3):
at91rm9200ek: convert to at91
at91rm9200: enable USB support
at91rm9200ek: enbable USB support

Quoted 12 lines
 MAINTAINERS                               |    4 +
 arch/arm/include/asm/arch-at91/hardware.h |    1 +
 board/atmel/at91rm9200ek/Makefile         |    1 -
 board/atmel/at91rm9200ek/at91rm9200ek.c   |   58 ++-----
 board/atmel/at91rm9200ek/config.mk        |    3 +-
 board/atmel/at91rm9200ek/led.c            |   58 ++++----
 board/atmel/at91rm9200ek/misc.c           |   50 ------
 boards.cfg                                |    2 +-
 include/configs/at91rm9200ek.h            |  233 ++++++++---------------------
 9 files changed, 118 insertions(+), 292 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/misc.c

Added V2 of the series to u-boot-atmel/at91.
Thanks,
Reinhard