Re: [U-Boot-Users] [PATCH] at91: Choose environment variables location within make config target
On Mon, Dec 15, 2008 at 12:20:59PM +0100, Nicolas Ferre wrote: I suppose you did test all the variants... :) Yes we have done it ! And we are using it for the demos that are on http://www.linux4sam.org Congrats ! Stelian. -- Stelian Pop stel...@popies.net -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] at91: Choose environment variables location within make config target
On Fri, Dec 05, 2008 at 05:27:53PM +0100, Nicolas Ferre wrote: This patch adds the possiblity to choose the media where the environment will be located. This allow to choose this fundamental configuration without editing config files. Documentation file added. Signed-off-by: Nicolas Ferre [EMAIL PROTECTED] I suppose you did test all the variants... :) Since you did this, you could also while you were there, do the same thing for the AT91CAP board... but this can also be done later, in an incremental fashion. Anyway: Acked-by: Stelian Pop [EMAIL PROTECTED] -- Stelian Pop [EMAIL PROTECTED] -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91SAM9261-EK USB storage not working...
Hi Remy, Le jeudi 31 juillet 2008 à 15:24 +0200, Remy Bohmer a écrit : Hello Stelian and others, I have made some progress here, and I would like to inform you all: [...] I have done a lot of debugging/testing etc. and I noticed that binary deliverables of U-boot for the evaluationkit work properly with USB-storage devices on the AT91SAM9261-EK kit. They were all based on U-boot 1.1.3, 1.1.4, 1.1.5 Atmel versions. But, I was not able to get a working version when I build such a code tree myself. I use gcc version 4.2.3 (Sourcery G++ Lite 2008q1-126) An hour ago I got the stupid idea to get an older compiler: gcc version 3.4.2 (release) (CodeSourcery ARM Q3D 2004) FYI, I have been using a CS toolchain here too (2007q3) and had optimisation problems with it (net/net.c:NetReceive() gets miscompiled when using -Os, but behaves correctly when compiled with -O2). I didn't have any problems with the (older) ELDK 4.1 gcc compiler. Maybe you should try it first. -- Stelian Pop [EMAIL PROTECTED] - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91SAM9261-EK USB storage not working...
Le samedi 26 juillet 2008 à 00:22 +0200, Remy Bohmer a écrit : Hello Stelian, Hi Rémy, Thank you for adding support for the Atmel AT91SAM9261-EK to U-boot. But I have a question here: Does USB-storage devices work in U-boot at your place? (e.g. 1GB USB memory stick) I use U-boot 1.3.4-rc1 [...] You're correct, USB support on the AT91SAM9 boards has some unknown issues. I can reproduce the behaviour you're seing easily here. Nicolas Ferre (added in CC:) confirmed the problem too (with both the current U-Boot version and the atmel specific 1.1.5-atmel_1.5 version). But he is very certain that it did work at some time in the past, with some USB storage devices. So it may be a matter of hardware (lo or hi-speed USB storage devices ?), or a matter of timing somewhere in the driver, I do not know. The Linux USB stack works perfectly, so this is not a hardware problem on the AT91SAM9 chip or board. Somebody needs to debug this, but I didn't found the time to investigate yet. If you badly need it to work, well, you're welcome to try debugging it :) Thanks, -- Stelian Pop [EMAIL PROTECTED] - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91SAM9261-EK USB storage not working...
Le lundi 28 juillet 2008 à 12:59 +0200, Remy Bohmer a écrit : I am very certain that it worked on 1.1.5_atmel_1.4 version, with exactly the same USB memory stick as the one that does not work on thecurrent releases... So, I can rule the USB stick as well... This makes you a good test configuration. [...] I hoped someone already had a solution, that why I asked you ;-) and yes, it _must_ work here, and I believe I have to dig in this myself. Maybe next week... Good luck, I am waiting for your patch then :) -- Stelian Pop [EMAIL PROTECTED] - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] at91sam9260-ek intermittenly fails at u-boot init
Le vendredi 27 juin 2008 à 14:31 -0700, Norman Cheung a écrit : Dear all, Hi Norman, I am still struggling with this problem, but getting to reproduce this problem repeatably. Hoping folks in the forum can give me some pointers. Our Atmel FAE is clueless also. This is repeatable, on two boards (both 9260 Rev A and Rev B): - bootstrap, u-boot, kernel, RFS all downloaded to NAND with SAM-BA 2.6 - Without recycle power, just push reset button; u-boot will come up. And I can continue to boot Kernel (2.6.25) - Push reset second time(and subsequent times), bootstrap will run and fail in the first few instruction of u-boot - Sometimes power cycle, u-boot will come up again - When it runs, if I has u-boot boot kernel, linux will run. - Push reset button in Linux board will reboot and u-boot will run again (all the times) - If I use linux reboot, the board will stop after running bootstrap and (I believe) branched to u-boot. Our h/ware guy has checked all the timing NAND, SDRAM etc and we have experimented with all the settings. It looks like you have a SDRAM initialisation problem. To confirm this (since you said that you cannot reproduce this problem with a JTAG), you need to modify the source code for AT91Bootstrap, and add a 'verify' pass (using a checksum for example) after the copy from NAND to SDRAM. This way you'll find out if the reading from NAND is going wrong, or the writing to SDRAM (I suspect the latter). Next, you may encounter an issue with the reset sequence. I know that on some newer Atmel boards (AT91CAP9 and AT572D940HF) there is a problem when an external reset is performed while a SDRAM burst access is occuring. The workaround for this issue is to catch the external interrupt generated by the reset switch, and do the reset by software (see the AT572D940HF patches posted recently by Antonio Costa for the full code). I'm not sure the 9260 exhibits the same bug, but you may query your FAE for that. Hope this gives some clues. Stelian. -- Stelian Pop [EMAIL PROTECTED] - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Fix boot from NOR due to incorrect reset delay.
Hi, Le jeudi 22 mai 2008 à 00:15 +0200, Stelian Pop a écrit : AT91 RSTC registers are battery-backuped, so their values are not reset across power cycles. One of those registers, the AT91_RSTC_MR register, is being modified by U-Boot, in the ethernet initialisation routine, to generate a 500ms user reset. [...] It seems that the patch above has not made it in the mainline. Since this can cause some nasty boot problems, it would be nice to have this upstream for the next stable version. Thanks, -- Stelian Pop [EMAIL PROTECTED] - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] at91sam9260-ek intermittenly fails at u-boot init
Le mercredi 25 juin 2008 à 01:36 +, Norman Cheung a écrit : I am struggling with this problem for a week now and not making any progress. So any suggestions, ideas or pointer will be greatly appreciated. [...] The board works with u-boot 1.3.2 and at91bootstrap(1.5 I only have the binary) booting from NAND. The source (for the latest version) is freely available on the Atmel site: http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4093 If you really need the source for an older version, I'm sure the Atmel support will send it to you upon request. U-boot fails intermittently at the start. When it fails, it didn't make it to my first printf statement. When I use JTAG to debug it, it always works. If the board has been let without power for 1+ hour, it will also boot up when I apply power to it(something to do with the battery perhaps). Did you try disconnecting the battery ? Or replacing the battery with a new one ? [...] We had at91bootstrap 1.5 working well in 32-bit mode with u-boot 1.3.2. But I don't have the source. See above. I wonder what is the current stable version of u-boot and at91bootstrap? AT91Bootstrap seems to be at v1.9. As for U-Boot, try the latest git (which will soon be u-boot v1.3.4). (BTW, if Wolfgang is listening, it would be nice to have proper tags in git as well as releases on the ftp server for the -pre version. Since the merge window is closed, I guess we're up to v1.3.4-pre1 now, but this version tag cannot be found anywhere...) Stelian. -- Stelian Pop [EMAIL PROTECTED] - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Fix boot from NOR due to incorrect reset delay.
AT91 RSTC registers are battery-backuped, so their values are not reset across power cycles. One of those registers, the AT91_RSTC_MR register, is being modified by U-Boot, in the ethernet initialisation routine, to generate a 500ms user reset. Unfortunately, this value is not being restored afterwards, causing subsequent resets to also last for 500ms. This long reset sequence causes problems (at least) in the boot sequence from NOR: by the time the CPU tries to load a program from the NOR flash, the latter is still in reset and not yet available. Additionaly, this patch fixes a bug in the original code which caused the reset delay to last for 2s instead of 500ms. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- This patch applies on top of the latest AT91 patches, as integrated in the testing-V2 branch of the u-boot-at91 repository. board/atmel/at91cap9adk/at91cap9adk.c |7 ++- board/atmel/at91sam9260ek/at91sam9260ek.c |4 ++-- board/atmel/at91sam9263ek/at91sam9263ek.c |7 ++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c index a3eaf19..c5082a0 100644 --- a/board/atmel/at91cap9adk/at91cap9adk.c +++ b/board/atmel/at91cap9adk/at91cap9adk.c @@ -196,7 +196,7 @@ static void at91cap9_macb_hw_init(void) /* Need to reset PHY - 500ms reset */ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | -AT91_RSTC_ERSTL | (0x0D 8) | +(AT91_RSTC_ERSTL (0x0D 8)) | AT91_RSTC_URSTEN); at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); @@ -204,6 +204,11 @@ static void at91cap9_macb_hw_init(void) /* Wait for end hardware reset */ while (!(at91_sys_read(AT91_RSTC_SR) AT91_RSTC_NRSTL)); + /* Restore NRST value */ + at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | +(AT91_RSTC_ERSTL (0x0 8)) | +AT91_RSTC_URSTEN); + /* Re-enable pull-up */ writel(pin_to_mask(AT91_PIN_PB22) | pin_to_mask(AT91_PIN_PB25) | diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index 4635f0f..3572b16 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -149,7 +149,7 @@ static void at91sam9260ek_macb_hw_init(void) /* Need to reset PHY - 500ms reset */ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | -AT91_RSTC_ERSTL | (0x0D 8) | +(AT91_RSTC_ERSTL (0x0D 8)) | AT91_RSTC_URSTEN); at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); @@ -159,7 +159,7 @@ static void at91sam9260ek_macb_hw_init(void) /* Restore NRST value */ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | -AT91_RSTC_ERSTL | (0x0 8) | +(AT91_RSTC_ERSTL (0x0 8)) | AT91_RSTC_URSTEN); /* Re-enable pull-up */ diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index ba7fc71..169ee25 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -147,7 +147,7 @@ static void at91sam9263ek_macb_hw_init(void) /* Need to reset PHY - 500ms reset */ at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | -AT91_RSTC_ERSTL | (0x0D 8) | +(AT91_RSTC_ERSTL (0x0D 8)) | AT91_RSTC_URSTEN); at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); @@ -155,6 +155,11 @@ static void at91sam9263ek_macb_hw_init(void) /* Wait for end hardware reset */ while (!(at91_sys_read(AT91_RSTC_SR) AT91_RSTC_NRSTL)); + /* Restore NRST value */ + at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | +(AT91_RSTC_ERSTL (0x0 8)) | +AT91_RSTC_URSTEN); + /* Re-enable pull-up */ writel(pin_to_mask(AT91_PIN_PC25), pin_to_controller(AT91_PIN_PC0) + PIO_PUER); -- 1.5.3.3 - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 04/26] Add proper copyright notices in Atmel boards Makefiles
Le samedi 10 mai 2008 à 00:25 +0200, Wolfgang Denk a écrit : In message [EMAIL PROTECTED] you wrote: The Makefiles for the AT91CAP9/AT91SAM9 boards have an incomplete copyright notice. This patch adds the missing pieces. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- board/atmel/at91cap9adk/Makefile |4 board/atmel/at91sam9260ek/Makefile |4 2 files changed, 8 insertions(+), 0 deletions(-) Does not apply to currnt tree: I'm not sure why is that, it seems to apply just fine on top of current git HEAD. I'm sending it again. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Add proper copyright notices in Atmel boards Makefiles
The Makefiles for the AT91CAP9/AT91SAM9 boards have an incomplete copyright notice. This patch adds the missing pieces. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- board/atmel/at91cap9adk/Makefile |4 board/atmel/at91sam9260ek/Makefile |4 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/board/atmel/at91cap9adk/Makefile b/board/atmel/at91cap9adk/Makefile index e33af76..f2b9c12 100644 --- a/board/atmel/at91cap9adk/Makefile +++ b/board/atmel/at91cap9adk/Makefile @@ -2,6 +2,10 @@ # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] # +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# # See file CREDITS for list of people who contributed to this # project. # diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile index e6e4082..f93540a 100644 --- a/board/atmel/at91sam9260ek/Makefile +++ b/board/atmel/at91sam9260ek/Makefile @@ -2,6 +2,10 @@ # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] # +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# # See file CREDITS for list of people who contributed to this # project. # -- 1.5.3.3 - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 14/26] AT91SAM9261EK support
Le vendredi 09 mai 2008 à 12:41 +0200, Jean-Christophe PLAGNIOL-VILLARD a écrit : +/* #define CONFIG_ENV_OVERWRITE1 */ If no need please remove Ok, here is an additional patch for this. Stelian. -88--- From c821a395fa280e209270dd754c7093b7aeb57546 Mon Sep 17 00:00:00 2001 From: Stelian Pop [EMAIL PROTECTED] Date: Fri, 9 May 2008 22:56:23 +0200 Subject: [PATCH] Cleanup unused config header file definitions. CONFIG_ENV_OVERWRITE is commented out in the config header files, so let's cleanup the files by removing the whole definition. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h |2 -- include/configs/at91sam9260ek.h |2 -- include/configs/at91sam9261ek.h |2 -- include/configs/at91sam9263ek.h |2 -- include/configs/at91sam9rlek.h |2 -- 5 files changed, 0 insertions(+), 10 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 03c0e58..342ce2a 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -70,8 +70,6 @@ #define CONFIG_BOOTDELAY 3 -/* #define CONFIG_ENV_OVERWRITE1 */ - /* * BOOTP options */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index f68e055..675224e 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -57,8 +57,6 @@ #define CONFIG_BOOTDELAY 3 -/* #define CONFIG_ENV_OVERWRITE1 */ - /* * BOOTP options */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index df46268..e53a23f 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -70,8 +70,6 @@ #define CONFIG_BOOTDELAY 3 -/* #define CONFIG_ENV_OVERWRITE1 */ - /* * BOOTP options */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 1c50134..a8194b5 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -70,8 +70,6 @@ #define CONFIG_BOOTDELAY 3 -/* #define CONFIG_ENV_OVERWRITE1 */ - /* * BOOTP options */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 33d934f..2ad8d05 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -70,8 +70,6 @@ #define CONFIG_BOOTDELAY 3 -/* #define CONFIG_ENV_OVERWRITE1 */ - /* * Command line configuration. */ -- 1.5.3.3 -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 20/26] Add ATMEL LCD driver
Le vendredi 09 mai 2008 à 12:57 +0200, Jean-Christophe PLAGNIOL-VILLARD
a écrit :
+void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue)
^
Please choose one coding style please
Sure. Here is an updated patch. It replaces patches 18, 19 and 20.
Thanks,
Stelian.
-8--8-8-
From b4fbf289e5b775e8d617fb5e8e5d6d9ed5aca681 Mon Sep 17 00:00:00 2001
From: Stelian Pop [EMAIL PROTECTED]
Date: Fri, 9 May 2008 23:54:27 +0200
Subject: [PATCH] Add ATMEL LCD driver
This patch adds support for the ATMEL LCDC driver which is used on some
AT91 and AVR platforms.
Is has been tested with the AT91CAP9ADK, AT91SAM9261EK, AT91SAM9263EK and
AT91SAM9RLEK boards. Adaptation for AVR32 should probably be easy.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
README |4 +
common/lcd.c| 79 +++-
drivers/video/Makefile |1 +
drivers/video/atmel_lcdfb.c | 160 +++
include/asm-arm/arch-at91sam9/clk.h |6 +
include/atmel_lcdc.h| 177 +++
include/lcd.h | 30 ++-
lib_arm/board.c | 39 ++--
8 files changed, 483 insertions(+), 13 deletions(-)
create mode 100644 drivers/video/atmel_lcdfb.c
create mode 100644 include/atmel_lcdc.h
diff --git a/README b/README
index 5e2bca4..dca495d 100644
--- a/README
+++ b/README
@@ -962,6 +962,10 @@ The following options need to be configured:
display); also select one of the supported displays
by defining one of these:
+ CONFIG_ATMEL_LCD:
+
+ HITACHI TX09D70VM1CCA, 3.5, 240x320.
+
CONFIG_NEC_NL6448AC33:
NEC NL6448AC33-18. Active, color, single scan.
diff --git a/common/lcd.c b/common/lcd.c
index 914dc2e..2178f12 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -50,6 +50,12 @@
#include lcdvideo.h
#endif
+#if defined(CONFIG_ATMEL_LCD)
+#include atmel_lcdc.h
+#include nand.h
+extern nand_info_t nand_info[];
+#endif
+
#ifdef CONFIG_LCD
//
@@ -474,14 +480,22 @@ ulong lcd_setmem (ulong addr)
static void lcd_setfgcolor (int color)
{
+#ifdef CONFIG_ATMEL_LCD
+ lcd_color_fg = color;
+#else
lcd_color_fg = color 0x0F;
+#endif
}
/*--*/
static void lcd_setbgcolor (int color)
{
+#ifdef CONFIG_ATMEL_LCD
+ lcd_color_bg = color;
+#else
lcd_color_bg = color 0x0F;
+#endif
}
/*--*/
@@ -508,7 +522,11 @@ static int lcd_getbgcolor (void)
#ifdef CONFIG_LCD_LOGO
void bitmap_plot (int x, int y)
{
+#ifdef CONFIG_ATMEL_LCD
+ uint *cmap;
+#else
ushort *cmap;
+#endif
ushort i, j;
uchar *bmap;
uchar *fb;
@@ -533,6 +551,8 @@ void bitmap_plot (int x, int y)
cmap = (ushort *)fbi-palette;
#elif defined(CONFIG_MPC823)
cmap = (ushort
*)(cp-lcd_cmap[BMP_LOGO_OFFSET*sizeof(ushort)]);
+#elif defined(CONFIG_ATMEL_LCD)
+ cmap = (uint *) (panel_info.mmio + ATMEL_LCDC_LUT(0));
#endif
WATCHDOG_RESET();
@@ -540,11 +560,26 @@ void bitmap_plot (int x, int y)
/* Set color map */
for (i=0; i(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) {
ushort colreg = bmp_logo_palette[i];
+#ifdef CONFIG_ATMEL_LCD
+ uint lut_entry;
+#ifdef CONFIG_ATMEL_LCD_BGR555
+ lut_entry = ((colreg 0x000F) 11) |
+ ((colreg 0x00F0) 2) |
+ ((colreg 0x0F00) 7);
+#else /* CONFIG_ATMEL_LCD_RGB565 */
+ lut_entry = ((colreg 0x000F) 1) |
+ ((colreg 0x00F0) 3) |
+ ((colreg 0x0F00) 4);
+#endif
+ *(cmap + BMP_LOGO_OFFSET) = lut_entry;
+ cmap++;
+#else /* !CONFIG_ATMEL_LCD */
#ifdef CFG_INVERT_COLORS
*cmap++ = 0x - colreg;
#else
*cmap++ = colreg;
#endif
+#endif /* CONFIG_ATMEL_LCD */
}
WATCHDOG_RESET();
@@ -578,7 +613,9 @@ void bitmap_plot (int x, int y)
*/
int lcd_display_bitmap(ulong bmp_image, int x, int y)
{
-#if !defined(CONFIG_MCC200)
+#ifdef CONFIG_ATMEL_LCD
+ uint *cmap;
+#elif !defined(CONFIG_MCC200)
ushort *cmap;
#endif
ushort i, j;
@@ -633,6 +670,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
cmap = (ushort *)fbi-palette;
#elif defined(CONFIG_MPC823)
cmap = (ushort *)(cp-lcd_cmap[255*sizeof(ushort
Re: [U-Boot-Users] [PATCH 19/26] Remember the detected NAND size for later display
Le vendredi 09 mai 2008 à 10:00 -0500, Scott Wood a écrit : On Thu, May 08, 2008 at 10:52:27PM +0200, Stelian Pop wrote: This patch adds a field in 'struct bd_info' for saving the detected NAND size (result of nand_init() routine). This field can be used later (for example in the lcd driver) to print out detailed information about the board memories. Why would an LCD driver care about NAND? If we want to make the NAND size printable after boot, how about doing so in the nand info command? Nevermind, I've reworked those patches. Thanks, -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 04/26] Add proper copyright notices in Atmel boards Makefiles
The Makefiles for the AT91CAP9/AT91SAM9 boards have an incomplete copyright notice. This patch adds the missing pieces. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- board/atmel/at91cap9adk/Makefile |4 board/atmel/at91sam9260ek/Makefile |4 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/board/atmel/at91cap9adk/Makefile b/board/atmel/at91cap9adk/Makefile index e33af76..f2b9c12 100644 --- a/board/atmel/at91cap9adk/Makefile +++ b/board/atmel/at91cap9adk/Makefile @@ -2,6 +2,10 @@ # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] # +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# # See file CREDITS for list of people who contributed to this # project. # diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile index e6e4082..f93540a 100644 --- a/board/atmel/at91sam9260ek/Makefile +++ b/board/atmel/at91sam9260ek/Makefile @@ -2,6 +2,10 @@ # (C) Copyright 2003-2008 # Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] # +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# # See file CREDITS for list of people who contributed to this # project. # -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH v2 ARM/AT91 0/26] AT91SAM/CAP patches for U-Boot 1.3.4
Hi, This is the second version of the AT91CAP9/AT91SAM9 patches, which hopefully addresses all the feedbacks I got on the first one. The first patches: 01 to 04 fix the copyright notices of some already merged files. Those patches may be merged immediately since it would be good to have those in 1.3.3-final. The patches 05 to 13 fix a number of things in the AT91CAP9 and AT91SAM9260 ports (NAND 8/16 bit support, dataflash offsets, SPI timings, consistent Linux bootargs). The patches 14 to 17 add support for some new Atmel boards: - AT91SAM9261 - AT91SAM9263 - AT91SAM9RL The patches 18 to 25 add a driver for the LCD controller on the Atmel boards (except 9260). The driver could probably be adapted, with minimum efforts, to the AVR32 boards. And finally, the last patch adds support for the revision 'C' of the AT91CAP9 silicon, which needs a special initialisation sequence to switch from the internal RC oscillator to the external 32k clock. Thanks, Stelian. - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 07/26] AT91CAP9ADK: Normalize SPI timings
This patch changes the SPI timings to closely match the ones used by the Linux kernel and the Atmel's own bootstrap project. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 7887b36..588f45d 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -94,9 +94,9 @@ #define CFG_SPI_WRITE_TOUT (5*CFG_HZ) #define CFG_MAX_DATAFLASH_BANKS1 #define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC000 /* CS0 */ -#define AT91_SPI_CLK 2000 -#define DATAFLASH_TCSS (0xFA 16) -#define DATAFLASH_TCHS (0x8 24) +#define AT91_SPI_CLK 1500 +#define DATAFLASH_TCSS (0x1a 16) +#define DATAFLASH_TCHS (0x1 24) /* NOR flash */ #define CFG_FLASH_CFI 1 -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 01/26] Fix @ - at substitution
When applying the AT91CAP9 patches upstream, something transformed the '@' character into the ' at ' sequence. The patch below restores the original form in all the places where it has been modified (the AT91CAP9 files, the AT91SAM9260 files which were copied from AT91CAP9, and a couple of other files where the ' at ' sequence was present). Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- CHANGELOG | 12 ++-- board/atmel/at91cap9adk/Makefile |2 +- board/atmel/at91cap9adk/at91cap9adk.c |2 +- board/atmel/at91cap9adk/led.c |2 +- board/atmel/at91cap9adk/nand.c |2 +- board/atmel/at91cap9adk/u-boot.lds |2 +- board/atmel/at91sam9260ek/Makefile |2 +- board/atmel/at91sam9260ek/at91sam9260ek.c |2 +- board/atmel/at91sam9260ek/led.c|2 +- board/atmel/at91sam9260ek/nand.c |2 +- board/atmel/at91sam9260ek/u-boot.lds |2 +- cpu/arm926ejs/at91sam9/Makefile|2 +- cpu/arm926ejs/at91sam9/ether.c |2 +- cpu/arm926ejs/at91sam9/lowlevel_init.S |2 +- cpu/arm926ejs/at91sam9/timer.c |2 +- cpu/arm926ejs/at91sam9/usb.c |2 +- drivers/net/smc911x.c |2 +- include/asm-arm/arch-at91sam9/clk.h|2 +- include/asm-arm/arch-at91sam9/memory-map.h |2 +- include/asm-arm/dma-mapping.h |2 +- include/configs/at91cap9adk.h |2 +- include/configs/at91sam9260ek.h|2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5d21db1..6aadcca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6477,7 +6477,7 @@ Date: Mon Mar 3 11:57:23 2008 + Originally pointed out by Laurent Pinchart [EMAIL PROTECTED], see http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/22846 -Signed-off-by: Bernhard Nemec bnemec at ganssloser.com +Signed-off-by: Bernhard Nemec [EMAIL PROTECTED] commit 84d0c2f1e39caff58bf765a7ab7c72da23c25ec8 Author: Kim B. Heino [EMAIL PROTECTED] @@ -7707,7 +7707,7 @@ Date: Mon Feb 18 14:01:56 2008 -0600 86xx: Convert sbc8641d to use libfdt. This is the proper fix for a missing closing brace in the function -ft_cpu_setup() noticed by joe.hamman at embeddedspecialties.com. +ft_cpu_setup() noticed by [EMAIL PROTECTED] The ft_cpu_setup() function in mpc8641hpcn.c should have been removed earlier as it was under the obsolete CONFIG_OF_FLAT_TREE, but was missed. Only, the sbc8641d was nominally still using it. @@ -8102,7 +8102,7 @@ Date: Fri Feb 22 11:40:50 2008 + We already have a vendor subdir for Atmel, so we should use it. -Signed-off-by: Haavard Skinnemoen hskinnemoen at atmel.com +Signed-off-by: Haavard Skinnemoen [EMAIL PROTECTED] commit 6d0943a6be99977d6d853d51749e9963d68eb192 Author: Andreas Engel [EMAIL PROTECTED] @@ -8152,8 +8152,8 @@ Date: Thu Jan 3 21:15:56 2008 + AT91CAP9 support : MACB changes -Signed-off-by: Stelian Pop stelian at popies.net -Acked-by: Haavard Skinnemoen hskinnemoen at atmel.com +Signed-off-by: Stelian Pop [EMAIL PROTECTED] +Acked-by: Haavard Skinnemoen [EMAIL PROTECTED] commit 6afcabf11d7321850f4feaadfee841488ace54c5 Author: Stelian Pop [EMAIL PROTECTED] @@ -8169,7 +8169,7 @@ Date: Wed Jan 30 21:15:54 2008 + AT91CAP9 support : cpu/ files -Signed-off-by: Stelian Pop stelian at popies.net +Signed-off-by: Stelian Pop [EMAIL PROTECTED] commit fa506a926cec348805143576c941f8e61b333cc0 Author: Stelian Pop [EMAIL PROTECTED] diff --git a/board/atmel/at91cap9adk/Makefile b/board/atmel/at91cap9adk/Makefile index 6b4b4b0..e33af76 100644 --- a/board/atmel/at91cap9adk/Makefile +++ b/board/atmel/at91cap9adk/Makefile @@ -1,6 +1,6 @@ # # (C) Copyright 2003-2008 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] # # See file CREDITS for list of people who contributed to this # project. diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c index 24861ba..e6ae60c 100644 --- a/board/atmel/at91cap9adk/at91cap9adk.c +++ b/board/atmel/at91cap9adk/at91cap9adk.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop stelian.pop at leadtechdesign.com + * Stelian Pop [EMAIL PROTECTED] * Lead Tech Design www.leadtechdesign.com * * See file CREDITS for list of people who contributed to this diff --git a/board/atmel/at91cap9adk/led.c b/board/atmel/at91cap9adk/led.c index 04de139..a137c2a 100644 --- a/board/atmel/at91cap9adk/led.c +++ b/board/atmel/at91cap9adk/led.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop stelian.pop at leadtechdesign.com + * Stelian Pop [EMAIL PROTECTED] * Lead Tech Design www.leadtechdesign.com * * See file CREDITS for list of people
[U-Boot-Users] [PATCH 12/26] AT91SAM9260EK: Normalize BOOTARGS
This patch adapts CONFIG_BOOTARGS to the chosen boot method (boot from DataFlash or from NAND), and gives to Linux a fully specified mtdparts variable. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h | 16 ++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 1aa40ef..cd5f161 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -56,8 +56,6 @@ #define CONFIG_USART3 1 /* USART 3 is DBGU */ #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ - root=/dev/mtdblock0 rw rootfstype=jffs2 /* #define CONFIG_ENV_OVERWRITE1 */ @@ -144,6 +142,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock0 \ + mtdparts=at91_nand:-(root)\ + rw rootfstype=jffs2 #elif CFG_USE_DATAFLASH_CS1 @@ -154,6 +156,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xD003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock0 \ + mtdparts=at91_nand:-(root)\ + rw rootfstype=jffs2 #else /* CFG_USE_NANDFLASH */ @@ -163,6 +169,12 @@ #define CFG_ENV_OFFSET_REDUND 0x8 #define CFG_ENV_SIZE 0x2 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND nand read 0x2200 0xA 0x20; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock5 \ + mtdparts=at91_nand:128k(bootstrap)ro, \ + 256k(uboot)ro,128k(env1)ro, \ + 128k(env2)ro,2M(linux),-(root)\ + rw rootfstype=jffs2 #endif -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 05/26] Use a common u-boot.lds file across all AT91CAP9/AT91SAM9 platforms
All the AT91CAP9/AT91SAM9 boards have the same linker script. The patch
below avoids the duplication of u-boot.lds by putting the file in the
cpu directory instead of the board one.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/u-boot.lds | 57 --
board/atmel/at91sam9260ek/u-boot.lds | 57 --
cpu/arm926ejs/at91sam9/config.mk |1 +
cpu/arm926ejs/at91sam9/u-boot.lds| 57 ++
4 files changed, 58 insertions(+), 114 deletions(-)
delete mode 100644 board/atmel/at91cap9adk/u-boot.lds
delete mode 100644 board/atmel/at91sam9260ek/u-boot.lds
create mode 100644 cpu/arm926ejs/at91sam9/u-boot.lds
diff --git a/board/atmel/at91cap9adk/u-boot.lds
b/board/atmel/at91cap9adk/u-boot.lds
deleted file mode 100644
index 996f401..000
--- a/board/atmel/at91cap9adk/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, [EMAIL PROTECTED]
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-OUTPUT_FORMAT(elf32-littlearm, elf32-littlearm, elf32-littlearm)
-/*OUTPUT_FORMAT(elf32-arm, elf32-arm, elf32-arm)*/
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
- . = 0x;
-
- . = ALIGN(4);
- .text :
- {
- cpu/arm926ejs/start.o (.text)
- *(.text)
- }
-
- . = ALIGN(4);
- .rodata : { *(.rodata) }
-
- . = ALIGN(4);
- .data : { *(.data) }
-
- . = ALIGN(4);
- .got : { *(.got) }
-
- . = .;
- __u_boot_cmd_start = .;
- .u_boot_cmd : { *(.u_boot_cmd) }
- __u_boot_cmd_end = .;
-
- . = ALIGN(4);
- __bss_start = .;
- .bss : { *(.bss) }
- _end = .;
-}
diff --git a/board/atmel/at91sam9260ek/u-boot.lds
b/board/atmel/at91sam9260ek/u-boot.lds
deleted file mode 100644
index 996f401..000
--- a/board/atmel/at91sam9260ek/u-boot.lds
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, [EMAIL PROTECTED]
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-OUTPUT_FORMAT(elf32-littlearm, elf32-littlearm, elf32-littlearm)
-/*OUTPUT_FORMAT(elf32-arm, elf32-arm, elf32-arm)*/
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
- . = 0x;
-
- . = ALIGN(4);
- .text :
- {
- cpu/arm926ejs/start.o (.text)
- *(.text)
- }
-
- . = ALIGN(4);
- .rodata : { *(.rodata) }
-
- . = ALIGN(4);
- .data : { *(.data) }
-
- . = ALIGN(4);
- .got : { *(.got) }
-
- . = .;
- __u_boot_cmd_start = .;
- .u_boot_cmd : { *(.u_boot_cmd) }
- __u_boot_cmd_end = .;
-
- . = ALIGN(4);
- __bss_start = .;
- .bss : { *(.bss) }
- _end = .;
-}
diff --git a/cpu/arm926ejs/at91sam9/config.mk b/cpu/arm926ejs/at91sam9/config.mk
index ca2cae1..83040eb 100644
--- a/cpu/arm926ejs/at91sam9/config.mk
+++ b/cpu/arm926ejs/at91sam9/config.mk
@@ -1,2 +1,3 @@
PLATFORM_CPPFLAGS += -march=armv5te
PLATFORM_CPPFLAGS += $(call cc-option,-mtune=arm926ejs,)
+LDSCRIPT := $(SRCTREE)/cpu/arm926ejs/at91sam9/u-boot.lds
diff --git a/cpu/arm926ejs/at91sam9/u-boot.lds
b/cpu/arm926ejs/at91sam9/u-boot.lds
new file mode 100644
index 000..996f401
--- /dev/null
+++ b/cpu/arm926ejs/at91sam9/u-boot.lds
@@ -0,0 +1,57 @@
+/*
+ * (C) Copyright 2002
+ * Gary Jennejohn, DENX Software Engineering, [EMAIL PROTECTED
[U-Boot-Users] [PATCH 10/26] AT91SAM9260EK: Handle 8 or 16 bit NAND
The Atmel boards can handle 8 or 16 bit NAND memories. This patch
makes the support configurable in the board config header file
(CFG_NAND_DBW_8 or CFG_NAND_DBW_16).
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9260ek/at91sam9260ek.c |7 ++-
board/atmel/at91sam9260ek/nand.c |3 +++
include/configs/at91sam9260ek.h |1 +
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c
b/board/atmel/at91sam9260ek/at91sam9260ek.c
index 21479ac..4635f0f 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -90,7 +90,12 @@ static void at91sam9260ek_nand_hw_init(void)
at91_sys_write(AT91_SMC_MODE(3),
AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
AT91_SMC_EXNWMODE_DISABLE |
- AT91_SMC_DBW_8 | AT91_SMC_TDF_(2));
+#ifdef CFG_NAND_DBW_16
+ AT91_SMC_DBW_16 |
+#else /* CFG_NAND_DBW_8 */
+ AT91_SMC_DBW_8 |
+#endif
+ AT91_SMC_TDF_(2));
at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9260_ID_PIOC);
diff --git a/board/atmel/at91sam9260ek/nand.c b/board/atmel/at91sam9260ek/nand.c
index 7c1e6ab..9738f0f 100644
--- a/board/atmel/at91sam9260ek/nand.c
+++ b/board/atmel/at91sam9260ek/nand.c
@@ -68,6 +68,9 @@ static int at91sam9260ek_nand_ready(struct mtd_info *mtd)
int board_nand_init(struct nand_chip *nand)
{
nand-eccmode = NAND_ECC_SOFT;
+#ifdef CFG_NAND_DBW_16
+ nand-options = NAND_BUSWIDTH_16;
+#endif
nand-hwcontrol = at91sam9260ek_nand_hwcontrol;
nand-dev_ready = at91sam9260ek_nand_ready;
nand-chip_delay = 20;
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 41c418f..784b9e5 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -104,6 +104,7 @@
#define NAND_MAX_CHIPS 1
#define CFG_MAX_NAND_DEVICE1
#define CFG_NAND_BASE 0x4000
+#define CFG_NAND_DBW_8 1
/* NOR flash - no real flash on this board */
#define CFG_NO_FLASH 1
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 11/26] AT91SAM9260EK: Normalize SPI timings
This patch changes the SPI timings to closely match the ones used by the Linux kernel and the Atmel's own bootstrap project. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 784b9e5..1aa40ef 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -96,7 +96,7 @@ #define CFG_MAX_DATAFLASH_BANKS2 #define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC000 /* CS0 */ #define CFG_DATAFLASH_LOGIC_ADDR_CS1 0xD000 /* CS1 */ -#define AT91_SPI_CLK 3300 +#define AT91_SPI_CLK 1500 #define DATAFLASH_TCSS (0x1a 16) #define DATAFLASH_TCHS (0x1 24) -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 21/26] AT91CAP9ADK: hook up the ATMEL LCD driver
This patch makes the necessary adaptations (PIO configurations and
defines in config header file) to hook up the Atmel LCD driver to the
AT91CAP9ADK board.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/at91cap9adk.c | 64 +
include/configs/at91cap9adk.h | 13 +++
2 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index 67e16bb..e353cea 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -30,6 +30,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_MACB)
#include net.h
#endif
@@ -233,6 +235,65 @@ static void at91cap9_uhp_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91CAP9_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PC0, 0); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PC0, 1); /* power down */
+}
+
+static void at91cap9_lcd_hw_init(void)
+{
+ at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDDEN */
+ at91_set_B_periph(AT91_PIN_PB9, 0); /* LCDCC */
+ at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDD2 */
+ at91_set_A_periph(AT91_PIN_PC7, 0); /* LCDD3 */
+ at91_set_A_periph(AT91_PIN_PC8, 0); /* LCDD4 */
+ at91_set_A_periph(AT91_PIN_PC9, 0); /* LCDD5 */
+ at91_set_A_periph(AT91_PIN_PC10, 0);/* LCDD6 */
+ at91_set_A_periph(AT91_PIN_PC11, 0);/* LCDD7 */
+ at91_set_A_periph(AT91_PIN_PC14, 0);/* LCDD10 */
+ at91_set_A_periph(AT91_PIN_PC15, 0);/* LCDD11 */
+ at91_set_A_periph(AT91_PIN_PC16, 0);/* LCDD12 */
+ at91_set_A_periph(AT91_PIN_PC17, 0);/* LCDD13 */
+ at91_set_A_periph(AT91_PIN_PC18, 0);/* LCDD14 */
+ at91_set_A_periph(AT91_PIN_PC19, 0);/* LCDD15 */
+ at91_set_A_periph(AT91_PIN_PC22, 0);/* LCDD18 */
+ at91_set_A_periph(AT91_PIN_PC23, 0);/* LCDD19 */
+ at91_set_A_periph(AT91_PIN_PC24, 0);/* LCDD20 */
+ at91_set_A_periph(AT91_PIN_PC25, 0);/* LCDD21 */
+ at91_set_A_periph(AT91_PIN_PC26, 0);/* LCDD22 */
+ at91_set_A_periph(AT91_PIN_PC27, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_PCER, 1 AT91CAP9_ID_LCDC);
+
+ gd-fb_base = 0;
+}
+#endif
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -257,6 +318,9 @@ int board_init(void)
#ifdef CONFIG_USB_OHCI_NEW
at91cap9_uhp_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91cap9_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 5e13309..03c0e58 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91CAP9
#define AT91_MAIN_CLOCK2 /* from 12 MHz crystal
*/
#define AT91_MASTER_CLOCK 1 /* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_BGR5551
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 13/26] AT91SAM9260EK: Fix dataflash offsets in CONFIG_BOOTCOMMAND
This patch fixes the dataflash offsets used in CONFIG_BOOTCOMMAND in order to cope with the changes in DataFlash partitionning scheme (cset c3a60cb3). Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index cd5f161..f68e055 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -141,7 +141,7 @@ #define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTCOMMAND cp.b 0xC0042000 0x2200 0x21; bootm #define CONFIG_BOOTARGSconsole=ttyS0,115200 \ root=/dev/mtdblock0 \ mtdparts=at91_nand:-(root)\ @@ -155,7 +155,7 @@ #define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND cp.b 0xD003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTCOMMAND cp.b 0xD0042000 0x2200 0x21; bootm #define CONFIG_BOOTARGSconsole=ttyS0,115200 \ root=/dev/mtdblock0 \ mtdparts=at91_nand:-(root)\ -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 19/26] Remember the detected NAND size for later display
This patch adds a field in 'struct bd_info' for saving the detected
NAND size (result of nand_init() routine). This field can be used later
(for example in the lcd driver) to print out detailed information about
the board memories.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
include/asm-arm/u-boot.h |3 +++
lib_arm/board.c |6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/asm-arm/u-boot.h b/include/asm-arm/u-boot.h
index c120312..1a74b7a 100644
--- a/include/asm-arm/u-boot.h
+++ b/include/asm-arm/u-boot.h
@@ -52,6 +52,9 @@ typedef struct bd_info {
/* second onboard ethernet port */
unsigned char bi_enet1addr[6];
#endif
+#ifdef CONFIG_CMD_NAND
+ulong bi_nand_size;
+#endif
} bd_t;
#define bi_env_data bi_env-data
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 67506b3..5ee5bd4 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -56,7 +56,7 @@
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_CMD_NAND)
-void nand_init (void);
+ulong nand_init (void);
#endif
#if defined(CONFIG_CMD_ONENAND)
@@ -279,7 +279,7 @@ void start_armboot (void)
{
init_fnc_t **init_fnc_ptr;
char *s;
-#ifndef CFG_NO_FLASH
+#if !defined(CFG_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD)
ulong size;
#endif
#if defined(CONFIG_VFD) || defined(CONFIG_LCD)
@@ -340,7 +340,7 @@ void start_armboot (void)
#if defined(CONFIG_CMD_NAND)
puts (NAND: );
- nand_init();/* go init the NAND */
+ gd-bd-bi_nand_size = nand_init(); /* go init the NAND */
#endif
#if defined(CONFIG_CMD_ONENAND)
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 09/26] AT91CAP9ADK: Fix dataflash offsets in CONFIG_BOOTCOMMAND
This patch fixes the dataflash offsets used in CONFIG_BOOTCOMMAND in order to cope with the changes in DataFlash partitionning scheme (cset c3a60cb3). Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index a8f8d7d..5e13309 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -142,7 +142,7 @@ #define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x7200 0x200040; bootm +#define CONFIG_BOOTCOMMAND cp.b 0xC0042000 0x7200 0x21; bootm #define CONFIG_BOOTARGSconsole=ttyS0,115200 \ root=/dev/mtdblock1 \ mtdparts=physmap-flash.0:-(nor); \ -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 24/26] AT91SAM9RLEK: hook up the ATMEL LCD driver
This patch makes the necessary adaptations (PIO configurations and
defines in config header file) to hook up the Atmel LCD driver to the
AT91SAM9RLEK board.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9rlek/at91sam9rlek.c | 63 +++
include/configs/at91sam9rlek.h | 13 ++
2 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c
b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 8deecfd..10423d2 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -30,6 +30,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_MACB)
#include net.h
#endif
@@ -124,6 +126,64 @@ static void at91sam9rlek_spi_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91SAM9RL_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 0); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 1); /* power down */
+}
+static void at91sam9rlek_lcd_hw_init(void)
+{
+ at91_set_B_periph(AT91_PIN_PC1, 0); /* LCDPWR */
+ at91_set_A_periph(AT91_PIN_PC5, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PC7, 0); /* LCDDEN */
+ at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDCC */
+ at91_set_B_periph(AT91_PIN_PC9, 0); /* LCDD3 */
+ at91_set_B_periph(AT91_PIN_PC10, 0);/* LCDD4 */
+ at91_set_B_periph(AT91_PIN_PC11, 0);/* LCDD5 */
+ at91_set_B_periph(AT91_PIN_PC12, 0);/* LCDD6 */
+ at91_set_B_periph(AT91_PIN_PC13, 0);/* LCDD7 */
+ at91_set_B_periph(AT91_PIN_PC15, 0);/* LCDD11 */
+ at91_set_B_periph(AT91_PIN_PC16, 0);/* LCDD12 */
+ at91_set_B_periph(AT91_PIN_PC17, 0);/* LCDD13 */
+ at91_set_B_periph(AT91_PIN_PC18, 0);/* LCDD14 */
+ at91_set_B_periph(AT91_PIN_PC19, 0);/* LCDD15 */
+ at91_set_B_periph(AT91_PIN_PC20, 0);/* LCDD18 */
+ at91_set_B_periph(AT91_PIN_PC21, 0);/* LCDD19 */
+ at91_set_B_periph(AT91_PIN_PC22, 0);/* LCDD20 */
+ at91_set_B_periph(AT91_PIN_PC23, 0);/* LCDD21 */
+ at91_set_B_periph(AT91_PIN_PC24, 0);/* LCDD22 */
+ at91_set_B_periph(AT91_PIN_PC25, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9RL_ID_LCDC);
+
+ gd-fb_base = 0;
+}
+#endif
+
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -141,6 +201,9 @@ int board_init(void)
#ifdef CONFIG_HAS_DATAFLASH
at91sam9rlek_spi_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91sam9rlek_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 773f954..33d934f 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91SAM9RL
#define AT91_MAIN_CLOCK2 /* from 12.000 MHz
crystal */
#define AT91_MASTER_CLOCK 1 /* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_RGB5651
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 16/26] AT91SAM9263EK support [part 2 of 2]
This patch adds support for the AT91SAM9263 chip and the AT91SAM9263EK board. This patch has been splitted in two for mailing list pose limit reasons. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAINTAINERS|1 + MAKEALL|1 + Makefile |3 + board/atmel/at91sam9263ek/Makefile | 57 + board/atmel/at91sam9263ek/at91sam9263ek.c | 240 board/atmel/at91sam9263ek/config.mk|1 + board/atmel/at91sam9263ek/led.c| 78 +++ board/atmel/at91sam9263ek/nand.c | 79 +++ board/atmel/at91sam9263ek/partition.c | 39 drivers/net/macb.c |6 +- include/asm-arm/arch-at91sam9/at91sam9263_matrix.h | 129 +++ include/asm-arm/arch-at91sam9/hardware.h |4 + include/configs/at91sam9263ek.h| 195 net/eth.c |3 +- 14 files changed, 833 insertions(+), 3 deletions(-) create mode 100644 board/atmel/at91sam9263ek/Makefile create mode 100644 board/atmel/at91sam9263ek/at91sam9263ek.c create mode 100644 board/atmel/at91sam9263ek/config.mk create mode 100644 board/atmel/at91sam9263ek/led.c create mode 100644 board/atmel/at91sam9263ek/nand.c create mode 100644 board/atmel/at91sam9263ek/partition.c create mode 100644 include/asm-arm/arch-at91sam9/at91sam9263_matrix.h create mode 100644 include/configs/at91sam9263ek.h diff --git a/MAINTAINERS b/MAINTAINERS index 26f31fd..84bf19f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -539,6 +539,7 @@ Stelian Pop [EMAIL PROTECTED] at91cap9adk ARM926EJS (AT91CAP9 SoC) at91sam9260ek ARM926EJS (AT91SAM9260 SoC) at91sam9261ek ARM926EJS (AT91SAM9261 SoC) + at91sam9263ek ARM926EJS (AT91SAM9263 SoC) Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index 251da90..29aa7fc 100755 --- a/MAKEALL +++ b/MAKEALL @@ -459,6 +459,7 @@ LIST_ARM9= \ at91rm9200dk\ at91sam9260ek \ at91sam9261ek \ + at91sam9263ek \ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index 5e06ff5..65ef6c2 100644 --- a/Makefile +++ b/Makefile @@ -2329,6 +2329,9 @@ at91rm9200dk_config : unconfig at91sam9261ek_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91sam9 +at91sam9263ek_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9263ek/Makefile b/board/atmel/at91sam9263ek/Makefile new file mode 100644 index 000..5adb0bc --- /dev/null +++ b/board/atmel/at91sam9263ek/Makefile @@ -0,0 +1,57 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y += at91sam9263ek.o +COBJS-y += led.o +COBJS-y+= partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c new file mode
[U-Boot-Users] [PATCH 20/26] Add ATMEL LCD driver
This patch adds support for the ATMEL LCDC driver which is used on some
AT91 and AVR platforms.
Is has been tested with the AT91CAP9ADK, AT91SAM9261EK, AT91SAM9263EK and
AT91SAM9RLEK boards. Adaptation for AVR32 should probably be easy.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
README |4 +
common/lcd.c| 74 ++-
drivers/video/Makefile |1 +
drivers/video/atmel_lcdfb.c | 160 +++
include/asm-arm/arch-at91sam9/clk.h |6 +
include/atmel_lcdc.h| 177 +++
include/lcd.h | 30 ++-
lib_arm/board.c | 37 ++--
8 files changed, 477 insertions(+), 12 deletions(-)
create mode 100644 drivers/video/atmel_lcdfb.c
create mode 100644 include/atmel_lcdc.h
diff --git a/README b/README
index 5e2bca4..dca495d 100644
--- a/README
+++ b/README
@@ -962,6 +962,10 @@ The following options need to be configured:
display); also select one of the supported displays
by defining one of these:
+ CONFIG_ATMEL_LCD:
+
+ HITACHI TX09D70VM1CCA, 3.5, 240x320.
+
CONFIG_NEC_NL6448AC33:
NEC NL6448AC33-18. Active, color, single scan.
diff --git a/common/lcd.c b/common/lcd.c
index 914dc2e..faae6db 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -50,6 +50,10 @@
#include lcdvideo.h
#endif
+#if defined(CONFIG_ATMEL_LCD)
+#include atmel_lcdc.h
+#endif
+
#ifdef CONFIG_LCD
//
@@ -474,14 +478,22 @@ ulong lcd_setmem (ulong addr)
static void lcd_setfgcolor (int color)
{
+#ifdef CONFIG_ATMEL_LCD
+ lcd_color_fg = color;
+#else
lcd_color_fg = color 0x0F;
+#endif
}
/*--*/
static void lcd_setbgcolor (int color)
{
+#ifdef CONFIG_ATMEL_LCD
+ lcd_color_bg = color;
+#else
lcd_color_bg = color 0x0F;
+#endif
}
/*--*/
@@ -508,7 +520,11 @@ static int lcd_getbgcolor (void)
#ifdef CONFIG_LCD_LOGO
void bitmap_plot (int x, int y)
{
+#ifdef CONFIG_ATMEL_LCD
+ uint *cmap;
+#else
ushort *cmap;
+#endif
ushort i, j;
uchar *bmap;
uchar *fb;
@@ -533,6 +549,8 @@ void bitmap_plot (int x, int y)
cmap = (ushort *)fbi-palette;
#elif defined(CONFIG_MPC823)
cmap = (ushort
*)(cp-lcd_cmap[BMP_LOGO_OFFSET*sizeof(ushort)]);
+#elif defined(CONFIG_ATMEL_LCD)
+ cmap = (uint *) (panel_info.mmio + ATMEL_LCDC_LUT(0));
#endif
WATCHDOG_RESET();
@@ -540,11 +558,26 @@ void bitmap_plot (int x, int y)
/* Set color map */
for (i=0; i(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) {
ushort colreg = bmp_logo_palette[i];
+#ifdef CONFIG_ATMEL_LCD
+ uint lut_entry;
+#ifdef CONFIG_ATMEL_LCD_BGR555
+ lut_entry = ((colreg 0x000F) 11) |
+ ((colreg 0x00F0) 2) |
+ ((colreg 0x0F00) 7);
+#else /* CONFIG_ATMEL_LCD_RGB565 */
+ lut_entry = ((colreg 0x000F) 1) |
+ ((colreg 0x00F0) 3) |
+ ((colreg 0x0F00) 4);
+#endif
+ *(cmap + BMP_LOGO_OFFSET) = lut_entry;
+ cmap++;
+#else /* !CONFIG_ATMEL_LCD */
#ifdef CFG_INVERT_COLORS
*cmap++ = 0x - colreg;
#else
*cmap++ = colreg;
#endif
+#endif /* CONFIG_ATMEL_LCD */
}
WATCHDOG_RESET();
@@ -578,7 +611,9 @@ void bitmap_plot (int x, int y)
*/
int lcd_display_bitmap(ulong bmp_image, int x, int y)
{
-#if !defined(CONFIG_MCC200)
+#ifdef CONFIG_ATMEL_LCD
+ uint *cmap;
+#elif !defined(CONFIG_MCC200)
ushort *cmap;
#endif
ushort i, j;
@@ -633,6 +668,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
cmap = (ushort *)fbi-palette;
#elif defined(CONFIG_MPC823)
cmap = (ushort *)(cp-lcd_cmap[255*sizeof(ushort)]);
+#elif defined(CONFIG_ATMEL_LCD)
+ cmap = (uint *) (panel_info.mmio + ATMEL_LCDC_LUT(0));
#else
# error Don't know location of color map
#endif
@@ -708,6 +745,10 @@ static void *lcd_logo (void)
#ifdef CONFIG_LCD_INFO
char info[80];
char temp[32];
+#ifdef CONFIG_ATMEL_LCD
+ int i;
+ ulong dram_size;
+#endif
#endif /* CONFIG_LCD_INFO */
#ifdef CONFIG_SPLASH_SCREEN
@@ -765,6 +806,37 @@ static void *lcd_logo (void)
# endif /* CONFIG_LCD_INFO */
#endif /* CONFIG_MPC823 */
+#ifdef CONFIG_ATMEL_LCD
+# ifdef CONFIG_LCD_INFO
+ sprintf (info, %s
[U-Boot-Users] [PATCH 14/26] AT91SAM9261EK support
This patch adds support for the AT91SAM9261 chip and the AT91SAM9261EK board. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAINTAINERS|1 + MAKEALL|1 + Makefile |3 + board/atmel/at91sam9261ek/Makefile | 57 ++ board/atmel/at91sam9261ek/at91sam9261ek.c | 194 board/atmel/at91sam9261ek/config.mk|1 + board/atmel/at91sam9261ek/led.c| 78 board/atmel/at91sam9261ek/nand.c | 79 board/atmel/at91sam9261ek/partition.c | 40 cpu/arm926ejs/at91sam9/usb.c |8 + drivers/net/dm9000x.c |2 + include/asm-arm/arch-at91sam9/at91sam9261.h| 105 +++ include/asm-arm/arch-at91sam9/at91sam9261_matrix.h | 64 +++ include/asm-arm/arch-at91sam9/hardware.h |3 + include/configs/at91sam9261ek.h| 191 +++ 15 files changed, 827 insertions(+), 0 deletions(-) create mode 100644 board/atmel/at91sam9261ek/Makefile create mode 100644 board/atmel/at91sam9261ek/at91sam9261ek.c create mode 100644 board/atmel/at91sam9261ek/config.mk create mode 100644 board/atmel/at91sam9261ek/led.c create mode 100644 board/atmel/at91sam9261ek/nand.c create mode 100644 board/atmel/at91sam9261ek/partition.c create mode 100644 include/asm-arm/arch-at91sam9/at91sam9261.h create mode 100644 include/asm-arm/arch-at91sam9/at91sam9261_matrix.h create mode 100644 include/configs/at91sam9261ek.h diff --git a/MAINTAINERS b/MAINTAINERS index 58f833c..26f31fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -538,6 +538,7 @@ Stelian Pop [EMAIL PROTECTED] at91cap9adk ARM926EJS (AT91CAP9 SoC) at91sam9260ek ARM926EJS (AT91SAM9260 SoC) + at91sam9261ek ARM926EJS (AT91SAM9261 SoC) Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index 38911ed..251da90 100755 --- a/MAKEALL +++ b/MAKEALL @@ -458,6 +458,7 @@ LIST_ARM9= \ at91cap9adk \ at91rm9200dk\ at91sam9260ek \ + at91sam9261ek \ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index 167a717..5e06ff5 100644 --- a/Makefile +++ b/Makefile @@ -2326,6 +2326,9 @@ shannon_config: unconfig at91rm9200dk_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 +at91sam9261ek_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9261ek/Makefile b/board/atmel/at91sam9261ek/Makefile new file mode 100644 index 000..7702a9c --- /dev/null +++ b/board/atmel/at91sam9261ek/Makefile @@ -0,0 +1,57 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y += at91sam9261ek.o +COBJS-y += led.o +COBJS-y+= partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c new file mode 100644
[U-Boot-Users] [PATCH 17/26] AT91SAM9RLEK support
This patch adds support for the AT91SAM9RL chip and the AT91SAM9RLEK board. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAINTAINERS |1 + MAKEALL |1 + Makefile |3 + board/atmel/at91sam9rlek/Makefile | 57 +++ board/atmel/at91sam9rlek/at91sam9rlek.c | 152 +++ board/atmel/at91sam9rlek/config.mk|1 + board/atmel/at91sam9rlek/led.c| 77 ++ board/atmel/at91sam9rlek/nand.c | 79 ++ board/atmel/at91sam9rlek/partition.c | 39 + include/asm-arm/arch-at91sam9/at91sam9rl.h| 115 ++ include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h | 96 include/asm-arm/arch-at91sam9/hardware.h |2 + include/configs/at91sam9rlek.h| 164 + 13 files changed, 787 insertions(+), 0 deletions(-) create mode 100644 board/atmel/at91sam9rlek/Makefile create mode 100644 board/atmel/at91sam9rlek/at91sam9rlek.c create mode 100644 board/atmel/at91sam9rlek/config.mk create mode 100644 board/atmel/at91sam9rlek/led.c create mode 100644 board/atmel/at91sam9rlek/nand.c create mode 100644 board/atmel/at91sam9rlek/partition.c create mode 100644 include/asm-arm/arch-at91sam9/at91sam9rl.h create mode 100644 include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h create mode 100644 include/configs/at91sam9rlek.h diff --git a/MAINTAINERS b/MAINTAINERS index 84bf19f..2047af0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -540,6 +540,7 @@ Stelian Pop [EMAIL PROTECTED] at91sam9260ek ARM926EJS (AT91SAM9260 SoC) at91sam9261ek ARM926EJS (AT91SAM9261 SoC) at91sam9263ek ARM926EJS (AT91SAM9263 SoC) + at91sam9rlekARM926EJS (AT91SAM9RL SoC) Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index 29aa7fc..62ff019 100755 --- a/MAKEALL +++ b/MAKEALL @@ -460,6 +460,7 @@ LIST_ARM9= \ at91sam9260ek \ at91sam9261ek \ at91sam9263ek \ + at91sam9rlek\ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index 65ef6c2..50f61c1 100644 --- a/Makefile +++ b/Makefile @@ -2332,6 +2332,9 @@ at91sam9261ek_config : unconfig at91sam9263ek_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91sam9 +at91sam9rlek_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9rlek/Makefile b/board/atmel/at91sam9rlek/Makefile new file mode 100644 index 000..a86a926 --- /dev/null +++ b/board/atmel/at91sam9rlek/Makefile @@ -0,0 +1,57 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# (C) Copyright 2008 +# Stelian Pop [EMAIL PROTECTED] +# Lead Tech Design www.leadtechdesign.com +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y += at91sam9rlek.o +COBJS-y += led.o +COBJS-y+= partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c new file mode 100644 index 000..8deecfd --- /dev/null +++ b/board/atmel/at91sam9rlek
[U-Boot-Users] [PATCH 23/26] AT91SAM9263EK: hook up the ATMEL LCD driver
This patch makes the necessary adaptations (PIO configurations and
defines in config header file) to hook up the Atmel LCD driver to the
AT91SAM9263EK board.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9263ek/at91sam9263ek.c | 65 +
include/configs/at91sam9263ek.h | 13 ++
2 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c
b/board/atmel/at91sam9263ek/at91sam9263ek.c
index a6268a6..ba7fc71 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -23,6 +23,7 @@
*/
#include common.h
+#include asm/sizes.h
#include asm/arch/at91sam9263.h
#include asm/arch/at91sam9263_matrix.h
#include asm/arch/at91sam9_smc.h
@@ -30,6 +31,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_MACB)
#include net.h
#endif
@@ -193,6 +196,65 @@ static void at91sam9263ek_uhp_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91SAM9263_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 1); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 0); /* power down */
+}
+
+static void at91sam9263ek_lcd_hw_init(void)
+{
+ at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDDEN */
+ at91_set_B_periph(AT91_PIN_PB9, 0); /* LCDCC */
+ at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDD2 */
+ at91_set_A_periph(AT91_PIN_PC7, 0); /* LCDD3 */
+ at91_set_A_periph(AT91_PIN_PC8, 0); /* LCDD4 */
+ at91_set_A_periph(AT91_PIN_PC9, 0); /* LCDD5 */
+ at91_set_A_periph(AT91_PIN_PC10, 0);/* LCDD6 */
+ at91_set_A_periph(AT91_PIN_PC11, 0);/* LCDD7 */
+ at91_set_A_periph(AT91_PIN_PC14, 0);/* LCDD10 */
+ at91_set_A_periph(AT91_PIN_PC15, 0);/* LCDD11 */
+ at91_set_A_periph(AT91_PIN_PC16, 0);/* LCDD12 */
+ at91_set_B_periph(AT91_PIN_PC12, 0);/* LCDD13 */
+ at91_set_A_periph(AT91_PIN_PC18, 0);/* LCDD14 */
+ at91_set_A_periph(AT91_PIN_PC19, 0);/* LCDD15 */
+ at91_set_A_periph(AT91_PIN_PC22, 0);/* LCDD18 */
+ at91_set_A_periph(AT91_PIN_PC23, 0);/* LCDD19 */
+ at91_set_A_periph(AT91_PIN_PC24, 0);/* LCDD20 */
+ at91_set_B_periph(AT91_PIN_PC17, 0);/* LCDD21 */
+ at91_set_A_periph(AT91_PIN_PC26, 0);/* LCDD22 */
+ at91_set_A_periph(AT91_PIN_PC27, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9263_ID_LCDC);
+
+ gd-fb_base = AT91SAM9263_SRAM0_BASE;
+}
+#endif
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -216,6 +278,9 @@ int board_init(void)
#ifdef CONFIG_USB_OHCI_NEW
at91sam9263ek_uhp_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91sam9263ek_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index d28f7d8..1c50134 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91SAM9263
#define AT91_MAIN_CLOCK199919000 /* from 16.367 MHz
crystal */
#define AT91_MASTER_CLOCK 99959500/* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_BGR5551
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http
[U-Boot-Users] [PATCH 25/26] Use custom logo for Atmel boards
This patch adds a custom vendor logo for the Atmel AT91 boards.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
tools/Makefile|4
tools/logos/atmel.bmp | Bin 0 - 26334 bytes
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 tools/logos/atmel.bmp
diff --git a/tools/Makefile b/tools/Makefile
index b897923..dc210e8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -44,6 +44,10 @@ LOGO_H = $(OBJTREE)/include/bmp_logo.h
ifeq ($(LOGO_BMP),)
LOGO_BMP= logos/denx.bmp
endif
+ifeq ($(VENDOR),atmel)
+LOGO_BMP= logos/atmel.bmp
+endif
+
#-
diff --git a/tools/logos/atmel.bmp b/tools/logos/atmel.bmp
new file mode 100644
index
..3c445c9bc365aff31bf5f6c464ab2b1d7a99e99e
GIT binary patch
literal 26334
zcmd^{y^my9TE?%dt6b%2x9uH|y;yXT%jdF1c(rkZ_IzN85^tsi3E`mZc2iL$dC{T
z(gqfCzyQs0xN`kQNdoKEy`?!Ae;Ce$R8xty|qao^D4TFQJCbI*Ct^M1eQ+}qXj
ztKa^~cb2q2^AV){Wq^)=k;N;(b|uf%zXkFZ~?_VxMapD+LQk3U{M{q8q;eQWu@
zwsl7l(8TE-nW;[EMAIL PROTECTED](KVa;C|MOp#wle4m%snx
z-(CLaUw^{fo6)d``=mqL~}r`R5~$?}sw`~LE`fA|~AXW#qQ@k#gwdJ$l`laRH
z|KTr}AOF#JmmmK2FE7WdEB?`TJKx*qs+}W)ba(kVI=ee{2-?%h6%IL_yWU59FGIj
z)#);_8iA)#N|60YiyEr74P8-e0DfudYOzat#uNnUXu}uohkpdtQfS*)K3q0lIrf
z!-BUkMe;UblrV5~Ga8lX=E|8laa7GWXgrL(rMKtfG$u$5zZh|BeSf9apDv`=+KTQ
z#O)|c(cQbVnX^k#1GOZQMei}`VsUNAUyJWnA^;q^-m16l2;Q*zG!thzbk4aDtNV
zDe^NdQ{Rqe)29v^$tyzX3-V|Wr|pER}6ot8t{dX=k$eAgn_g+#h3yp(+8-v$CZb}
zet)BmcouiuZDliO1wl1dcY=8tjv|1z=~n31U7e=H}r=*YJSgewYBMw9$ZY!PI1e
zWLYFVDQ7ju{^`fU_FPCSgwLpp=1[EMAIL PROTECTED]|U1Iw4?W`9`1r0Z2J
zmq8n#QAz=$o70;No;KI5fA8mE1qLY!T6BH-UNxbTBin+tdiJ?F^yYR01^1;btVx!
zp+6*dh7{U;h`RnP=([EMAIL PROTECTED];MkF9PymOOo}-{21n0TS@A8
zcQbef`%n#RMr4TSu~w{e+N7`oai!p=;XTj0|[EMAIL PROTECTED]
zjG`p;afB(BD0N{%1py+Je$kJE!x53_J3nGlQc;*MTRGu{4X$ASp*hEO=ynzqT{
[EMAIL PROTECTED]@8(!QSJyr)?0Q4sCPwUgmZy?V{`jniscL!w!WIdraWt#j#)iiIyUek+z
zOf1y$+lnR8tXKo6L%y#d_PruZ62|[EMAIL PROTECTED]|vRoVFE{psl%IiSMl
zJN;[EMAIL PROTECTED]Um_0V125D4krCTf|cjl3+*SX-Z28?472izoz941J_HP~w~7nZs2
zF{XJ+ABeJN!u)kQ6tYDux([EMAIL PROTECTED]*49Pt;2s~Ivcq9xP(88m@
za+0+AwF~ODVrg?tl8P0?5f?7Y?s)[EMAIL PROTECTED](HgB-$`Wmd;G(o*
z?RV6y-4UfvH#aG4$OXpT$58-SyB?EP8ll2T?ibF*j9xSjCFsdcdXFMLTRk0xO4%
zM|[EMAIL PROTECTED];24YQ#NKBR^7dKoYwK@(HBY|JVq{iFAWYZ%1S(eeP1)!smzf
zgR+-)[EMAIL PROTECTED]es7_W{yitiCmL7+hDh|$$^jmDC2-JirEg~QLe
zu^YPyzNNl9Yce4b$?K@[EMAIL PROTECTED])qcK3$iw6%HDM}!zjvXL66SV4gEL
zjy;3qD64T|udJI)%U6!WmVpmw1%oh7-efQ$-nn_-z9ys;YPL_Zq)XNBULQR~m#U
[EMAIL PROTECTED]pW;8H_UVY+V`{#4Jd36J+`xqv4(oZ!*|$s`0u
zH-n`e4pO4nxo;To?HoAVba%#j`D`L)?rH`PX7$1{)QX6KkSKq~cS)$Wumyy|TI
[EMAIL PROTECTED]t%v$O|
z7YzD1c)2}*3dfTJwpby!2M0y(p=1EbK8vMo=ZBByffL%rF9(c5Iu#0`1pV00Vf
z[EMAIL PROTECTED];y2B$oc31hVifP|L~^6k_7s2pGY(SoWOWa|V_jHm^|j}4
z-c;np4H|fbxH{iQ%6wE)A_WmLO!C3cuG^)fp+%Lyz=zMGNJ@%O#`Rf%L_{XQs?o
z_H)[EMAIL PROTECTED]X7+S^2z(F6IMBH)AM!{sj7K;0
zW2TGl6Pxu;o~O6~BLiYQO-o|l`t+)5e256n%P(S!ft}{q#+)Y|OkG%CUs_Ij^c
zwgl3wq||cDItLlHc*}1qqy?KxVZ1G~x?29z^Da%0ff6Ln5rWVJq2{O5rsjsug(C1q
zmnxKpHMs+5ZD!xdItl3Sc5e=WtDRAB_yh!D3PvAZE^^Z~YS^)|!!Yj*Q`~*9a?jRd
z}18dHnQTy`HltaYI5I=R3CnaI)EiQgTH0|nvP%vFOkIxNGZ$8Bmj-pe?56JS
[EMAIL PROTECTED]@L#`JDvsh+#J[EMAIL PROTECTED]@[EMAIL PROTECTED]n3C
zwjjII9VTS!lm;rF1VS;G1?oN!CAPL?$1UG`m7r#V|kFlTmkQ47R~)lF^{KT#x{
z6USAMH;Xy)+~xoD4lkv+C`fs*dMyHyj3C8qVlWuNjeI?DQXZKrp~IZg*K$V)TC
zxE#EN#IgJ8XByxhb_b9YzxXIaM([EMAIL PROTECTED][EMAIL PROTECTED]
z@k34n#WCu;vnY1wYrH{VO}n!*Q`;[EMAIL PROTECTED]($lyy51x5}cOD`yEtP-f$
z*-WYdxjZ4WqtdEx$h3LxPmFXl0N}KHDh2FSI_E0bYyM?W3_c7ZZ-;d2ASRP4?l
znp?`*w0WDMi0RiHgbzK%3AegD*i0NnHk+zuT!WJs2E!8wCfJojb)}J~|qiO
zj2DiaZ|ejjY-uXsjjjixw0Zu9)NheNQ;P2$hjX8HNtUia|)}kqINXzJonAX0vZE
zR!u|Jbc)[EMAIL PROTECTED]@bQ`sNvW-[EMAIL PROTECTED]@$Va
zo)[EMAIL PROTECTED])P#0cwpcC*T}Tboo}zhea)P(odh4GKcEyb(KRCeg?
[EMAIL PROTECTED]@U|V7eKcKm+qV414x2${[EMAIL PROTECTED]HAgIb{Rbi4S~!!%9M)N
ztov~2n~rmYaj}QZ?2)CX`$*l6FZ3YwRsZp;DgsaRG6i;^q4t7_g6b18K*I;G_
zlX^_-PB+vOuWuw8zLh#Ul_v7+dL0gPnBSRH!I+BGmeBi5e|7cid3KR_CUv+#m_
zV3A+{vbUd68ifHFp*%8JCA2f6iPDLyZvyFaBHHMQtyR^8qE5Rp4mXHT$Cgpi5z
zSw_6MZE20U7[EMAIL PROTECTED]@^(c$t+Ca21Cr=sbdQ+;k3Ro5ZOJw
z_J_PpWm8;;f`JuHKh#xYF8lT8oo=Kg|crdUR~7LFlcGZCe0*|_G}SG5dKARZ;x5
[EMAIL PROTECTED]|r+Cv?PUf(Ltf|l;Tp0A|nKZVHQ#RI72*p%fP+JPUNIZ8
[EMAIL PROTECTED]xO?xE_!di36W?(g2tz(CFVT8Wc5%Nt)YXJ^3h~o*Wsu(UdcZeO0
z#dRU^gc;cDEOfcTAy8?7Oxp}7y?g35?MLU%kaZEkqyPmmKJ0R+Q?DjQ_s`FiP#
zHCsQ;m^dJ=!lq`2K~P)[EMAIL PROTECTED]uW;[EMAIL PROTECTED])[EMAIL PROTECTED]
zBkTIh4`9-0rB}%iQ-y($|piFayjIRg7mNGEwO#jAyvuCKVetB[EMAIL PROTECTED]YV|(4
zHg1#$!-#vZ^JSvb+Gz-aVd8ZB{d%W~Z|_08[EMAIL PROTECTED];*R(
zZ4|ZLrHyT9BDs;CXO7Tj3t}y??72xwu1+8H%n^Ozn2Vj6TPS=ocP1Z;a)#XBe4T
zhhmP`[EMAIL PROTECTED](sfyYr#4
z{;drthL2g)eb;;)rZklSL1smcyEN3i!JsdHqwVgPNYRjrCcQwIR9jyl3+dr?bBJ
[EMAIL PROTECTED]|(BiCuq?ZzzaDd0`cA*lb~@(Tw1SU;EV
z`pDTc8X_2QOnTGdL{KYduKKP%yyMwyEYh64?dk-[EMAIL PROTECTED]ASZ2BjbClL*{
z0#w}j9#1qaS6EoPm2viPGXtU3#bO-_DuRh=Um)CWTZe9^SPQHR0xi%e(l9J`f3
zejalT)MQLn*Fl-qkK^fpj$2zmqNl_}1e6=id)Sws-|kERw
Re: [U-Boot-Users] 1.3.3-rc3 - release status
Le mardi 06 mai 2008 à 10:08 +0200, Haavard Skinnemoen a écrit : Remy Bohmer [EMAIL PROTECTED] wrote: I am looking at this tree, and am trying to get the AT91SAM9261-EK board up and running, I derived it from the AT91SAM9260-EK board (and the Atmel 1.1.5 U-boot release which works), and I notice some oddities, [...] I've Cc'd Nicolas and Stelian...hopefully one of them will be able to help you. Thanks Haavard for forwarding, I indeed missed this message on the mailing list. Remy: your problem *might* be related to the size of the malloc'ed area. Ensure you have something like: #define CFG_MALLOC_LEN ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000) in include/configs/at91sam9261.h (notice the 3 factor). Anyways, I have a full series of patches ready, adding support for: - AT91SAM9261 - AT91SAM9263 - AT91SAM9RL - LCD display for all AT91SAM platforms. I'm just waiting for the merge window to open and I'll post them all. Meanwhile, if you wish, I can send you the patches privately. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 01/21] AT91CAP9ADK: Handle 8 or 16 bit NAND
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/at91cap9adk.c |8 ++--
board/atmel/at91cap9adk/nand.c|3 +++
include/configs/at91cap9adk.h |1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index 24861ba..ab56f3a 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -116,7 +116,12 @@ static void at91cap9_nand_hw_init(void)
at91_sys_write(AT91_SMC_MODE(3),
AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
AT91_SMC_EXNWMODE_DISABLE |
- AT91_SMC_DBW_8 | AT91_SMC_TDF_(1));
+#ifdef CFG_NAND_DBW_16
+ AT91_SMC_DBW_16 |
+#else /* CFG_NAND_DBW_8 */
+ AT91_SMC_DBW_8 |
+#endif
+ AT91_SMC_TDF_(1));
at91_sys_write(AT91_PMC_PCER, 1 AT91CAP9_ID_PIOABCD);
@@ -252,7 +257,6 @@ int board_init(void)
#ifdef CONFIG_USB_OHCI_NEW
at91cap9_uhp_hw_init();
#endif
-
return 0;
}
diff --git a/board/atmel/at91cap9adk/nand.c b/board/atmel/at91cap9adk/nand.c
index c72b024..5d49aee 100644
--- a/board/atmel/at91cap9adk/nand.c
+++ b/board/atmel/at91cap9adk/nand.c
@@ -63,6 +63,9 @@ static void at91cap9adk_nand_hwcontrol(struct mtd_info *mtd,
int cmd)
int board_nand_init(struct nand_chip *nand)
{
nand-eccmode = NAND_ECC_SOFT;
+#ifdef CFG_NAND_DBW_16
+ nand-options = NAND_BUSWIDTH_16;
+#endif
nand-hwcontrol = at91cap9adk_nand_hwcontrol;
nand-chip_delay = 20;
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index dab21d0..88527a4 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -110,6 +110,7 @@
#define NAND_MAX_CHIPS 1
#define CFG_MAX_NAND_DEVICE1
#define CFG_NAND_BASE 0x4000
+#define CFG_NAND_DBW_8 1
/* Ethernet */
#define CONFIG_MACB1
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 05/21] AT91SAM9260EK: Handle 8 or 16 bit NAND
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9260ek/at91sam9260ek.c |7 ++-
board/atmel/at91sam9260ek/nand.c |3 +++
include/configs/at91sam9260ek.h |1 +
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c
b/board/atmel/at91sam9260ek/at91sam9260ek.c
index a55468e..7d325e8 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -90,7 +90,12 @@ static void at91sam9260ek_nand_hw_init(void)
at91_sys_write(AT91_SMC_MODE(3),
AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
AT91_SMC_EXNWMODE_DISABLE |
- AT91_SMC_DBW_8 | AT91_SMC_TDF_(2));
+#ifdef CFG_NAND_DBW_16
+ AT91_SMC_DBW_16 |
+#else /* CFG_NAND_DBW_8 */
+ AT91_SMC_DBW_8 |
+#endif
+ AT91_SMC_TDF_(2));
at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9260_ID_PIOC);
diff --git a/board/atmel/at91sam9260ek/nand.c b/board/atmel/at91sam9260ek/nand.c
index abb788a..a92b105 100644
--- a/board/atmel/at91sam9260ek/nand.c
+++ b/board/atmel/at91sam9260ek/nand.c
@@ -68,6 +68,9 @@ static int at91sam9260ek_nand_ready(struct mtd_info *mtd)
int board_nand_init(struct nand_chip *nand)
{
nand-eccmode = NAND_ECC_SOFT;
+#ifdef CFG_NAND_DBW_16
+ nand-options = NAND_BUSWIDTH_16;
+#endif
nand-hwcontrol = at91sam9260ek_nand_hwcontrol;
nand-dev_ready = at91sam9260ek_nand_ready;
nand-chip_delay = 20;
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 96d1b8d..8d02416 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -104,6 +104,7 @@
#define NAND_MAX_CHIPS 1
#define CFG_MAX_NAND_DEVICE1
#define CFG_NAND_BASE 0x4000
+#define CFG_NAND_DBW_8 1
/* NOR flash - no real flash on this board */
#define CFG_NO_FLASH 1
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 03/21] AT91CAP9ADK: Normalize BOOTARGS
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index a648ce0..78b2283 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -56,8 +56,6 @@ #define CONFIG_USART3 1 /* USART 3 is DBGU */ #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ - root=/dev/mtdblock1 rw rootfstype=jffs2 /* #define CONFIG_ENV_OVERWRITE1 */ @@ -145,6 +143,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x7200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock1 \ + mtdparts=physmap-flash.0:-(nor);at91_nand:-(root) \ + rw rootfstype=jffs2 #else @@ -155,6 +157,10 @@ #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4000 #define CONFIG_BOOTCOMMAND cp.b 0x1004 0x7200 0x20; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock4 \ + mtdparts=physmap-flash.0:16k(bootstrap)ro,16k(env),224k(uboot)ro,-(linux);at91_nand:-(root) \ + rw rootfstype=jffs2 #endif -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 02/21] AT91CAP9ADK: Normalize SPI timings
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 88527a4..a648ce0 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -94,9 +94,9 @@ #define CFG_SPI_WRITE_TOUT (5*CFG_HZ) #define CFG_MAX_DATAFLASH_BANKS1 #define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC000 /* CS0 */ -#define AT91_SPI_CLK 2000 -#define DATAFLASH_TCSS (0xFA 16) -#define DATAFLASH_TCHS (0x8 24) +#define AT91_SPI_CLK 1500 +#define DATAFLASH_TCSS (0x1a 16) +#define DATAFLASH_TCHS (0x1 24) /* NOR flash */ #define CFG_FLASH_CFI 1 -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 12/21] Make nand_init() return the detected NAND size
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
drivers/mtd/nand/nand.c |3 ++-
include/nand.h |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index 27b5792..c5746fe 100644
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -60,7 +60,7 @@ static void nand_init_chip(struct mtd_info *mtd, struct
nand_chip *nand,
}
-void nand_init(void)
+ulong nand_init(void)
{
int i;
unsigned int size = 0;
@@ -78,6 +78,7 @@ void nand_init(void)
*/
board_nand_select_device(nand_info[nand_curr_device].priv,
nand_curr_device);
#endif
+ return size;
}
#endif
diff --git a/include/nand.h b/include/nand.h
index 247d346..8f388c4 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -32,7 +32,7 @@ typedef struct mtd_info nand_info_t;
extern int nand_curr_device;
extern nand_info_t nand_info[];
-extern void nand_init(void);
+extern ulong nand_init(void);
static inline int nand_read(nand_info_t *info, off_t ofs, size_t *len, u_char
*buf)
{
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 15/21] AT91CAP9ADK: hook up the ATMEL LCD driver
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/at91cap9adk.c | 64 +
include/configs/at91cap9adk.h | 13 +++
2 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index ab56f3a..ee4f26e 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -30,6 +30,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_MACB)
#include net.h
#endif
@@ -233,6 +235,65 @@ static void at91cap9_uhp_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91CAP9_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PC0, 0); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PC0, 1); /* power down */
+}
+
+static void at91cap9_lcd_hw_init(void)
+{
+ at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDDEN */
+ at91_set_B_periph(AT91_PIN_PB9, 0); /* LCDCC */
+ at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDD2 */
+ at91_set_A_periph(AT91_PIN_PC7, 0); /* LCDD3 */
+ at91_set_A_periph(AT91_PIN_PC8, 0); /* LCDD4 */
+ at91_set_A_periph(AT91_PIN_PC9, 0); /* LCDD5 */
+ at91_set_A_periph(AT91_PIN_PC10, 0);/* LCDD6 */
+ at91_set_A_periph(AT91_PIN_PC11, 0);/* LCDD7 */
+ at91_set_A_periph(AT91_PIN_PC14, 0);/* LCDD10 */
+ at91_set_A_periph(AT91_PIN_PC15, 0);/* LCDD11 */
+ at91_set_A_periph(AT91_PIN_PC16, 0);/* LCDD12 */
+ at91_set_A_periph(AT91_PIN_PC17, 0);/* LCDD13 */
+ at91_set_A_periph(AT91_PIN_PC18, 0);/* LCDD14 */
+ at91_set_A_periph(AT91_PIN_PC19, 0);/* LCDD15 */
+ at91_set_A_periph(AT91_PIN_PC22, 0);/* LCDD18 */
+ at91_set_A_periph(AT91_PIN_PC23, 0);/* LCDD19 */
+ at91_set_A_periph(AT91_PIN_PC24, 0);/* LCDD20 */
+ at91_set_A_periph(AT91_PIN_PC25, 0);/* LCDD21 */
+ at91_set_A_periph(AT91_PIN_PC26, 0);/* LCDD22 */
+ at91_set_A_periph(AT91_PIN_PC27, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_PCER, 1 AT91CAP9_ID_LCDC);
+
+ gd-fb_base = 0;
+}
+#endif
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -257,6 +318,9 @@ int board_init(void)
#ifdef CONFIG_USB_OHCI_NEW
at91cap9_uhp_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91cap9_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index ec70618..82c2039 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91CAP9
#define AT91_MAIN_CLOCK2 /* from 12 MHz crystal
*/
#define AT91_MASTER_CLOCK 1 /* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_BGR5551
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 08/21] AT91SAM9260EK: Fix dataflash offsets in BOOTCMD
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index e25985e..f334a53 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -141,7 +141,7 @@ #define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTCOMMAND cp.b 0xC0042000 0x2200 0x21; bootm #define CONFIG_BOOTARGSconsole=ttyS0,115200 \ root=/dev/mtdblock0 \ mtdparts=at91_nand:-(root) \ @@ -155,7 +155,7 @@ #define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND cp.b 0xD003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTCOMMAND cp.b 0xD0042000 0x2200 0x21; bootm #define CONFIG_BOOTARGSconsole=ttyS0,115200 \ root=/dev/mtdblock0 \ mtdparts=at91_nand:-(root) \ -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 17/21] AT91SAM9263EK: hook up the ATMEL LCD driver
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9263ek/at91sam9263ek.c | 65 +
include/configs/at91sam9263ek.h | 13 ++
2 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c
b/board/atmel/at91sam9263ek/at91sam9263ek.c
index ee6b69f..ba152d2 100644
--- a/board/atmel/at91sam9263ek/at91sam9263ek.c
+++ b/board/atmel/at91sam9263ek/at91sam9263ek.c
@@ -23,6 +23,7 @@
*/
#include common.h
+#include asm/sizes.h
#include asm/arch/at91sam9263.h
#include asm/arch/at91sam9263_matrix.h
#include asm/arch/at91sam926x_mc.h
@@ -30,6 +31,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_MACB)
#include net.h
#endif
@@ -193,6 +196,65 @@ static void at91sam9263ek_uhp_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91SAM9263_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 1); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 0); /* power down */
+}
+
+static void at91sam9263ek_lcd_hw_init(void)
+{
+ at91_set_A_periph(AT91_PIN_PC1, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PC2, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDDEN */
+ at91_set_B_periph(AT91_PIN_PB9, 0); /* LCDCC */
+ at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDD2 */
+ at91_set_A_periph(AT91_PIN_PC7, 0); /* LCDD3 */
+ at91_set_A_periph(AT91_PIN_PC8, 0); /* LCDD4 */
+ at91_set_A_periph(AT91_PIN_PC9, 0); /* LCDD5 */
+ at91_set_A_periph(AT91_PIN_PC10, 0);/* LCDD6 */
+ at91_set_A_periph(AT91_PIN_PC11, 0);/* LCDD7 */
+ at91_set_A_periph(AT91_PIN_PC14, 0);/* LCDD10 */
+ at91_set_A_periph(AT91_PIN_PC15, 0);/* LCDD11 */
+ at91_set_A_periph(AT91_PIN_PC16, 0);/* LCDD12 */
+ at91_set_B_periph(AT91_PIN_PC12, 0);/* LCDD13 */
+ at91_set_A_periph(AT91_PIN_PC18, 0);/* LCDD14 */
+ at91_set_A_periph(AT91_PIN_PC19, 0);/* LCDD15 */
+ at91_set_A_periph(AT91_PIN_PC22, 0);/* LCDD18 */
+ at91_set_A_periph(AT91_PIN_PC23, 0);/* LCDD19 */
+ at91_set_A_periph(AT91_PIN_PC24, 0);/* LCDD20 */
+ at91_set_B_periph(AT91_PIN_PC17, 0);/* LCDD21 */
+ at91_set_A_periph(AT91_PIN_PC26, 0);/* LCDD22 */
+ at91_set_A_periph(AT91_PIN_PC27, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9263_ID_LCDC);
+
+ gd-fb_base = AT91SAM9263_SRAM0_BASE;
+}
+#endif
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -216,6 +278,9 @@ int board_init(void)
#ifdef CONFIG_USB_OHCI_NEW
at91sam9263ek_uhp_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91sam9263ek_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index e2ffbbe..ae574d7 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91SAM9263
#define AT91_MAIN_CLOCK199919000 /* from 16.367 MHz
crystal */
#define AT91_MASTER_CLOCK 99959500/* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_BGR5551
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot
[U-Boot-Users] [PATCH 04/21] AT91CAP9ADK: Fix dataflash offsets in BOOTCMD
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 78b2283..ec70618 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -142,7 +142,7 @@ #define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x7200 0x200040; bootm +#define CONFIG_BOOTCOMMAND cp.b 0xC0042000 0x7200 0x21; bootm #define CONFIG_BOOTARGSconsole=ttyS0,115200 \ root=/dev/mtdblock1 \ mtdparts=physmap-flash.0:-(nor);at91_nand:-(root) \ -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 11/21] AT91SAM9RLEK support
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAINTAINERS |1 + MAKEALL |1 + Makefile |3 + board/atmel/at91sam9rlek/Makefile | 53 +++ board/atmel/at91sam9rlek/at91sam9rlek.c | 152 +++ board/atmel/at91sam9rlek/config.mk|1 + board/atmel/at91sam9rlek/led.c| 77 ++ board/atmel/at91sam9rlek/nand.c | 79 ++ board/atmel/at91sam9rlek/partition.c | 37 + board/atmel/at91sam9rlek/u-boot.lds | 57 +++ include/asm-arm/arch-at91sam9/at91sam9rl.h| 115 ++ include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h | 96 include/asm-arm/arch-at91sam9/hardware.h |2 + include/configs/at91sam9rlek.h| 164 + 14 files changed, 838 insertions(+), 0 deletions(-) create mode 100644 board/atmel/at91sam9rlek/Makefile create mode 100644 board/atmel/at91sam9rlek/at91sam9rlek.c create mode 100644 board/atmel/at91sam9rlek/config.mk create mode 100644 board/atmel/at91sam9rlek/led.c create mode 100644 board/atmel/at91sam9rlek/nand.c create mode 100644 board/atmel/at91sam9rlek/partition.c create mode 100644 board/atmel/at91sam9rlek/u-boot.lds create mode 100644 include/asm-arm/arch-at91sam9/at91sam9rl.h create mode 100644 include/asm-arm/arch-at91sam9/at91sam9rl_matrix.h create mode 100644 include/configs/at91sam9rlek.h diff --git a/MAINTAINERS b/MAINTAINERS index 84bf19f..2047af0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -540,6 +540,7 @@ Stelian Pop [EMAIL PROTECTED] at91sam9260ek ARM926EJS (AT91SAM9260 SoC) at91sam9261ek ARM926EJS (AT91SAM9261 SoC) at91sam9263ek ARM926EJS (AT91SAM9263 SoC) + at91sam9rlekARM926EJS (AT91SAM9RL SoC) Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index 29aa7fc..62ff019 100755 --- a/MAKEALL +++ b/MAKEALL @@ -460,6 +460,7 @@ LIST_ARM9= \ at91sam9260ek \ at91sam9261ek \ at91sam9263ek \ + at91sam9rlek\ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index 65ef6c2..50f61c1 100644 --- a/Makefile +++ b/Makefile @@ -2332,6 +2332,9 @@ at91sam9261ek_config : unconfig at91sam9263ek_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91sam9 +at91sam9rlek_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9rlek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9rlek/Makefile b/board/atmel/at91sam9rlek/Makefile new file mode 100644 index 000..f291d5e --- /dev/null +++ b/board/atmel/at91sam9rlek/Makefile @@ -0,0 +1,53 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y += at91sam9rlek.o +COBJS-y += led.o +COBJS-y+= partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c new file mode 100644 index 000..488489c --- /dev/null +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -0,0 +1,152 @@ +/* + * (C) Copyright 2007
[U-Boot-Users] [PATCH 13/21] Remeber the RAM and NAND detected sizes for later display
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
include/asm-arm/u-boot.h |4
lib_arm/board.c | 14 --
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/include/asm-arm/u-boot.h b/include/asm-arm/u-boot.h
index c120312..dbfe2cf 100644
--- a/include/asm-arm/u-boot.h
+++ b/include/asm-arm/u-boot.h
@@ -48,10 +48,14 @@ typedef struct bd_info {
ulong start;
ulong size;
} bi_dram[CONFIG_NR_DRAM_BANKS];
+ulong bi_dram_size;
#ifdef CONFIG_HAS_ETH1
/* second onboard ethernet port */
unsigned char bi_enet1addr[6];
#endif
+#ifdef CONFIG_CMD_NAND
+ulong bi_nand_size;
+#endif
} bd_t;
#define bi_env_data bi_env-data
diff --git a/lib_arm/board.c b/lib_arm/board.c
index 67506b3..0752877 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -56,7 +56,7 @@
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_CMD_NAND)
-void nand_init (void);
+ulong nand_init (void);
#endif
#if defined(CONFIG_CMD_ONENAND)
@@ -187,21 +187,23 @@ static int display_dram_config (void)
{
int i;
+ gd-bd-bi_dram_size = 0;
+
#ifdef DEBUG
puts (RAM Configuration:\n);
for(i=0; iCONFIG_NR_DRAM_BANKS; i++) {
printf (Bank #%d: %08lx , i, gd-bd-bi_dram[i].start);
print_size (gd-bd-bi_dram[i].size, \n);
+ gd-bd-bi_dram_size += gd-bd-bi_dram[i].size;
}
#else
- ulong size = 0;
for (i=0; iCONFIG_NR_DRAM_BANKS; i++) {
- size += gd-bd-bi_dram[i].size;
+ gd-bd-bi_dram_size += gd-bd-bi_dram[i].size;
}
puts(DRAM: );
- print_size(size, \n);
+ print_size(gd-bd-bi_dram_size, \n);
#endif
return (0);
@@ -279,7 +281,7 @@ void start_armboot (void)
{
init_fnc_t **init_fnc_ptr;
char *s;
-#ifndef CFG_NO_FLASH
+#if !defined(CFG_NO_FLASH) || defined (CONFIG_VFD) || defined(CONFIG_LCD)
ulong size;
#endif
#if defined(CONFIG_VFD) || defined(CONFIG_LCD)
@@ -340,7 +342,7 @@ void start_armboot (void)
#if defined(CONFIG_CMD_NAND)
puts (NAND: );
- nand_init();/* go init the NAND */
+ gd-bd-bi_nand_size = nand_init(); /* go init the NAND */
#endif
#if defined(CONFIG_CMD_ONENAND)
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 18/21] AT91SAM9RLEK: hook up the ATMEL LCD driver
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9rlek/at91sam9rlek.c | 63 +++
include/configs/at91sam9rlek.h | 13 ++
2 files changed, 76 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c
b/board/atmel/at91sam9rlek/at91sam9rlek.c
index 488489c..1538bf1 100644
--- a/board/atmel/at91sam9rlek/at91sam9rlek.c
+++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
@@ -30,6 +30,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_MACB)
#include net.h
#endif
@@ -124,6 +126,64 @@ static void at91sam9rlek_spi_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91SAM9RL_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 0); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA30, 1); /* power down */
+}
+static void at91sam9rlek_lcd_hw_init(void)
+{
+ at91_set_B_periph(AT91_PIN_PC1, 0); /* LCDPWR */
+ at91_set_A_periph(AT91_PIN_PC5, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PC6, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PC7, 0); /* LCDDEN */
+ at91_set_A_periph(AT91_PIN_PC3, 0); /* LCDCC */
+ at91_set_B_periph(AT91_PIN_PC9, 0); /* LCDD3 */
+ at91_set_B_periph(AT91_PIN_PC10, 0);/* LCDD4 */
+ at91_set_B_periph(AT91_PIN_PC11, 0);/* LCDD5 */
+ at91_set_B_periph(AT91_PIN_PC12, 0);/* LCDD6 */
+ at91_set_B_periph(AT91_PIN_PC13, 0);/* LCDD7 */
+ at91_set_B_periph(AT91_PIN_PC15, 0);/* LCDD11 */
+ at91_set_B_periph(AT91_PIN_PC16, 0);/* LCDD12 */
+ at91_set_B_periph(AT91_PIN_PC17, 0);/* LCDD13 */
+ at91_set_B_periph(AT91_PIN_PC18, 0);/* LCDD14 */
+ at91_set_B_periph(AT91_PIN_PC19, 0);/* LCDD15 */
+ at91_set_B_periph(AT91_PIN_PC20, 0);/* LCDD18 */
+ at91_set_B_periph(AT91_PIN_PC21, 0);/* LCDD19 */
+ at91_set_B_periph(AT91_PIN_PC22, 0);/* LCDD20 */
+ at91_set_B_periph(AT91_PIN_PC23, 0);/* LCDD21 */
+ at91_set_B_periph(AT91_PIN_PC24, 0);/* LCDD22 */
+ at91_set_B_periph(AT91_PIN_PC25, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9RL_ID_LCDC);
+
+ gd-fb_base = 0;
+}
+#endif
+
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -141,6 +201,9 @@ int board_init(void)
#ifdef CONFIG_HAS_DATAFLASH
at91sam9rlek_spi_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91sam9rlek_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index acf5d81..fac26a9 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91SAM9RL
#define AT91_MAIN_CLOCK2 /* from 12.000 MHz
crystal */
#define AT91_MASTER_CLOCK 1 /* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_RGB5651
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 09/21] AT91SAM9261EK support
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAINTAINERS|1 + MAKEALL|1 + Makefile |3 + board/atmel/at91sam9261ek/Makefile | 53 ++ board/atmel/at91sam9261ek/at91sam9261ek.c | 194 board/atmel/at91sam9261ek/config.mk|1 + board/atmel/at91sam9261ek/led.c| 78 board/atmel/at91sam9261ek/nand.c | 79 board/atmel/at91sam9261ek/partition.c | 38 board/atmel/at91sam9261ek/u-boot.lds | 57 ++ cpu/arm926ejs/at91sam9/usb.c |8 + drivers/net/dm9000x.c |2 + include/asm-arm/arch-at91sam9/at91sam9261.h| 105 +++ include/asm-arm/arch-at91sam9/at91sam9261_matrix.h | 62 +++ include/asm-arm/arch-at91sam9/hardware.h |3 + include/configs/at91sam9261ek.h| 189 +++ 16 files changed, 874 insertions(+), 0 deletions(-) create mode 100644 board/atmel/at91sam9261ek/Makefile create mode 100644 board/atmel/at91sam9261ek/at91sam9261ek.c create mode 100644 board/atmel/at91sam9261ek/config.mk create mode 100644 board/atmel/at91sam9261ek/led.c create mode 100644 board/atmel/at91sam9261ek/nand.c create mode 100644 board/atmel/at91sam9261ek/partition.c create mode 100644 board/atmel/at91sam9261ek/u-boot.lds create mode 100644 include/asm-arm/arch-at91sam9/at91sam9261.h create mode 100644 include/asm-arm/arch-at91sam9/at91sam9261_matrix.h create mode 100644 include/configs/at91sam9261ek.h diff --git a/MAINTAINERS b/MAINTAINERS index 58f833c..26f31fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -538,6 +538,7 @@ Stelian Pop [EMAIL PROTECTED] at91cap9adk ARM926EJS (AT91CAP9 SoC) at91sam9260ek ARM926EJS (AT91SAM9260 SoC) + at91sam9261ek ARM926EJS (AT91SAM9261 SoC) Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index 38911ed..251da90 100755 --- a/MAKEALL +++ b/MAKEALL @@ -458,6 +458,7 @@ LIST_ARM9= \ at91cap9adk \ at91rm9200dk\ at91sam9260ek \ + at91sam9261ek \ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index 167a717..5e06ff5 100644 --- a/Makefile +++ b/Makefile @@ -2326,6 +2326,9 @@ shannon_config: unconfig at91rm9200dk_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 +at91sam9261ek_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9261ek/Makefile b/board/atmel/at91sam9261ek/Makefile new file mode 100644 index 000..5e4904c --- /dev/null +++ b/board/atmel/at91sam9261ek/Makefile @@ -0,0 +1,53 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y += at91sam9261ek.o +COBJS-y += led.o +COBJS-y+= partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c new file mode 100644 index 000..55a178e --- /dev/null +++ b/board/atmel
[U-Boot-Users] [PATCH 20/21] Support AT91CAP9 revC CPUs
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/at91cap9adk.c| 28
include/asm-arm/arch-at91sam9/at91_pmc.h |5 +
include/asm-arm/arch-at91sam9/at91cap9.h | 14 +-
3 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index ee4f26e..b92dd82 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -72,6 +72,33 @@ static void at91cap9_serial_hw_init(void)
#endif
}
+static void at91cap9_slowclock_hw_init(void)
+{
+ /*
+* On AT91CAP9 revC CPUs, the slow clock can be based on an
+* internal impreciseRC oscillator or an external 32kHz oscillator.
+* Switch to the latter.
+*/
+#define ARCH_ID_AT91CAP9_REVB 0x399
+#define ARCH_ID_AT91CAP9_REVC 0x601
+ if (at91_sys_read(AT91_PMC_VER) == ARCH_ID_AT91CAP9_REVC) {
+ unsigned i, tmp = at91_sys_read(AT91_SCKCR);
+ if ((tmp AT91CAP9_SCKCR_OSCSEL) == AT91CAP9_SCKCR_OSCSEL_RC) {
+ extern void timer_init(void);
+ timer_init();
+ tmp |= AT91CAP9_SCKCR_OSC32EN;
+ at91_sys_write(AT91_SCKCR, tmp);
+ for (i = 0; i 1200; i++)
+ udelay(1000);
+ tmp |= AT91CAP9_SCKCR_OSCSEL_32;
+ at91_sys_write(AT91_SCKCR, tmp);
+ udelay(200);
+ tmp = ~AT91CAP9_SCKCR_RCEN;
+ at91_sys_write(AT91_SCKCR, tmp);
+ }
+ }
+}
+
static void at91cap9_nor_hw_init(void)
{
unsigned long csa;
@@ -305,6 +332,7 @@ int board_init(void)
gd-bd-bi_boot_params = PHYS_SDRAM + 0x100;
at91cap9_serial_hw_init();
+ at91cap9_slowclock_hw_init();
at91cap9_nor_hw_init();
#ifdef CONFIG_CMD_NAND
at91cap9_nand_hw_init();
diff --git a/include/asm-arm/arch-at91sam9/at91_pmc.h
b/include/asm-arm/arch-at91sam9/at91_pmc.h
index 52cd8e5..9981c42 100644
--- a/include/asm-arm/arch-at91sam9/at91_pmc.h
+++ b/include/asm-arm/arch-at91sam9/at91_pmc.h
@@ -96,4 +96,9 @@
#defineAT91_PMC_PCK3RDY(1 11) /*
Programmable Clock 3 */
#defineAT91_PMC_IMR(AT91_PMC + 0x6c) /* Interrupt
Mask Register */
+#define AT91_PMC_PROT (AT91_PMC + 0xe4) /* Protect Register
[AT91CAP9 revC only] */
+#defineAT91_PMC_PROTKEY0x504d4301 /*
Activation Code */
+
+#define AT91_PMC_VER (AT91_PMC + 0xfc) /* PMC Module Version [AT91CAP9
only] */
+
#endif
diff --git a/include/asm-arm/arch-at91sam9/at91cap9.h
b/include/asm-arm/arch-at91sam9/at91cap9.h
index e16909c..6bd78fa 100644
--- a/include/asm-arm/arch-at91sam9/at91cap9.h
+++ b/include/asm-arm/arch-at91sam9/at91cap9.h
@@ -101,13 +101,25 @@
#define AT91_RTT (0xfd20 - AT91_BASE_SYS)
#define AT91_PIT (0xfd30 - AT91_BASE_SYS)
#define AT91_WDT (0xfd40 - AT91_BASE_SYS)
-#define AT91_GPBR (0xfd50 - AT91_BASE_SYS)
+#define AT91_SCKCR (0xfd50 - AT91_BASE_SYS)
+#define AT91_GPBR_REVB (0xfd50 - AT91_BASE_SYS)
+#define AT91_GPBR_REVC (0xfd60 - AT91_BASE_SYS)
#define AT91_USART0AT91CAP9_BASE_US0
#define AT91_USART1AT91CAP9_BASE_US1
#define AT91_USART2AT91CAP9_BASE_US2
/*
+ * SCKCR flags
+ */
+#define AT91CAP9_SCKCR_RCEN(1 0)/* RC Oscillator Enable */
+#define AT91CAP9_SCKCR_OSC32EN (1 1)/* 32kHz Oscillator Enable */
+#define AT91CAP9_SCKCR_OSC32BYP(1 2)/* 32kHz Oscillator
Bypass */
+#define AT91CAP9_SCKCR_OSCSEL (1 3)/* Slow Clock Selector */
+#defineAT91CAP9_SCKCR_OSCSEL_RC(0 3)
+#defineAT91CAP9_SCKCR_OSCSEL_32(1 3)
+
+/*
* Internal Memory.
*/
#define AT91CAP9_SRAM_BASE 0x0010 /* Internal SRAM base address */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 07/21] AT91SAM9260EK: Normalize BOOTARGS
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h | 14 -- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 0aac0f5..e25985e 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -56,8 +56,6 @@ #define CONFIG_USART3 1 /* USART 3 is DBGU */ #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ - root=/dev/mtdblock0 rw rootfstype=jffs2 /* #define CONFIG_ENV_OVERWRITE1 */ @@ -144,6 +142,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock0 \ + mtdparts=at91_nand:-(root) \ + rw rootfstype=jffs2 #elif CFG_USE_DATAFLASH_CS1 @@ -154,6 +156,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xD003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock0 \ + mtdparts=at91_nand:-(root) \ + rw rootfstype=jffs2 #else /* CFG_USE_NANDFLASH */ @@ -163,6 +169,10 @@ #define CFG_ENV_OFFSET_REDUND 0x8 #define CFG_ENV_SIZE 0x2 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND nand read 0x2200 0xA 0x20; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock5 \ + mtdparts=at91_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) \ + rw rootfstype=jffs2 #endif -- 1.5.3.3 - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 19/21] Use custom logo for Atmel boards
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
tools/Makefile|4
tools/logos/atmel.bmp | Bin 0 - 26334 bytes
2 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 tools/logos/atmel.bmp
diff --git a/tools/Makefile b/tools/Makefile
index b897923..dc210e8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -44,6 +44,10 @@ LOGO_H = $(OBJTREE)/include/bmp_logo.h
ifeq ($(LOGO_BMP),)
LOGO_BMP= logos/denx.bmp
endif
+ifeq ($(VENDOR),atmel)
+LOGO_BMP= logos/atmel.bmp
+endif
+
#-
diff --git a/tools/logos/atmel.bmp b/tools/logos/atmel.bmp
new file mode 100644
index
..3c445c9bc365aff31bf5f6c464ab2b1d7a99e99e
GIT binary patch
literal 26334
zcmd^{y^my9TE?%dt6b%2x9uH|y;yXT%jdF1c(rkZ_IzN85^tsi3E`mZc2iL$dC{T
z(gqfCzyQs0xN`kQNdoKEy`?!Ae;Ce$R8xty|qao^D4TFQJCbI*Ct^M1eQ+}qXj
ztKa^~cb2q2^AV){Wq^)=k;N;(b|uf%zXkFZ~?_VxMapD+LQk3U{M{q8q;eQWu@
zwsl7l(8TE-nW;[EMAIL PROTECTED](KVa;C|MOp#wle4m%snx
z-(CLaUw^{fo6)d``=mqL~}r`R5~$?}sw`~LE`fA|~AXW#qQ@k#gwdJ$l`laRH
z|KTr}AOF#JmmmK2FE7WdEB?`TJKx*qs+}W)ba(kVI=ee{2-?%h6%IL_yWU59FGIj
z)#);_8iA)#N|60YiyEr74P8-e0DfudYOzat#uNnUXu}uohkpdtQfS*)K3q0lIrf
z!-BUkMe;UblrV5~Ga8lX=E|8laa7GWXgrL(rMKtfG$u$5zZh|BeSf9apDv`=+KTQ
z#O)|c(cQbVnX^k#1GOZQMei}`VsUNAUyJWnA^;q^-m16l2;Q*zG!thzbk4aDtNV
zDe^NdQ{Rqe)29v^$tyzX3-V|Wr|pER}6ot8t{dX=k$eAgn_g+#h3yp(+8-v$CZb}
zet)BmcouiuZDliO1wl1dcY=8tjv|1z=~n31U7e=H}r=*YJSgewYBMw9$ZY!PI1e
zWLYFVDQ7ju{^`fU_FPCSgwLpp=1[EMAIL PROTECTED]|U1Iw4?W`9`1r0Z2J
zmq8n#QAz=$o70;No;KI5fA8mE1qLY!T6BH-UNxbTBin+tdiJ?F^yYR01^1;btVx!
zp+6*dh7{U;h`RnP=([EMAIL PROTECTED];MkF9PymOOo}-{21n0TS@A8
zcQbef`%n#RMr4TSu~w{e+N7`oai!p=;XTj0|[EMAIL PROTECTED]
zjG`p;afB(BD0N{%1py+Je$kJE!x53_J3nGlQc;*MTRGu{4X$ASp*hEO=ynzqT{
[EMAIL PROTECTED]@8(!QSJyr)?0Q4sCPwUgmZy?V{`jniscL!w!WIdraWt#j#)iiIyUek+z
zOf1y$+lnR8tXKo6L%y#d_PruZ62|[EMAIL PROTECTED]|vRoVFE{psl%IiSMl
zJN;[EMAIL PROTECTED]Um_0V125D4krCTf|cjl3+*SX-Z28?472izoz941J_HP~w~7nZs2
zF{XJ+ABeJN!u)kQ6tYDux([EMAIL PROTECTED]*49Pt;2s~Ivcq9xP(88m@
za+0+AwF~ODVrg?tl8P0?5f?7Y?s)[EMAIL PROTECTED](HgB-$`Wmd;G(o*
z?RV6y-4UfvH#aG4$OXpT$58-SyB?EP8ll2T?ibF*j9xSjCFsdcdXFMLTRk0xO4%
zM|[EMAIL PROTECTED];24YQ#NKBR^7dKoYwK@(HBY|JVq{iFAWYZ%1S(eeP1)!smzf
zgR+-)[EMAIL PROTECTED]es7_W{yitiCmL7+hDh|$$^jmDC2-JirEg~QLe
zu^YPyzNNl9Yce4b$?K@[EMAIL PROTECTED])qcK3$iw6%HDM}!zjvXL66SV4gEL
zjy;3qD64T|udJI)%U6!WmVpmw1%oh7-efQ$-nn_-z9ys;YPL_Zq)XNBULQR~m#U
[EMAIL PROTECTED]pW;8H_UVY+V`{#4Jd36J+`xqv4(oZ!*|$s`0u
zH-n`e4pO4nxo;To?HoAVba%#j`D`L)?rH`PX7$1{)QX6KkSKq~cS)$Wumyy|TI
[EMAIL PROTECTED]t%v$O|
z7YzD1c)2}*3dfTJwpby!2M0y(p=1EbK8vMo=ZBByffL%rF9(c5Iu#0`1pV00Vf
z[EMAIL PROTECTED];y2B$oc31hVifP|L~^6k_7s2pGY(SoWOWa|V_jHm^|j}4
z-c;np4H|fbxH{iQ%6wE)A_WmLO!C3cuG^)fp+%Lyz=zMGNJ@%O#`Rf%L_{XQs?o
z_H)[EMAIL PROTECTED]X7+S^2z(F6IMBH)AM!{sj7K;0
zW2TGl6Pxu;o~O6~BLiYQO-o|l`t+)5e256n%P(S!ft}{q#+)Y|OkG%CUs_Ij^c
zwgl3wq||cDItLlHc*}1qqy?KxVZ1G~x?29z^Da%0ff6Ln5rWVJq2{O5rsjsug(C1q
zmnxKpHMs+5ZD!xdItl3Sc5e=WtDRAB_yh!D3PvAZE^^Z~YS^)|!!Yj*Q`~*9a?jRd
z}18dHnQTy`HltaYI5I=R3CnaI)EiQgTH0|nvP%vFOkIxNGZ$8Bmj-pe?56JS
[EMAIL PROTECTED]@L#`JDvsh+#J[EMAIL PROTECTED]@[EMAIL PROTECTED]n3C
zwjjII9VTS!lm;rF1VS;G1?oN!CAPL?$1UG`m7r#V|kFlTmkQ47R~)lF^{KT#x{
z6USAMH;Xy)+~xoD4lkv+C`fs*dMyHyj3C8qVlWuNjeI?DQXZKrp~IZg*K$V)TC
zxE#EN#IgJ8XByxhb_b9YzxXIaM([EMAIL PROTECTED][EMAIL PROTECTED]
z@k34n#WCu;vnY1wYrH{VO}n!*Q`;[EMAIL PROTECTED]($lyy51x5}cOD`yEtP-f$
z*-WYdxjZ4WqtdEx$h3LxPmFXl0N}KHDh2FSI_E0bYyM?W3_c7ZZ-;d2ASRP4?l
znp?`*w0WDMi0RiHgbzK%3AegD*i0NnHk+zuT!WJs2E!8wCfJojb)}J~|qiO
zj2DiaZ|ejjY-uXsjjjixw0Zu9)NheNQ;P2$hjX8HNtUia|)}kqINXzJonAX0vZE
zR!u|Jbc)[EMAIL PROTECTED]@bQ`sNvW-[EMAIL PROTECTED]@$Va
zo)[EMAIL PROTECTED])P#0cwpcC*T}Tboo}zhea)P(odh4GKcEyb(KRCeg?
[EMAIL PROTECTED]@U|V7eKcKm+qV414x2${[EMAIL PROTECTED]HAgIb{Rbi4S~!!%9M)N
ztov~2n~rmYaj}QZ?2)CX`$*l6FZ3YwRsZp;DgsaRG6i;^q4t7_g6b18K*I;G_
zlX^_-PB+vOuWuw8zLh#Ul_v7+dL0gPnBSRH!I+BGmeBi5e|7cid3KR_CUv+#m_
zV3A+{vbUd68ifHFp*%8JCA2f6iPDLyZvyFaBHHMQtyR^8qE5Rp4mXHT$Cgpi5z
zSw_6MZE20U7[EMAIL PROTECTED]@^(c$t+Ca21Cr=sbdQ+;k3Ro5ZOJw
z_J_PpWm8;;f`JuHKh#xYF8lT8oo=Kg|crdUR~7LFlcGZCe0*|_G}SG5dKARZ;x5
[EMAIL PROTECTED]|r+Cv?PUf(Ltf|l;Tp0A|nKZVHQ#RI72*p%fP+JPUNIZ8
[EMAIL PROTECTED]xO?xE_!di36W?(g2tz(CFVT8Wc5%Nt)YXJ^3h~o*Wsu(UdcZeO0
z#dRU^gc;cDEOfcTAy8?7Oxp}7y?g35?MLU%kaZEkqyPmmKJ0R+Q?DjQ_s`FiP#
zHCsQ;m^dJ=!lq`2K~P)[EMAIL PROTECTED]uW;[EMAIL PROTECTED])[EMAIL PROTECTED]
zBkTIh4`9-0rB}%iQ-y($|piFayjIRg7mNGEwO#jAyvuCKVetB[EMAIL PROTECTED]YV|(4
zHg1#$!-#vZ^JSvb+Gz-aVd8ZB{d%W~Z|_08[EMAIL PROTECTED];*R(
zZ4|ZLrHyT9BDs;CXO7Tj3t}y??72xwu1+8H%n^Ozn2Vj6TPS=ocP1Z;a)#XBe4T
zhhmP`[EMAIL PROTECTED](sfyYr#4
z{;drthL2g)eb;;)rZklSL1smcyEN3i!JsdHqwVgPNYRjrCcQwIR9jyl3+dr?bBJ
[EMAIL PROTECTED]|(BiCuq?ZzzaDd0`cA*lb~@(Tw1SU;EV
z`pDTc8X_2QOnTGdL{KYduKKP%yyMwyEYh64?dk-[EMAIL PROTECTED]ASZ2BjbClL*{
z0#w}j9#1qaS6EoPm2viPGXtU3#bO-_DuRh=Um)CWTZe9^SPQHR0xi%e(l9J`f3
zejalT)MQLn*Fl-qkK^fpj$2zmqNl_}1e6=id)Sws-|kERw*nmVNiKXd|rL-b^Zx#
z5;Wt5ys`_f-gWI4tA#TVUX$doHrQ2Hfb73#S
[U-Boot-Users] [PATCH ARM/AT91 0/20] AT91SAM/CAP patches for U-Boot 1.3.4
Hi, The following patches add support for the missing AT91SAM9 boards: - AT91SAM9261 - AT91SAM9263 - AT91SAM9RL Additionnaly, they fix a few minor things in the existing AT91SAM9260 and AT91CAP9 ports: dataflash offsets, 8/16 bit NAND support, SPI timings, consistent Linux bootargs. The second half of the patches (from 12 to 19) adds a driver for the LCD controller on the Atmel boards (except 9260). The driver could probably be adapted, with minimum efforts, to the AVR32 boards. And finally, the last patch adds support for the revision 'C' of the AT91CAP9 silicon, which needs a special initialisation sequence to switch from the internal RC oscillator to the external 32k clock. Thanks, Stelian. - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 16/21] AT91SAM9261EK: hook up the ATMEL LCD driver
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9261ek/at91sam9261ek.c | 64 +
include/configs/at91sam9261ek.h | 13 ++
2 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c
b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 55a178e..d6ad15f 100644
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -30,6 +30,8 @@
#include asm/arch/at91_rstc.h
#include asm/arch/gpio.h
#include asm/arch/io.h
+#include lcd.h
+#include atmel_lcdc.h
#if defined(CONFIG_RESET_PHY_R) defined(CONFIG_DRIVER_DM9000)
#include net.h
#endif
@@ -150,6 +152,65 @@ static void at91sam9261ek_dm9000_hw_init(void)
}
#endif
+#ifdef CONFIG_LCD
+vidinfo_t panel_info = {
+ vl_col: 240,
+ vl_row: 320,
+ vl_clk: 4965000,
+ vl_sync:ATMEL_LCDC_INVLINE_INVERTED |
+ ATMEL_LCDC_INVFRAME_INVERTED,
+ vl_bpix:3,
+ vl_tft: 1,
+ vl_hsync_len: 5,
+ vl_left_margin: 1,
+ vl_right_margin:33,
+ vl_vsync_len: 1,
+ vl_upper_margin:1,
+ vl_lower_margin:0,
+ mmio: AT91SAM9261_LCDC_BASE,
+};
+
+void lcd_enable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA12, 0); /* power up */
+}
+
+void lcd_disable(void)
+{
+ at91_set_gpio_value(AT91_PIN_PA12, 1); /* power down */
+}
+
+static void at91sam9261ek_lcd_hw_init(void)
+{
+ at91_set_A_periph(AT91_PIN_PB1, 0); /* LCDHSYNC */
+ at91_set_A_periph(AT91_PIN_PB2, 0); /* LCDDOTCK */
+ at91_set_A_periph(AT91_PIN_PB3, 0); /* LCDDEN */
+ at91_set_A_periph(AT91_PIN_PB4, 0); /* LCDCC */
+ at91_set_A_periph(AT91_PIN_PB7, 0); /* LCDD2 */
+ at91_set_A_periph(AT91_PIN_PB8, 0); /* LCDD3 */
+ at91_set_A_periph(AT91_PIN_PB9, 0); /* LCDD4 */
+ at91_set_A_periph(AT91_PIN_PB10, 0);/* LCDD5 */
+ at91_set_A_periph(AT91_PIN_PB11, 0);/* LCDD6 */
+ at91_set_A_periph(AT91_PIN_PB12, 0);/* LCDD7 */
+ at91_set_A_periph(AT91_PIN_PB15, 0);/* LCDD10 */
+ at91_set_A_periph(AT91_PIN_PB16, 0);/* LCDD11 */
+ at91_set_A_periph(AT91_PIN_PB17, 0);/* LCDD12 */
+ at91_set_A_periph(AT91_PIN_PB18, 0);/* LCDD13 */
+ at91_set_A_periph(AT91_PIN_PB19, 0);/* LCDD14 */
+ at91_set_A_periph(AT91_PIN_PB20, 0);/* LCDD15 */
+ at91_set_B_periph(AT91_PIN_PB23, 0);/* LCDD18 */
+ at91_set_B_periph(AT91_PIN_PB24, 0);/* LCDD19 */
+ at91_set_B_periph(AT91_PIN_PB25, 0);/* LCDD20 */
+ at91_set_B_periph(AT91_PIN_PB26, 0);/* LCDD21 */
+ at91_set_B_periph(AT91_PIN_PB27, 0);/* LCDD22 */
+ at91_set_B_periph(AT91_PIN_PB28, 0);/* LCDD23 */
+
+ at91_sys_write(AT91_PMC_SCER, AT91_PMC_HCK1);
+
+ gd-fb_base = AT91SAM9261_SRAM_BASE;
+}
+#endif
+
int board_init(void)
{
/* Enable Ctrlc */
@@ -170,6 +231,9 @@ int board_init(void)
#ifdef CONFIG_DRIVER_DM9000
at91sam9261ek_dm9000_hw_init();
#endif
+#ifdef CONFIG_LCD
+ at91sam9261ek_lcd_hw_init();
+#endif
return 0;
}
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index cdafed3..6a40853 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -28,6 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
+#define AT91_CPU_NAME AT91SAM9261
#define AT91_MAIN_CLOCK198656000 /* from 18.432 MHz
crystal */
#define AT91_MASTER_CLOCK 99328000/* peripheral = main / 2 */
#define CFG_HZ 100 /* 1us resolution */
@@ -55,6 +56,18 @@
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
+/* LCD */
+#define CONFIG_LCD 1
+#define LCD_BPPLCD_COLOR8
+#define CONFIG_LCD_LOGO1
+#undef LCD_TEST_PATTERN
+#define CONFIG_LCD_INFO1
+#define CONFIG_LCD_INFO_BELOW_LOGO 1
+#define CFG_WHITE_ON_BLACK 1
+#define CONFIG_ATMEL_LCD 1
+#define CONFIG_ATMEL_LCD_BGR5551
+#define CFG_CONSOLE_IS_IN_ENV 1
+
#define CONFIG_BOOTDELAY 3
/* #define CONFIG_ENV_OVERWRITE1 */
--
1.5.3.3
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 14/21] Add ATMEL LCD driver
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
README |4 +
common/lcd.c| 66 +-
drivers/video/Makefile |1 +
drivers/video/atmel_lcdfb.c | 160 +++
include/asm-arm/arch-at91sam9/clk.h |6 +
include/atmel_lcdc.h| 177 +++
include/lcd.h | 30 ++-
lib_arm/board.c | 37 ++--
8 files changed, 469 insertions(+), 12 deletions(-)
create mode 100644 drivers/video/atmel_lcdfb.c
create mode 100644 include/atmel_lcdc.h
diff --git a/README b/README
index 5e2bca4..dca495d 100644
--- a/README
+++ b/README
@@ -962,6 +962,10 @@ The following options need to be configured:
display); also select one of the supported displays
by defining one of these:
+ CONFIG_ATMEL_LCD:
+
+ HITACHI TX09D70VM1CCA, 3.5, 240x320.
+
CONFIG_NEC_NL6448AC33:
NEC NL6448AC33-18. Active, color, single scan.
diff --git a/common/lcd.c b/common/lcd.c
index 914dc2e..cf7f750 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -50,6 +50,10 @@
#include lcdvideo.h
#endif
+#if defined(CONFIG_ATMEL_LCD)
+#include atmel_lcdc.h
+#endif
+
#ifdef CONFIG_LCD
//
@@ -474,14 +478,22 @@ ulong lcd_setmem (ulong addr)
static void lcd_setfgcolor (int color)
{
+#ifdef CONFIG_ATMEL_LCD
+ lcd_color_fg = color;
+#else
lcd_color_fg = color 0x0F;
+#endif
}
/*--*/
static void lcd_setbgcolor (int color)
{
+#ifdef CONFIG_ATMEL_LCD
+ lcd_color_bg = color;
+#else
lcd_color_bg = color 0x0F;
+#endif
}
/*--*/
@@ -508,7 +520,11 @@ static int lcd_getbgcolor (void)
#ifdef CONFIG_LCD_LOGO
void bitmap_plot (int x, int y)
{
+#ifdef CONFIG_ATMEL_LCD
+ uint *cmap;
+#else
ushort *cmap;
+#endif
ushort i, j;
uchar *bmap;
uchar *fb;
@@ -533,6 +549,8 @@ void bitmap_plot (int x, int y)
cmap = (ushort *)fbi-palette;
#elif defined(CONFIG_MPC823)
cmap = (ushort
*)(cp-lcd_cmap[BMP_LOGO_OFFSET*sizeof(ushort)]);
+#elif defined(CONFIG_ATMEL_LCD)
+ cmap = (uint *) (panel_info.mmio + ATMEL_LCDC_LUT(0));
#endif
WATCHDOG_RESET();
@@ -540,11 +558,26 @@ void bitmap_plot (int x, int y)
/* Set color map */
for (i=0; i(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) {
ushort colreg = bmp_logo_palette[i];
+#ifdef CONFIG_ATMEL_LCD
+ uint lut_entry;
+#ifdef CONFIG_ATMEL_LCD_BGR555
+ lut_entry = ((colreg 0x000F) 11) |
+ ((colreg 0x00F0) 2) |
+ ((colreg 0x0F00) 7);
+#else /* CONFIG_ATMEL_LCD_RGB565 */
+ lut_entry = ((colreg 0x000F) 1) |
+ ((colreg 0x00F0) 3) |
+ ((colreg 0x0F00) 4);
+#endif
+ *(cmap + BMP_LOGO_OFFSET) = lut_entry;
+ cmap++;
+#else /* !CONFIG_ATMEL_LCD */
#ifdef CFG_INVERT_COLORS
*cmap++ = 0x - colreg;
#else
*cmap++ = colreg;
#endif
+#endif /* CONFIG_ATMEL_LCD */
}
WATCHDOG_RESET();
@@ -578,7 +611,9 @@ void bitmap_plot (int x, int y)
*/
int lcd_display_bitmap(ulong bmp_image, int x, int y)
{
-#if !defined(CONFIG_MCC200)
+#ifdef CONFIG_ATMEL_LCD
+ uint *cmap;
+#elif !defined(CONFIG_MCC200)
ushort *cmap;
#endif
ushort i, j;
@@ -633,6 +668,8 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
cmap = (ushort *)fbi-palette;
#elif defined(CONFIG_MPC823)
cmap = (ushort *)(cp-lcd_cmap[255*sizeof(ushort)]);
+#elif defined(CONFIG_ATMEL_LCD)
+ cmap = (uint *) (panel_info.mmio + ATMEL_LCDC_LUT(0));
#else
# error Don't know location of color map
#endif
@@ -765,6 +802,33 @@ static void *lcd_logo (void)
# endif /* CONFIG_LCD_INFO */
#endif /* CONFIG_MPC823 */
+#ifdef CONFIG_ATMEL_LCD
+# ifdef CONFIG_LCD_INFO
+ sprintf (info, %s, U_BOOT_VERSION);
+ lcd_drawchars (LCD_INFO_X, LCD_INFO_Y, (uchar *)info, strlen(info));
+
+ sprintf (info, (C) 2008 ATMEL Corp);
+ lcd_drawchars (LCD_INFO_X, LCD_INFO_Y + VIDEO_FONT_HEIGHT,
+ (uchar *)info, strlen(info));
+
+ sprintf (info, [EMAIL PROTECTED]);
+ lcd_drawchars (LCD_INFO_X, LCD_INFO_Y + VIDEO_FONT_HEIGHT * 2,
+ (uchar *)info, strlen(info));
+
+ sprintf (info, %s CPU at %s MHz
[U-Boot-Users] [PATCH 21/21]
There is no patch 21/21, operator error. :) -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 10/21] AT91SAM9263EK support
Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAINTAINERS|1 + MAKEALL|1 + Makefile |3 + board/atmel/at91sam9263ek/Makefile | 53 + board/atmel/at91sam9263ek/at91sam9263ek.c | 240 board/atmel/at91sam9263ek/config.mk|1 + board/atmel/at91sam9263ek/led.c| 78 +++ board/atmel/at91sam9263ek/nand.c | 79 +++ board/atmel/at91sam9263ek/partition.c | 37 +++ board/atmel/at91sam9263ek/u-boot.lds | 57 + drivers/net/macb.c |6 +- include/asm-arm/arch-at91sam9/at91sam9263.h| 127 +++ include/asm-arm/arch-at91sam9/at91sam9263_matrix.h | 129 +++ include/asm-arm/arch-at91sam9/hardware.h |4 + include/configs/at91sam9263ek.h| 195 net/eth.c |3 +- 16 files changed, 1011 insertions(+), 3 deletions(-) create mode 100644 board/atmel/at91sam9263ek/Makefile create mode 100644 board/atmel/at91sam9263ek/at91sam9263ek.c create mode 100644 board/atmel/at91sam9263ek/config.mk create mode 100644 board/atmel/at91sam9263ek/led.c create mode 100644 board/atmel/at91sam9263ek/nand.c create mode 100644 board/atmel/at91sam9263ek/partition.c create mode 100644 board/atmel/at91sam9263ek/u-boot.lds create mode 100644 include/asm-arm/arch-at91sam9/at91sam9263.h create mode 100644 include/asm-arm/arch-at91sam9/at91sam9263_matrix.h create mode 100644 include/configs/at91sam9263ek.h diff --git a/MAINTAINERS b/MAINTAINERS index 26f31fd..84bf19f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -539,6 +539,7 @@ Stelian Pop [EMAIL PROTECTED] at91cap9adk ARM926EJS (AT91CAP9 SoC) at91sam9260ek ARM926EJS (AT91SAM9260 SoC) at91sam9261ek ARM926EJS (AT91SAM9261 SoC) + at91sam9263ek ARM926EJS (AT91SAM9263 SoC) Stefan Roese [EMAIL PROTECTED] diff --git a/MAKEALL b/MAKEALL index 251da90..29aa7fc 100755 --- a/MAKEALL +++ b/MAKEALL @@ -459,6 +459,7 @@ LIST_ARM9= \ at91rm9200dk\ at91sam9260ek \ at91sam9261ek \ + at91sam9263ek \ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index 5e06ff5..65ef6c2 100644 --- a/Makefile +++ b/Makefile @@ -2329,6 +2329,9 @@ at91rm9200dk_config : unconfig at91sam9261ek_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9261ek atmel at91sam9 +at91sam9263ek_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9263ek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9263ek/Makefile b/board/atmel/at91sam9263ek/Makefile new file mode 100644 index 000..3ded315 --- /dev/null +++ b/board/atmel/at91sam9263ek/Makefile @@ -0,0 +1,53 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS-y += at91sam9263ek.o +COBJS-y += led.o +COBJS-y+= partition.o +COBJS-$(CONFIG_CMD_NAND) += nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c new file mode
Re: [U-Boot-Users] 1.3.3-rc3 - release status
Le mardi 06 mai 2008 à 19:48 +0200, Wolfgang Denk a écrit : In message [EMAIL PROTECTED] you wrote: I'm just waiting for the merge window to open and I'll post them all. Meanwhile, if you wish, I can send you the patches privately. You could send it even if the merge window is not open Speaking for me only - doing so singnificantly increases the chance that the patch gets lost. I'd rather see such stuff on the list when the merge window is open only. That's why I was holding up on them. But since Jean-Christophe wanted to see them, I posted them. So it's up to him now: either he integrates them into his tree and waits for the merge window to push them to you, or I'll post them again in a few days when the merge window opens. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 02/21] AT91CAP9ADK: Normalize SPI timings
Le mardi 06 mai 2008 à 14:23 -0500, [EMAIL PROTECTED] a écrit : Stelian Pop's patch: diff --git a/include/configs/at91cap9adk.h -#define AT91_SPI_CLK 2000 -#define DATAFLASH_TCSS (0xFA 16) -#define DATAFLASH_TCHS (0x8 24) +#define AT91_SPI_CLK 1500 +#define DATAFLASH_TCSS (0x1a 16) +#define DATAFLASH_TCHS (0x1 24) What do you mean by Normalize SPI timings? Why are you replacing 2000 Hz with 1500 Hz? Faster would be better as long as the SPI bus operates reliably, right? I used here what the kernel people use. I tend to be more confident in the values used in the kernel (where the code is used by many) than in some random speed picked up from Atmel's example files. As for TCSS/TCHS, the values comes from Atmel's bootstrap project. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 11/21] AT91SAM9RLEK support
Le mardi 06 mai 2008 à 21:26 +0200, Wolfgang Denk a écrit : In message [EMAIL PROTECTED] you wrote: diff --git a/board/atmel/at91sam9rlek/Makefile b/board/atmel/at91sam9rlek/Makefile new file mode 100644 index 000..f291d5e --- /dev/null +++ b/board/atmel/at91sam9rlek/Makefile @@ -0,0 +1,53 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. You should add your own Copyright here Ok. And please don't mutilate my entry - please leave this exactly as it was. I don't know what to say here. I suppose you're talking about the @ - at replacement. This is a copy of board/atmel/at91cap9adk/Makefile, and I'm pretty sure that when I submitted the AT91CAP9 patches, the @ was there. I think that somehow Peter Pearse converted it when applying the patches into his git tree. diff --git a/board/atmel/at91sam9rlek/partition.c b/board/atmel/at91sam9rlek/partition.c new file mode 100644 index 000..3bffd71 --- /dev/null +++ b/board/atmel/at91sam9rlek/partition.c @@ -0,0 +1,37 @@ +/* + * + * 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. Copyright entry missing. Except that this is not mine. partition.c is a (pretty or complete, depending on the board) verbatim copy of board/atmel/at91cap9adk/partition.c, which was submitted by Ulf Samuelsson. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 13/21] Remeber the 0013-Remeber-the-RAM-and-NAND-detected-sizes-for-later-di.patch
Le mardi 06 mai 2008 à 21:28 +0200, Wolfgang Denk a écrit :
In message [EMAIL PROTECTED] you wrote:
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
include/asm-arm/u-boot.h |4
lib_arm/board.c | 14 --
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/include/asm-arm/u-boot.h b/include/asm-arm/u-boot.h
index c120312..dbfe2cf 100644
--- a/include/asm-arm/u-boot.h
+++ b/include/asm-arm/u-boot.h
@@ -48,10 +48,14 @@ typedef struct bd_info {
ulong start;
ulong size;
} bi_dram[CONFIG_NR_DRAM_BANKS];
+ulong bi_dram_size;
Why would that be needed? Isn't adding the size entries above
sufficient?
It is. But this addition is done once more in the LCD driver (see patch
14/21), so I thought it would be useful to remember the result.
But if you consider it's more costly to add 4 bytes in global data than
to do the addition again, I can change it back.
--
Stelian Pop [EMAIL PROTECTED]
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 09/21] AT91SAM9261EK support
Le mardi 06 mai 2008 à 21:33 +0200, Wolfgang Denk a écrit : diff --git a/board/atmel/at91sam9261ek/u-boot.lds b/board/atmel/at91sam9261ek/u-boot.lds new file mode 100644 index 000..05a6d83 --- /dev/null +++ b/board/atmel/at91sam9261ek/u-boot.lds @@ -0,0 +1,57 @@ +/* + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, gj at denx.de Please add your own (C), and don't meddle with Gary's. I did not modify this file, merely copied it verbatim from board/atmel/at91cap9adk, which in turn was copied from board/atmel/at91rm9200dk. So I see no reason to add my own copyright. As for the mangle, see my other mail on the subject. diff --git a/include/asm-arm/arch-at91sam9/at91sam9261.h b/include/asm-arm/arch-at91sam9/at91sam9261.h new file mode 100644 index 000..c7c4778 --- /dev/null +++ b/include/asm-arm/arch-at91sam9/at91sam9261.h @@ -0,0 +1,105 @@ +/* + * include/asm-arm/arch-at91/at91sam9261.h + * + * Copyright (C) SAN People Who exactly is SAN People ? The at91sam9261.h and at91sam9261_matrix.h are verbatim copies of the header files of the Linux kernel. For example: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=include/asm-arm/arch-at91/at91sam9261.h;h=c7c4778dac49bed468e44eab6a23a32dd468789a;hb=HEAD diff --git a/include/asm-arm/arch-at91sam9/at91sam9261_matrix.h b/include/asm-arm/arch-at91sam9/at91sam9261_matrix.h new file mode 100644 index 000..6f07242 --- /dev/null +++ b/include/asm-arm/arch-at91sam9/at91sam9261_matrix.h @@ -0,0 +1,62 @@ +/* + * include/asm-arm/arch-at91/at91sam9261_matrix.h + * + * Memory Controllers (MATRIX, EBI) - System peripherals registers. + * Based on AT91SAM9261 datasheet revision D. (C) missing. ditto. + * 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. + */ + +#ifndef AT91SAM9261_MATRIX_H +#define AT91SAM9261_MATRIX_H + +#define AT91_MATRIX_MCFG (AT91_MATRIX + 0x00)/* Master Configuration Register */ +#defineAT91_MATRIX_RCB0(1 0)/* Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master) */ +#defineAT91_MATRIX_RCB1(1 1)/* Remap Command for AHB Master 1 (ARM926EJ-S Data Master) */ Line length!!! No, I won't change this one. For maintenance reasons it is better to keep it identical to the kernel file. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 09/21] AT91SAM9261EK support
Le mardi 06 mai 2008 à 23:14 +0200, Wolfgang Denk a écrit : In message [EMAIL PROTECTED] you wrote: + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, gj at denx.de Please add your own (C), and don't meddle with Gary's. I did not modify this file, merely copied it verbatim from board/atmel/at91cap9adk, which in turn was copied from board/atmel/at91rm9200dk. So I see no reason to add my own copyright. If it's just copuied without changes, it's time to factor it out. Isn't every board supposed to have a u-boot.lds file ? How could I factor these out ? As for the mangle, see my other mail on the subject. Understood, but needs to be fixed. I'll submit a patch for this. + * Copyright (C) SAN People Who exactly is SAN People ? The at91sam9261.h and at91sam9261_matrix.h are verbatim copies of the header files of the Linux kernel. This explains where the file is coming from, but does not answer my question. I think SAN is the former employer of Andrew Victor, the AT91 kernel maintainer. +++ b/include/asm-arm/arch-at91sam9/at91sam9261_matrix.h @@ -0,0 +1,62 @@ +/* + * include/asm-arm/arch-at91/at91sam9261_matrix.h + * + * Memory Controllers (MATRIX, EBI) - System peripherals registers. + * Based on AT91SAM9261 datasheet revision D. (C) missing. ditto. Maybe. It's still missing. And what am I supposed to do ? -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [RFC] AT91 reorganisation
Le samedi 26 avril 2008 à 20:40 +0200, Jean-Christophe PLAGNIOL-VILLARD a écrit : Hi, I've plan to join the at91sam9 and at91rm9200 in only one arch at91 like done in linux. I hope this could be done for the next release. As I said before, this would be nice, and I'm all for it. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [RFC] AT91 reorganisation
Le samedi 26 avril 2008 à 21:18 +0200, Ulf Samuelsson a écrit : Hi, I've plan to join the at91sam9 and at91rm9200 in only one arch at91 like done in linux. I hope this could be done for the next release. Best Regards, J. You are aware that they are using two different CPU cores. Indeed, but some of the peripherals are common. Also, some stuff should maybe be common with avr32. Those are essentially drivers (like net/macb.c, serial/atmel_usart.c), and are already shared between at91 and avr32. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Add support for AT91RM9200EK board
Le mardi 15 avril 2008 à 23:35 +0200, Ulf Samuelsson a écrit : 6) Submit patches for AT91RM9200EK with CFI support and wait for community feedback. No time, so that won't happen (as I told you). Did you look at what we're talking about ? Adding CFI support means: - removing the old driver - adding half a dozen #defines to the config file - some minimal glue to make the thing compile. (and you even have working examples - the AT91CAP9ADK and AT91SAM9260 boards - to look at how it's done). I'd say this is something that can be done in probably less time that you're spending here arguing about it. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Uboot (AT91 tree) macb in MII mode
Le lundi 14 avril 2008 à 10:10 +0200, Sander Vermin a écrit : Hi All, I have been struggling the last week to get the macb Ethernet driver in MII mode. [in short] I have communication over the MDIO interface, my activity led blinks but no ehternet. [the long story] I have a custom board build out of the schematics of the AT91SAM9260EK board. On my boar I did not use the DM9161 but the KS8721chip. On the ATMEL board the PHY works in RMII mode, on my board I used MII mode like this board from OLIMEX [1]. Do you have a working Linux kernel with a working network interface ? The Linux and U-Boot macb driver and PIO configuration is very close, and if you manage to make it work under Linux you'll probably have little trouble finding out the problem. Olimex was kind enough to make Uboot nandflash build working with there board, And deliver sources I cant compile, due to an error: Hardware float vs software float. But I want a dataflash version because I am using a BGA chip with nandflash bug. I don't see what NAND has to do with ethernet here. In my current setup I use the latest git of the AT91 tree with the following defines: #define CONFIG_MACB1 #defineCONFIG_MII1 #undef CONFIG_RMII #define CONFIG_NET_MULTI1 #define CONFIG_NET_RETRY_COUNT5000 #define CONFIG_RESET_PHY_R1 With this config I have the MDIO interface working, when I try to ping or TFTP I only get time outs / host not alive errors. Does the board send anything at all ? Try sniffing the net wire (using tcpdump for example). Also, what cross chain are you using ? I have seen strange network errors when using recent compilers which after investigation were -Os optimisation errors. (using the latest CodeSourcery toolchain for example). Is there someone out there how has the MII mode working? If I'm correct, Olimex has. So closer inspection of their code may reveal some information. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Add support for Atmel flash
Le lundi 14 avril 2008 à 08:00 +0200, Ulf Samuelsson a écrit : Le samedi 12 avril 2008 à 21:03 +0200, Ulf Samuelsson a écrit : Add ID codes for most recent Atmel NOR flashes Is there any added value on using the atmel flash driver instead of the standard CFI driver ? It surely doesn't have any on the SAM9/CAP9 boards, but I'm not sure of the older AT91RM9200. Thanks, -- Stelian Pop [EMAIL PROTECTED] It is mainly time related. This flash driver is well tested on the AT91RM9200EK. The standard CFI driver is not. While CFI should work, I do not have time to make a thorough test. Linux seems to use the CFI driver, just like every other SAM/CAP board, so it should be safe to switch to the standard CFI driver. The only remaining issue is testing, and I was hoping you could do this as part of the new board porting. :) Thanks, -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Add support for AT91RM9200EK board
Le lundi 14 avril 2008 à 08:01 +0200, Ulf Samuelsson a écrit : The at91rm9200dk board already exists with similar code. I think the chances that it someone will work on this is higher if the code is inside U-Boot than outside U-Boot though. Not sure about this. If it's there and it works there will be little incentive to change... At the same time, you are doing some testing for the new code, and for (almost) the same price you could (implement and) test the cleaned up version instead. BTW: Why not have the AVR32 and AT91 use the same. The PIO peripheral is the same. It may be a good idea for the future. However, this is not how it is done today in Linux, and I've tried to minimize changes (especially in the header files) to ease the porting. Thanks, -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Uboot (AT91 tree) macb in MII mode
Le lundi 14 avril 2008 à 11:19 +0200, Sander Vermin a écrit : Do you have a working Linux kernel with a working network interface ? The Linux and U-Boot macb driver and PIO configuration is very close, and if you manage to make it work under Linux you'll probably have little trouble finding out the problem. Are all settings of uboot overwritten by linux? Almost all the settings are overwritten, yes. I am not to comfortable hacking in the Linux kernel and I had the focus on Uboot. So you do not have a working Linux kernel. This was my question. Olimex was kind enough to make Uboot nandflash build working with there board, And deliver sources I cant compile, due to an error: Hardware float vs software float. But I want a dataflash version because I am using a BGA chip with nandflash bug. I don't see what NAND has to do with ethernet here. The AT91SAM9260 BGA chip has a bug, that booting from NAND has problems. Ok, but this has nothing to do with the Ethernet, right ? If the ethernet is supposed to work with their U-Boot version, it will probably work as well if you configure U-Boot to boot from dataflash instead of NAND flash. Also, what cross chain are you using ? I have seen strange network errors when using recent compilers which after investigation were -Os optimisation errors. (using the latest CodeSourcery toolchain for example). I am using the compilers from buildroot. This doesn't learn us anything about the gcc version you're using. The official toolchain for U-Boot is the DENX ELDK: http://www.denx.de/wiki/DULG/ELDK . I don't really think this is your issue, but when nothing works it may make sense to put yourself in a well known configuration. Olimex has indeed, but that is a old version of uboot, the old ETHER driver and not the new. I inspected the initialization code on the ARM side, that was the same. The rest of te code is completely different, so spotting differences is difficult. Ah, I understand. However, there must be a difference somewhere. I'm not sure about this board, but on the SAM boards a software reset has to be performed once the PHY address is configured to activate the PHY (look into at91sam9260.c). Maybe your board needs something equivalent ? -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Uboot (AT91 tree) macb in MII mode
Le lundi 14 avril 2008 à 11:52 +0200, Sander Vermin a écrit : The official toolchain for U-Boot is the DENX ELDK: http://www.denx.de/wiki/DULG/ELDK . I don't really think this is your issue, but when nothing works it may make sense to put yourself in a well known configuration. Is there some pre compiled arm version? ftp://ftp.denx.de/pub/eldk/4.1/arm-linux-x86/iso ARM support in latest ELDK (4.2) seems to lag a bit ... Olimex has indeed, but that is a old version of uboot, the old ETHER driver and not the new. I inspected the initialization code on the ARM side, that was the same. The rest of te code is completely different, so spotting differences is difficult. Ah, I understand. However, there must be a difference somewhere. I'm not sure about this board, but on the SAM boards a software reset has to be performed once the PHY address is configured to activate the PHY (look into at91sam9260.c). Maybe your board needs something equivalent ? Currently I am using the at91sam9260ek config with the options above edited. This means that you're doing the soft-reset sequence I told you above (in boards/atmel/at91sam9260ek/at91sam9260ek.c). Maybe your board doesn't need this, try commenting out the relevant code in at91sam9260ek_macb_hw_init() (keep only the gpio set_A/B_periph(). -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Add support for AT91RM9200EK board
Le samedi 12 avril 2008 à 22:06 +0200, Ulf Samuelsson a écrit : Add support for the AT91RM9200EK Board. Hi Ulf, I do have a few issues with your patch. As you have seen, I started adapting the Atmel changes for the AT91SAM boards, and in doing so I tried to implement (well, quite a lot was borrowed from Linux) a common infrastructure for the SAM9 and CAP9 CPUs/boards. I think that the AT91RM9200 could integrate quite well in the existing framework. I haven't done the job myself yet because I have quite limited ressources at the moment (and this is why I chose 'arch-at91sam9' instead of 'arch-at91'...) but since you're contributing a new port it may be the right time to do it. This means for example: - using at91 gpio macros: at91_set_A_periph(), etc. - using the standard CFI flash driver instead of the custom one - maybe others... Ah, and it would be much easier to quote and comment on your patches if they were inlined in your mails. Thanks, Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Add support for Atmel flash
Le samedi 12 avril 2008 à 21:03 +0200, Ulf Samuelsson a écrit : Add ID codes for most recent Atmel NOR flashes Is there any added value on using the atmel flash driver instead of the standard CFI driver ? It surely doesn't have any on the SAM9/CAP9 boards, but I'm not sure of the older AT91RM9200. Thanks, -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91SAM9260EK with KS8721 PHY
Le lundi 07 avril 2008 à 15:16 +0200, Sander Vermin a écrit : Hello, I'm trying to build a U-Boot from your git tree with the AT91 patches. My board is a custom board with a KS8721 instead of the DM9161 network PHY chip. This is the same chip as Olimex used on their development board. Olimex build a U-Boot for their board, they did some code hacking on u-boot. As far as I know they did the following to get the ethernet up and running. [1] This is in the board/at91sam9260ek/dm9161a.c file Are the changes limited to recognizing the MICREL_* phy id On the latest git version with the AT91 patches the ethernet driver is called macb??!! Yes. Do you know how I can get this working? (as hack and in the future more clean) Did you test it as is ? From what I see in the code, the macb driver doesn't care much about the PHY type... Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Register now and save $200. Hurry, offer ends at 11:59 p.m., Monday, April 7! Use priority code J8TLD2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91SAM9260EK with KS8721 PHY
Le lundi 07 avril 2008 à 16:14 +0200, Sander Vermin a écrit : Did you test it as is ? From what I see in the code, the macb driver doesn't care much about the PHY type... I did test it, u-boot says no PHY present. I had to change from RMII mode to MII mode due to my hardware design. Ok, so there must be something else in the code which was changed to support your PHY (look for some isolate setting like Eric said). You'll need to find out what it is... -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Register now and save $200. Hurry, offer ends at 11:59 p.m., Monday, April 7! Use priority code J8TLD2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91SAM9260EK with KS8721 PHY
Le lundi 07 avril 2008 à 22:23 +0200, Eric BENARD a écrit : Stelian Pop a écrit : Le lundi 07 avril 2008 à 16:14 +0200, Sander Vermin a écrit : Did you test it as is ? From what I see in the code, the macb driver doesn't care much about the PHY type... I did test it, u-boot says no PHY present. I had to change from RMII mode to MII mode due to my hardware design. Ok, so there must be something else in the code which was changed to support your PHY (look for some isolate setting like Eric said). You'll need to find out what it is... please find attached a quick and dirty hacked ks8721.c and the corresponding .h It works on an AT91RM9200 with u-boot 1.3.2. Hmm, if I sed: s/KS8721/DM9161/g and s/ks8721/dm9161/g on your files I find almost no change with regard to the original version, except: #define PHY_ADDRESS (15) and a #if 0 commenting out a bit of the initialisation sequence... This makes me think it may only be a PHY_ADDRESS issue: what happens if you change in cpu/arm926ejs/at91sam9/ether.c : macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x00); to macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 15); Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Register now and save $200. Hurry, offer ends at 11:59 p.m., Monday, April 7! Use priority code J8TLD2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91 Header File Clarification
Le vendredi 04 avril 2008 à 19:08 -0700, Zac Wheeler a écrit : There is no such file in u-boot, nor linux iirc. There is a atmel_lcdc.h in Linux (and I plan importing it into U-Boot, but later...). There is an at91_lcdc.h in Linux, Was. It was removed in 2.6.25-rc1. but you're right, atmel_lcdc.h appears to be the one that is used for the actual driver. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Register now and save $200. Hurry, offer ends at 11:59 p.m., Monday, April 7! Use priority code J8TLD2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91 Header File Clarification
Le vendredi 04 avril 2008 à 16:32 -0700, Zac Wheeler a écrit : On Fri, Apr 4, 2008 at 3:25 PM, Stelian Pop [EMAIL PROTECTED] wrote: Le vendredi 04 avril 2008 à 13:32 -0700, Zac Wheeler a écrit : I have a question about the arrangement of include files for the at91sam9 family. Is the intention that asm/arch/at91_xxx.h be applicable for all at91sam9 microcontrollers, or should they be broken down into subarch folders (e.g. asm/arch/at91sam9261/at91_pmc.h)? They are supposed to be shareable for all at91sam microcontrollers, in the same way it's done in Linux. So should things like AT91_ECC as defined in at91sam960.h be AT91SAM9260_ECC instead or moved to an at91_sys.h file? No, the idea is to keep the same conventions as the kernel guys. In fact the header files have been copied from Linux, and are 95% identical to them (we cannot use the header files provided by Atmel, because there is too much craft inside, and rewriting a third form of the same headers seemed to me too error prone). As for AT91_ECC: at91cap9.h:#define AT91_ECC (0xe200 - AT91_BASE_SYS) at91sam9260.h:#define AT91_ECC (0xe800 - AT91_BASE_SYS) at91sam9263.h:#define AT91_ECC0 (0xe000 - AT91_BASE_SYS) at91sam9263.h:#define AT91_ECC1 (0xe600 - AT91_BASE_SYS) at91sam9rl.h:#define AT91_ECC (0xe800 - AT91_BASE_SYS) seems to me quite nice this way ! It seems somewhat dangerous to define an AT91_ in a AT91SAM9260-specific file. It shouldn't be. All the AT91 platforms have pretty much the same hardware, so having the same constants means we don't need extra #ifdefs in the driver code. Of course, one should take care of including only the header file which goes with his platform. This is what include/asm-arm/arch-at91sam9/hardware.h does: based on what CONFIG_AT91x is defined, the relevant platform specific header file is included. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Register now and save $200. Hurry, offer ends at 11:59 p.m., Monday, April 7! Use priority code J8TLD2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Build u-boot for at91sam9260ek
Le vendredi 04 avril 2008 à 01:15 +0200, Jean-Christophe PLAGNIOL-VILLARD a écrit : On 20:40 Thu 03 Apr , Norman wrote: I have downloaded the 1.3.2 source and wonder where can I locate the latest stable patches for this platform? I saw an AT91 fork in the source tree, would that be a better starting point. Thanks, Norman Take a look to the AT91 repository In case you didn't find it already, the AT91 repository is at: http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot/u-boot-at91.git;a=summary I'll will add the last Stelian's patch in to the testing branch It should build and work fine with or without the latest patches which do only some cleanups (they were posted yesterday on the list). BTW, Jean-Christophe and Wolfgang, did the AT91 patches miss the merge window ? From what I've read, Wolfgang did close the window, but at the same time he didn't merge anything past March 27, and you did send the pull request a few hours too late (in the morning of April 1st). Stelian. -- Stelian Pop [EMAIL PROTECTED] - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] AT91 Header File Clarification
Le vendredi 04 avril 2008 à 13:32 -0700, Zac Wheeler a écrit : I have a question about the arrangement of include files for the at91sam9 family. Is the intention that asm/arch/at91_xxx.h be applicable for all at91sam9 microcontrollers, or should they be broken down into subarch folders (e.g. asm/arch/at91sam9261/at91_pmc.h)? They are supposed to be shareable for all at91sam microcontrollers, in the same way it's done in Linux. I am trying to bring up the at91sam9261 on a custom board a little ahead of what appears to be the schedule for the at91sam9261ek and I want to try to be compatible with the existing format. I'm working on support for the at91sam9261, I will probably have a patch for the end of the next week. Hopefully you can wait until then. If not, please go ahead. I haven't done a lot of comparisons between 9260/9261/9263, but for some things (e.g. at91_lcd.h) There is no such file in u-boot, nor linux iirc. There is a atmel_lcdc.h in Linux (and I plan importing it into U-Boot, but later...). Stelian. -- Stelian Pop [EMAIL PROTECTED] - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 2/6] AT91CAP9ADK: Normalize SPI timings
Set the SPI clock to 15 MHz, like Linux does. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 88527a4..a648ce0 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -94,9 +94,9 @@ #define CFG_SPI_WRITE_TOUT (5*CFG_HZ) #define CFG_MAX_DATAFLASH_BANKS1 #define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC000 /* CS0 */ -#define AT91_SPI_CLK 2000 -#define DATAFLASH_TCSS (0xFA 16) -#define DATAFLASH_TCHS (0x8 24) +#define AT91_SPI_CLK 1500 +#define DATAFLASH_TCSS (0x1a 16) +#define DATAFLASH_TCHS (0x1 24) /* NOR flash */ #define CFG_FLASH_CFI 1 -- 1.5.3.3 - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 3/6] AT91CAP9ADK: Normalize BOOTARGS
Set bootargs to sane values so that Linux boots out of the box in the two supported configurations: - boot from dataflash: the bootstrap, U-Boot, its environment and the Linux kernel are located in the dataflash, the JFFS2 root filesystem occupies the whole NAND memory. - boot from NOR: the bootstrap, U-Boot, its environment and the Linux kernel are located in the NOR memory, the JFFS2 root filesystem occupies the whole NAND memory. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91cap9adk.h | 10 -- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index a648ce0..78b2283 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -56,8 +56,6 @@ #define CONFIG_USART3 1 /* USART 3 is DBGU */ #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ - root=/dev/mtdblock1 rw rootfstype=jffs2 /* #define CONFIG_ENV_OVERWRITE1 */ @@ -145,6 +143,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x7200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock1 \ + mtdparts=physmap-flash.0:-(nor);at91_nand:-(root) \ + rw rootfstype=jffs2 #else @@ -155,6 +157,10 @@ #define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4000 #define CONFIG_BOOTCOMMAND cp.b 0x1004 0x7200 0x20; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock4 \ + mtdparts=physmap-flash.0:16k(bootstrap)ro,16k(env),224k(uboot)ro,-(linux);at91_nand:-(root) \ + rw rootfstype=jffs2 #endif -- 1.5.3.3 - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 1/6] AT91CAP9ADK: Handle 8 or 16 bit NAND
Enable the user specify in the board configuration header if the
board is fitted with 8 bit (CFG_NAND_DBW_8) or 16 bit (CFG_NAND_DBW_16)
NAND memory.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91cap9adk/at91cap9adk.c |8 ++--
board/atmel/at91cap9adk/nand.c|3 +++
include/configs/at91cap9adk.h |1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/board/atmel/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
index 7444c5a..8f96228 100644
--- a/board/atmel/at91cap9adk/at91cap9adk.c
+++ b/board/atmel/at91cap9adk/at91cap9adk.c
@@ -116,7 +116,12 @@ static void at91cap9_nand_hw_init(void)
at91_sys_write(AT91_SMC_MODE(3),
AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
AT91_SMC_EXNWMODE_DISABLE |
- AT91_SMC_DBW_8 | AT91_SMC_TDF_(1));
+#ifdef CFG_NAND_DBW_16
+ AT91_SMC_DBW_16 |
+#else /* CFG_NAND_DBW_8 */
+ AT91_SMC_DBW_8 |
+#endif
+ AT91_SMC_TDF_(1));
at91_sys_write(AT91_PMC_PCER, 1 AT91CAP9_ID_PIOABCD);
@@ -252,7 +257,6 @@ int board_init(void)
#ifdef CONFIG_USB_OHCI_NEW
at91cap9_uhp_hw_init();
#endif
-
return 0;
}
diff --git a/board/atmel/at91cap9adk/nand.c b/board/atmel/at91cap9adk/nand.c
index c72b024..5d49aee 100644
--- a/board/atmel/at91cap9adk/nand.c
+++ b/board/atmel/at91cap9adk/nand.c
@@ -63,6 +63,9 @@ static void at91cap9adk_nand_hwcontrol(struct mtd_info *mtd,
int cmd)
int board_nand_init(struct nand_chip *nand)
{
nand-eccmode = NAND_ECC_SOFT;
+#ifdef CFG_NAND_DBW_16
+ nand-options = NAND_BUSWIDTH_16;
+#endif
nand-hwcontrol = at91cap9adk_nand_hwcontrol;
nand-chip_delay = 20;
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index dab21d0..88527a4 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -110,6 +110,7 @@
#define NAND_MAX_CHIPS 1
#define CFG_MAX_NAND_DEVICE1
#define CFG_NAND_BASE 0x4000
+#define CFG_NAND_DBW_8 1
/* Ethernet */
#define CONFIG_MACB1
--
1.5.3.3
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH ARM/AT91 0/6] AT91CAP9/AT91SAM9260 cleanups
Hi, The following patches do a few cleanups for the AT91CAP9ADK and AT91SAM9260EK boards: - enable handling of 8 or 16 bit NAND memories - set the SPI clock to 15MHz (like Linux does) - set bootargs to sane values so that Linux boots out of the box in the supported configurations. Please apply, Thanks, Stelian. - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 4/6] AT91SAM9260EK: Handle 8 or 16 bit NAND
Enable the user specify in the board configuration header if the
board is fitted with 8 bit (CFG_NAND_DBW_8) or 16 bit (CFG_NAND_DBW_16)
NAND memory.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
board/atmel/at91sam9260ek/at91sam9260ek.c |7 ++-
board/atmel/at91sam9260ek/nand.c |3 +++
include/configs/at91sam9260ek.h |1 +
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c
b/board/atmel/at91sam9260ek/at91sam9260ek.c
index a55468e..7d325e8 100644
--- a/board/atmel/at91sam9260ek/at91sam9260ek.c
+++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
@@ -90,7 +90,12 @@ static void at91sam9260ek_nand_hw_init(void)
at91_sys_write(AT91_SMC_MODE(3),
AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
AT91_SMC_EXNWMODE_DISABLE |
- AT91_SMC_DBW_8 | AT91_SMC_TDF_(2));
+#ifdef CFG_NAND_DBW_16
+ AT91_SMC_DBW_16 |
+#else /* CFG_NAND_DBW_8 */
+ AT91_SMC_DBW_8 |
+#endif
+ AT91_SMC_TDF_(2));
at91_sys_write(AT91_PMC_PCER, 1 AT91SAM9260_ID_PIOC);
diff --git a/board/atmel/at91sam9260ek/nand.c b/board/atmel/at91sam9260ek/nand.c
index abb788a..a92b105 100644
--- a/board/atmel/at91sam9260ek/nand.c
+++ b/board/atmel/at91sam9260ek/nand.c
@@ -68,6 +68,9 @@ static int at91sam9260ek_nand_ready(struct mtd_info *mtd)
int board_nand_init(struct nand_chip *nand)
{
nand-eccmode = NAND_ECC_SOFT;
+#ifdef CFG_NAND_DBW_16
+ nand-options = NAND_BUSWIDTH_16;
+#endif
nand-hwcontrol = at91sam9260ek_nand_hwcontrol;
nand-dev_ready = at91sam9260ek_nand_ready;
nand-chip_delay = 20;
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 96d1b8d..8d02416 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -104,6 +104,7 @@
#define NAND_MAX_CHIPS 1
#define CFG_MAX_NAND_DEVICE1
#define CFG_NAND_BASE 0x4000
+#define CFG_NAND_DBW_8 1
/* NOR flash - no real flash on this board */
#define CFG_NO_FLASH 1
--
1.5.3.3
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 5/6] AT91SAM9260EK: Normalize SPI timings
Set the SPI clock to 15 MHz, like Linux does. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 8d02416..0aac0f5 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -96,7 +96,7 @@ #define CFG_MAX_DATAFLASH_BANKS2 #define CFG_DATAFLASH_LOGIC_ADDR_CS0 0xC000 /* CS0 */ #define CFG_DATAFLASH_LOGIC_ADDR_CS1 0xD000 /* CS1 */ -#define AT91_SPI_CLK 3300 +#define AT91_SPI_CLK 1500 #define DATAFLASH_TCSS (0x1a 16) #define DATAFLASH_TCHS (0x1 24) -- 1.5.3.3 - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 6/6] AT91SAM9260EK: Normalize BOOTARGS
Set bootargs to sane values so that Linux boots out of the box in the three supported configurations: - boot from dataflash (CS0 or CS1): the bootstrap, U-Boot, its environment and the Linux kernel are located in the dataflash, the JFFS2 root filesystem occupies the whole NAND memory. - boot from NAND: the bootstrap, U-Boot, its environment, the Linux kernel and the JFFS2 root filesystem are all located in different partitions of the NAND memory. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- include/configs/at91sam9260ek.h | 14 -- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 0aac0f5..e25985e 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -56,8 +56,6 @@ #define CONFIG_USART3 1 /* USART 3 is DBGU */ #define CONFIG_BOOTDELAY 3 -#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ - root=/dev/mtdblock0 rw rootfstype=jffs2 /* #define CONFIG_ENV_OVERWRITE1 */ @@ -144,6 +142,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xC003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock0 \ + mtdparts=at91_nand:-(root) \ + rw rootfstype=jffs2 #elif CFG_USE_DATAFLASH_CS1 @@ -154,6 +156,10 @@ #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) #define CFG_ENV_SIZE 0x4200 #define CONFIG_BOOTCOMMAND cp.b 0xD003DE00 0x2200 0x200040; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock0 \ + mtdparts=at91_nand:-(root) \ + rw rootfstype=jffs2 #else /* CFG_USE_NANDFLASH */ @@ -163,6 +169,10 @@ #define CFG_ENV_OFFSET_REDUND 0x8 #define CFG_ENV_SIZE 0x2 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND nand read 0x2200 0xA 0x20; bootm +#define CONFIG_BOOTARGSconsole=ttyS0,115200 \ + root=/dev/mtdblock5 \ + mtdparts=at91_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) \ + rw rootfstype=jffs2 #endif -- 1.5.3.3 - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH ARM/AT91 0/10] AT91SAM9260 support
Le mercredi 26 mars 2008 à 22:52 +0100, Stelian Pop a écrit : Hi, The following patches add support for the AT91SAM9260 SoC and the AT91SAM9260EK board and make the necessary preparations for the other AT91SAM9 products. Hi Jean-Christophe and the list, I haven't had any feedback on my patches, did you have the time to look at them ? Will they be considered for the current merge window ? Thanks, Stelian. -- Stelian Pop [EMAIL PROTECTED] - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH ARM/AT91 02/10] Move at91cap9 specific files to at91sam9 directory
AT91CAP9 and AT91SAM9 SoCs are very close hardware wise, so a
common infrastructure can be used. Let this infrastructure be
named after the AT91SAM9 family, and move the existing AT91CAP9
files to the new place.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
Makefile |2 +-
cpu/arm926ejs/{at91cap9 = at91sam9}/Makefile |0
cpu/arm926ejs/{at91cap9 = at91sam9}/config.mk |0
cpu/arm926ejs/{at91cap9 = at91sam9}/ether.c |4 ++--
.../{at91cap9 = at91sam9}/lowlevel_init.S |2 +-
cpu/arm926ejs/{at91cap9 = at91sam9}/spi.c |0
cpu/arm926ejs/{at91cap9 = at91sam9}/timer.c |5 ++---
cpu/arm926ejs/{at91cap9 = at91sam9}/usb.c |2 --
.../{arch-at91cap9 = arch-at91sam9}/AT91CAP9.h|0
.../asm-arm/{arch-at91cap9 = arch-at91sam9}/clk.h |0
.../{arch-at91cap9 = arch-at91sam9}/hardware.h|0
.../{arch-at91cap9 = arch-at91sam9}/memory-map.h |0
net/eth.c |4 ++--
13 files changed, 8 insertions(+), 11 deletions(-)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/Makefile (100%)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/config.mk (100%)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/ether.c (94%)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/lowlevel_init.S (97%)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/spi.c (100%)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/timer.c (97%)
rename cpu/arm926ejs/{at91cap9 = at91sam9}/usb.c (96%)
rename include/asm-arm/{arch-at91cap9 = arch-at91sam9}/AT91CAP9.h (100%)
rename include/asm-arm/{arch-at91cap9 = arch-at91sam9}/clk.h (100%)
rename include/asm-arm/{arch-at91cap9 = arch-at91sam9}/hardware.h (100%)
rename include/asm-arm/{arch-at91cap9 = arch-at91sam9}/memory-map.h (100%)
diff --git a/Makefile b/Makefile
index 4fde699..ed5c13f 100644
--- a/Makefile
+++ b/Makefile
@@ -2301,7 +2301,7 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst
_cs3boot,,$(subst _cs_autoboot,,$
xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
at91cap9adk_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91sam9
at91rm9200dk_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
diff --git a/cpu/arm926ejs/at91cap9/Makefile b/cpu/arm926ejs/at91sam9/Makefile
similarity index 100%
rename from cpu/arm926ejs/at91cap9/Makefile
rename to cpu/arm926ejs/at91sam9/Makefile
diff --git a/cpu/arm926ejs/at91cap9/config.mk b/cpu/arm926ejs/at91sam9/config.mk
similarity index 100%
rename from cpu/arm926ejs/at91cap9/config.mk
rename to cpu/arm926ejs/at91sam9/config.mk
diff --git a/cpu/arm926ejs/at91cap9/ether.c b/cpu/arm926ejs/at91sam9/ether.c
similarity index 94%
rename from cpu/arm926ejs/at91cap9/ether.c
rename to cpu/arm926ejs/at91sam9/ether.c
index b7958d5..8de1bb7 100644
--- a/cpu/arm926ejs/at91cap9/ether.c
+++ b/cpu/arm926ejs/at91sam9/ether.c
@@ -23,12 +23,12 @@
*/
#include common.h
-#include asm/arch/AT91CAP9.h
+#include asm/arch/hardware.h
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
#if defined(CONFIG_MACB) defined(CONFIG_CMD_NET)
-void at91cap9_eth_initialize(bd_t *bi)
+void at91sam9_eth_initialize(bd_t *bi)
{
macb_eth_initialize(0, (void *)AT91C_BASE_MACB, 0x00);
}
diff --git a/cpu/arm926ejs/at91cap9/lowlevel_init.S
b/cpu/arm926ejs/at91sam9/lowlevel_init.S
similarity index 97%
rename from cpu/arm926ejs/at91cap9/lowlevel_init.S
rename to cpu/arm926ejs/at91sam9/lowlevel_init.S
index 24d950c..40a3f6a 100644
--- a/cpu/arm926ejs/at91cap9/lowlevel_init.S
+++ b/cpu/arm926ejs/at91sam9/lowlevel_init.S
@@ -1,5 +1,5 @@
/*
- * AT91CAP9 setup stuff
+ * AT91CAP9/SAM9 setup stuff
*
* (C) Copyright 2007-2008
* Stelian Pop stelian.pop at leadtechdesign.com
diff --git a/cpu/arm926ejs/at91cap9/spi.c b/cpu/arm926ejs/at91sam9/spi.c
similarity index 100%
rename from cpu/arm926ejs/at91cap9/spi.c
rename to cpu/arm926ejs/at91sam9/spi.c
diff --git a/cpu/arm926ejs/at91cap9/timer.c b/cpu/arm926ejs/at91sam9/timer.c
similarity index 97%
rename from cpu/arm926ejs/at91cap9/timer.c
rename to cpu/arm926ejs/at91sam9/timer.c
index c6df5bd..79c135f 100644
--- a/cpu/arm926ejs/at91cap9/timer.c
+++ b/cpu/arm926ejs/at91sam9/timer.c
@@ -26,7 +26,7 @@
#include asm/arch/hardware.h
/*
- * We're using the AT91CAP9 PITC in 32 bit mode, by
+ * We're using the AT91CAP9/SAM9 PITC in 32 bit mode, by
* setting the 20 bit counter period to its maximum (0xf).
*/
#define TIMER_LOAD_VAL 0xf
@@ -134,8 +134,7 @@ ulong get_tbclk(void)
}
/*
- * Reset the cpu by setting up the watchdog timer and let him time out
- * on the AT91CAP9ADK board
+ * Reset the cpu by setting up the watchdog timer and let him time out.
*/
void reset_cpu(ulong ignored)
{
diff --git a/cpu/arm926ejs/at91cap9/usb.c b/cpu/arm926ejs
[U-Boot-Users] [PATCH ARM/AT91 03/10] Remove AT91CAP9.h
Replace AT91CAP9.h file with several splitted header files coming
from the Linux kernel.
This is part 1 of the replacement: AT91CAP9.h removal.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
include/asm-arm/arch-at91sam9/AT91CAP9.h | 518 --
1 files changed, 0 insertions(+), 518 deletions(-)
delete mode 100644 include/asm-arm/arch-at91sam9/AT91CAP9.h
diff --git a/include/asm-arm/arch-at91sam9/AT91CAP9.h
b/include/asm-arm/arch-at91sam9/AT91CAP9.h
deleted file mode 100644
index 02ef9a8..000
--- a/include/asm-arm/arch-at91sam9/AT91CAP9.h
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * (C) Copyright 2008
- * AT91CAP9 definitions
- * Author : ATMEL AT91 application group
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-#ifndef AT91CAP9_H
-#define AT91CAP9_H
-
-typedef volatile unsigned int AT91_REG;
-
-/* Static Memory Controller */
-typedef struct _AT91S_SMC {
- AT91_REGSMC_SETUP0; /* Setup Register for CS 0 */
- AT91_REGSMC_PULSE0; /* Pulse Register for CS 0 */
- AT91_REGSMC_CYCLE0; /* Cycle Register for CS 0 */
- AT91_REGSMC_CTRL0; /* Control Register for CS 0 */
- AT91_REGSMC_SETUP1; /* Setup Register for CS 1 */
- AT91_REGSMC_PULSE1; /* Pulse Register for CS 1 */
- AT91_REGSMC_CYCLE1; /* Cycle Register for CS 1 */
- AT91_REGSMC_CTRL1; /* Control Register for CS 1 */
- AT91_REGSMC_SETUP2; /* Setup Register for CS 2 */
- AT91_REGSMC_PULSE2; /* Pulse Register for CS 2 */
- AT91_REGSMC_CYCLE2; /* Cycle Register for CS 2 */
- AT91_REGSMC_CTRL2; /* Control Register for CS 2 */
- AT91_REGSMC_SETUP3; /* Setup Register for CS 3 */
- AT91_REGSMC_PULSE3; /* Pulse Register for CS 3 */
- AT91_REGSMC_CYCLE3; /* Cycle Register for CS 3 */
- AT91_REGSMC_CTRL3; /* Control Register for CS 3 */
- AT91_REGSMC_SETUP4; /* Setup Register for CS 4 */
- AT91_REGSMC_PULSE4; /* Pulse Register for CS 4 */
- AT91_REGSMC_CYCLE4; /* Cycle Register for CS 4 */
- AT91_REGSMC_CTRL4; /* Control Register for CS 4 */
- AT91_REGSMC_SETUP5; /* Setup Register for CS 5 */
- AT91_REGSMC_PULSE5; /* Pulse Register for CS 5 */
- AT91_REGSMC_CYCLE5; /* Cycle Register for CS 5 */
- AT91_REGSMC_CTRL5; /* Control Register for CS 5 */
- AT91_REGSMC_SETUP6; /* Setup Register for CS 6 */
- AT91_REGSMC_PULSE6; /* Pulse Register for CS 6 */
- AT91_REGSMC_CYCLE6; /* Cycle Register for CS 6 */
- AT91_REGSMC_CTRL6; /* Control Register for CS 6 */
- AT91_REGSMC_SETUP7; /* Setup Register for CS 7 */
- AT91_REGSMC_PULSE7; /* Pulse Register for CS 7 */
- AT91_REGSMC_CYCLE7; /* Cycle Register for CS 7 */
- AT91_REGSMC_CTRL7; /* Control Register for CS 7 */
-} AT91S_SMC, *AT91PS_SMC;
-
-/* SMC_SETUP : (SMC Offset: 0x0) Setup Register for CS x */
-#define AT91C_SMC_NWESETUP (0x3F 0)/* NWE Setup Length */
-#define AT91C_SMC_NCSSETUPWR (0x3F 8)/* NCS Setup Length for WRite */
-#define AT91C_SMC_NRDSETUP (0x3F 16)/* NRD Setup Length */
-#define AT91C_SMC_NCSSETUPRD (0x3F 24)/* NCS Setup Length for ReaD */
-/* SMC_PULSE : (SMC Offset: 0x4) Pulse Register for CS x */
-#define AT91C_SMC_NWEPULSE (0x7F 0)/* NWE Pulse Length */
-#define AT91C_SMC_NCSPULSEWR (0x7F 8)/* NCS Pulse Length for WRite */
-#define AT91C_SMC_NRDPULSE (0x7F 16)/* NRD Pulse Length */
-#define AT91C_SMC_NCSPULSERD (0x7F 24)/* NCS Pulse Length for ReaD */
-/* SMC_CYC : (SMC Offset: 0x8) Cycle Register for CS x */
-#define AT91C_SMC_NWECYCLE (0x1FF 0) /* Total Write Cycle Length */
-#define AT91C_SMC_NRDCYCLE (0x1FF 16) /* Total Read Cycle Length */
-/* SMC_CTRL : (SMC Offset: 0xc) Control Register for CS x */
-#define AT91C_SMC_READMODE (0x1 0) /* Read
[U-Boot-Users] [PATCH ARM/AT91 07/10] Add support for AT91SAM9260EK
Support for booting from internal DataFlash, external DataFlash card or NAND flash is available. Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- MAKEALL|1 + Makefile |3 + board/atmel/at91sam9260ek/Makefile | 50 board/atmel/at91sam9260ek/at91sam9260ek.c | 236 board/atmel/at91sam9260ek/config.mk|1 + board/atmel/at91sam9260ek/led.c| 64 ++ board/atmel/at91sam9260ek/nand.c | 79 +++ board/atmel/at91sam9260ek/u-boot.lds | 57 + drivers/net/macb.c |4 +- include/asm-arm/arch-at91sam9/at91sam9260.h| 127 +++ include/asm-arm/arch-at91sam9/at91sam9260_matrix.h | 78 +++ include/asm-arm/arch-at91sam9/hardware.h |4 + include/configs/at91sam9260ek.h| 191 net/eth.c |2 +- 14 files changed, 894 insertions(+), 3 deletions(-) create mode 100644 board/atmel/at91sam9260ek/Makefile create mode 100644 board/atmel/at91sam9260ek/at91sam9260ek.c create mode 100644 board/atmel/at91sam9260ek/config.mk create mode 100644 board/atmel/at91sam9260ek/led.c create mode 100644 board/atmel/at91sam9260ek/nand.c create mode 100644 board/atmel/at91sam9260ek/u-boot.lds create mode 100644 include/asm-arm/arch-at91sam9/at91sam9260.h create mode 100644 include/asm-arm/arch-at91sam9/at91sam9260_matrix.h create mode 100644 include/configs/at91sam9260ek.h diff --git a/MAKEALL b/MAKEALL index 01573da..7bc7072 100755 --- a/MAKEALL +++ b/MAKEALL @@ -451,6 +451,7 @@ LIST_ARM7= \ LIST_ARM9=\ at91cap9adk \ at91rm9200dk\ + at91sam9260ek \ cmc_pu2 \ ap920t \ ap922_XA10 \ diff --git a/Makefile b/Makefile index ed5c13f..285da35 100644 --- a/Makefile +++ b/Makefile @@ -2306,6 +2306,9 @@ at91cap9adk_config: unconfig at91rm9200dk_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200 +at91sam9260ek_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91sam9 + cmc_pu2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200 diff --git a/board/atmel/at91sam9260ek/Makefile b/board/atmel/at91sam9260ek/Makefile new file mode 100644 index 000..309ea46 --- /dev/null +++ b/board/atmel/at91sam9260ek/Makefile @@ -0,0 +1,50 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd at denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS := at91sam9260ek.o led.o nand.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c new file mode 100644 index 000..a55468e --- /dev/null +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -0,0 +1,236 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop stelian.pop at leadtechdesign.com + * Lead Tech Design www.leadtechdesign.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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
[U-Boot-Users] [PATCH ARM/AT91 10/10] Cleanup DataFlash partition handling
DataFlash partition information has become a mess. This patch
defines a single partition scheme for Atmel DataFlashes. This partition
scheme will be used by all AT91CAP9 and AT91SAM9 boards.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
drivers/mtd/dataflash.c | 55 +++---
include/dataflash.h |6 +
2 files changed, 10 insertions(+), 51 deletions(-)
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 36c99a0..79dc402 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -31,7 +31,7 @@ struct dataflash_addr {
int cs;
};
-#ifdef CONFIG_AT91SAM9260EK
+#if defined(CONFIG_AT91SAM9260EK)
struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
{CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
@@ -48,51 +48,13 @@ struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
#endif
/*define the area offsets*/
-#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) || \
- defined(CONFIG_AT91SAM9263EK) || defined(CONFIG_AT91CAP9ADK)
-#ifdefined(CONFIG_NEW_PARTITION)
dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- {0x,0x3FFF, FLAG_PROTECT_SET, 0,
Bootstrap}, /* ROM code */
- {0x4200,0x83FF, FLAG_PROTECT_CLEAR, 0,
Environment}, /* u-boot environment */
- {0x8400,0x0003DDFF, FLAG_PROTECT_SET, 0,
U-Boot}, /* u-boot code */
- {0x0003DE00,0x00041FFF, FLAG_PROTECT_CLEAR, FLAG_SETENV,
MON}, /* Room for alternative boot monitor */
- {0x00042000,0x0018BFFF, FLAG_PROTECT_CLEAR, FLAG_SETENV,
OS}, /* data area size to tune */
- {0x0018C000,0x, FLAG_PROTECT_CLEAR, FLAG_SETENV,
FS}, /* data area size to tune */
+ {0x, 0x41FF, FLAG_PROTECT_SET, 0, Bootstrap},
+ {0x4200, 0x83FF, FLAG_PROTECT_CLEAR, 0, Environment},
+ {0x8400, 0x0003DDFF, FLAG_PROTECT_SET, 0, U-Boot},
+ {0x0003DE00, 0x0023DE3F, FLAG_PROTECT_CLEAR, 0, Kernel},
+ {0x0023DE40, 0x, FLAG_PROTECT_CLEAR, 0, FS},
};
-#else
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- {0, 0x3fff, FLAG_PROTECT_SET}, /* ROM code */
- {0x4000, 0x7fff, FLAG_PROTECT_CLEAR}, /* u-boot environment */
- {0x8000, 0x37fff, FLAG_PROTECT_SET},/* u-boot code */
- {0x38000, 0x1f, FLAG_PROTECT_CLEAR},/* data area size to
tune */
-};
-#endif
-#elif defined(CONFIG_NEW_PARTITION)
-/*define the area offsets*/
-/* Invalid partitions should be defined with start end */
-dataflash_protect_t area_list[NB_DATAFLASH_AREA*CFG_MAX_DATAFLASH_BANKS] = {
- {0x, 0x83ff, FLAG_PROTECT_SET, 0,
Bootstrap}, /* ROM code */
- {0x8400, 0x00020fff, FLAG_PROTECT_SET, 0,
U-Boot}, /* u-boot code */
- {0x00021000, 0x000293ff, FLAG_PROTECT_CLEAR,0,
Environment}, /* u-boot environment 8Kb */
- {0x00029400, 0x00041fff, FLAG_PROTECT_INVALID, 0,
Unused},/* Rest of Sector 1 */
- {0x00042000, 0x0018Bfff, FLAG_PROTECT_CLEAR,FLAG_SETENV,OS},
/* data area size to tune */
- {0x0018C000, 0x, FLAG_PROTECT_CLEAR,FLAG_SETENV,FS},
/* data area size to tune */
-
- {0x, 0x, FLAG_PROTECT_CLEAR,FLAG_SETENV,
Data},/* data area */
- {0x, 0x, FLAG_PROTECT_INVALID, 0,
Invalid}, /* Invalid */
- {0x, 0x, FLAG_PROTECT_INVALID, 0,
Invalid}, /* Invalid */
- {0x, 0x, FLAG_PROTECT_INVALID, 0,
Invalid}, /* Invalid */
- {0x, 0x, FLAG_PROTECT_INVALID, 0,
Invalid}, /* Invalid */
- {0x, 0x, FLAG_PROTECT_INVALID, 0,
Invalid}, /* Invalid */
-};
-#else
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
- {0, 0x7fff, FLAG_PROTECT_SET}, /* ROM code */
- {0x8000, 0x1, FLAG_PROTECT_SET},/* u-boot code */
- {0x2, 0x27fff, FLAG_PROTECT_CLEAR}, /* u-boot environment */
- {0x28000, 0x1f, FLAG_PROTECT_CLEAR},/* data area size to
tune */
-};
-#endif
extern void AT91F_SpiInit (void);
extern int AT91F_DataflashProbe (int i, AT91PS_DataflashDesc pDesc);
@@ -108,7 +70,7 @@ int AT91F_DataflashInit (void)
{
int i, j;
int dfcode;
- int part = 0;
+ int part;
int last_part;
int found[CFG_MAX_DATAFLASH_BANKS];
unsigned char protected;
@@ -181,7 +143,8 @@ int AT91F_DataflashInit (void)
(dataflash_info[i].Device.pages_number
Re: [U-Boot-Users] ARM custodian change
Le jeudi 20 mars 2008 à 17:36 +, Nicolas Ferre a écrit : Ulf Samuelsson ulf.samuelsson at atmel.com writes: Too bad. I think it would be a good idea, if they would try to work with the official U-Boot community again. Now with the custodian framework in place, some problems of the past should be solved. I 'bcc' our own Jean-Christophe (Zettel) running the AT91 apps team and he will have to discuss with the S/W team and decide. We (the AT91 S/W team) are glad to work with the one and only U-Boot community. It is the first step to move to the last codebase that is the hardest. The work done by Stelian Pop to integrate AT91CAP9 shows the way for all AT91SAM9 support. We will for sure work with Stelian Pop, Jean-Christophe Plagniol-Villard , yourself the whole AT91 U-Boot community to have a smooth transition to the latest codebase. As a matter of fact, Atmel has already provided me with the necessary hardware. I will shortly, as time permits, start feeding the list with AT91SAM patches... -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [ARM] AT91CAP9 support
Le vendredi 08 février 2008 à 14:31 +, Peter Pearse a écrit :
Stelian
Until the next merge window your patches AT91CAP9 support are
available from
git://linux-arm.org/u-boot-armdev.git#080116_at91cap9
Ok, I double checked that tree and it compiles and works fine here.
Your board seem to be the first to make use of CONFIG_HAS_DATAFLASH.
This has resulted in the following warnings (ELDK toolchain):
[...]
Harmless warnings, you can silence them using the below patch.
Thanks,
Stelian.
-
read_dataflash() takes a signed char pointer as a parameter. Silence a
few warnings dues to incorrect parameter types in env_dataflash.c.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 93fff29..d7e8ee8 100644
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -44,22 +44,22 @@ extern uchar default_environment[];
uchar env_get_char_spec (int index)
{
uchar c;
- read_dataflash (CFG_ENV_ADDR+index+offsetof(env_t,data),1,c);
+ read_dataflash(CFG_ENV_ADDR + index + offsetof(env_t,data),
+ 1, (char *)c);
return (c);
}
void env_relocate_spec (void)
{
- read_dataflash (CFG_ENV_ADDR,CFG_ENV_SIZE,(uchar *)env_ptr);
+ read_dataflash(CFG_ENV_ADDR, CFG_ENV_SIZE, (char *)env_ptr);
}
int saveenv(void)
{
-/* env must be copied to do not alter env structure in memory*/
-unsigned char temp[CFG_ENV_SIZE];
-int i;
+ /* env must be copied to do not alter env structure in memory*/
+ unsigned char temp[CFG_ENV_SIZE];
memcpy(temp, env_ptr, CFG_ENV_SIZE);
- return write_dataflash (CFG_ENV_ADDR, (unsigned long)temp,
CFG_ENV_SIZE);
+ return write_dataflash(CFG_ENV_ADDR, (unsigned long)temp,
CFG_ENV_SIZE);
}
/
@@ -77,13 +77,14 @@ int env_init(void)
AT91F_DataflashInit(); /* prepare for DATAFLASH read/write */
/* read old CRC */
- read_dataflash
(CFG_ENV_ADDR+offsetof(env_t,crc),sizeof(ulong),crc);
+ read_dataflash(CFG_ENV_ADDR + offsetof(env_t, crc),
+ sizeof(ulong), (char *)crc);
new = 0;
len = ENV_SIZE;
off = offsetof(env_t,data);
while (len 0) {
int n = (len sizeof(buf)) ? sizeof(buf) : len;
- read_dataflash (CFG_ENV_ADDR+off,n , buf);
+ read_dataflash(CFG_ENV_ADDR + off, n, (char *)buf);
new = crc32 (new, buf, n);
len -= n;
off += n;
--
Stelian Pop [EMAIL PROTECTED]
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Use a structure instead of the error prone unnamed array to define the possible dataflash banks.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
drivers/mtd/dataflash.c | 31 ++-
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 91903c8..4084ff7 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -26,17 +26,22 @@
AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
static AT91S_DataFlash DataFlashInst;
+struct dataflash_addr {
+ unsigned long addr;
+ int cs;
+};
+
#ifdef CONFIG_AT91SAM9260EK
-int cs[][CFG_MAX_DATAFLASH_BANKS] = {
+struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
{CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
};
#elif defined(CONFIG_AT91SAM9263EK)
-int cs[][CFG_MAX_DATAFLASH_BANKS] = {
- {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0} /* Logical adress, CS */
+struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
+ {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
};
#else
-int cs[][CFG_MAX_DATAFLASH_BANKS] = {
+struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
{CFG_DATAFLASH_LOGIC_ADDR_CS3, 3}
};
@@ -114,7 +119,7 @@ int AT91F_DataflashInit (void)
dataflash_info[i].Desc.state = IDLE;
dataflash_info[i].id = 0;
dataflash_info[i].Device.pages_number = 0;
- dfcode = AT91F_DataflashProbe (cs[i][1],
+ dfcode = AT91F_DataflashProbe (cs[i].cs,
dataflash_info[i].Desc);
switch (dfcode) {
@@ -123,9 +128,9 @@ int AT91F_DataflashInit (void)
dataflash_info[i].Device.pages_size = 528;
dataflash_info[i].Device.page_offset = 10;
dataflash_info[i].Device.byte_mask = 0x300;
- dataflash_info[i].Device.cs = cs[i][1];
+ dataflash_info[i].Device.cs = cs[i].cs;
dataflash_info[i].Desc.DataFlash_state = IDLE;
- dataflash_info[i].logical_address = cs[i][0];
+ dataflash_info[i].logical_address = cs[i].addr;
dataflash_info[i].id = dfcode;
found[i] += dfcode;;
break;
@@ -135,9 +140,9 @@ int AT91F_DataflashInit (void)
dataflash_info[i].Device.pages_size = 528;
dataflash_info[i].Device.page_offset = 10;
dataflash_info[i].Device.byte_mask = 0x300;
- dataflash_info[i].Device.cs = cs[i][1];
+ dataflash_info[i].Device.cs = cs[i].cs;
dataflash_info[i].Desc.DataFlash_state = IDLE;
- dataflash_info[i].logical_address = cs[i][0];
+ dataflash_info[i].logical_address = cs[i].addr;
dataflash_info[i].id = dfcode;
found[i] += dfcode;;
break;
@@ -147,9 +152,9 @@ int AT91F_DataflashInit (void)
dataflash_info[i].Device.pages_size = 1056;
dataflash_info[i].Device.page_offset = 11;
dataflash_info[i].Device.byte_mask = 0x700;
- dataflash_info[i].Device.cs = cs[i][1];
+ dataflash_info[i].Device.cs = cs[i].cs;
dataflash_info[i].Desc.DataFlash_state = IDLE;
- dataflash_info[i].logical_address = cs[i][0];
+ dataflash_info[i].logical_address = cs[i].addr;
dataflash_info[i].id = dfcode;
found[i] += dfcode;;
break;
@@ -159,9 +164,9 @@ int AT91F_DataflashInit (void)
dataflash_info[i].Device.pages_size = 1056;
dataflash_info[i].Device.page_offset = 11;
dataflash_info[i].Device.byte_mask = 0x700;
- dataflash_info[i].Device.cs = cs[i][1];
+ dataflash_info[i].Device.cs = cs[i].cs;
dataflash_info[i].Desc.DataFlash_state = IDLE;
- dataflash_info[i].logical_address = cs[i][0];
+ dataflash_info[i].logical_address = cs[i].addr;
dataflash_info[i].id = dfcode;
found[i] += dfcode;;
break;
--
1.5.3.3
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Fix incorrect address test in AT91F_DataflashSelect().
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
drivers/mtd/dataflash.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 4084ff7..2421407 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -309,7 +309,7 @@ AT91PS_DataFlash AT91F_DataflashSelect (AT91PS_DataFlash
pFlash,
for (i = 0; i CFG_MAX_DATAFLASH_BANKS; i++)
if ( dataflash_info[i].id
-int) addr) 0xFF00) ==
+int) *addr) 0xFF00) ==
dataflash_info[i].logical_address)) {
addr_valid = 1;
break;
--
1.5.3.3
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH ARM] AT91CAP9 support : move board files to Atmel vendor directory.
Le dimanche 03 février 2008 à 13:54 +0100, Haavard Skinnemoen a écrit :
I think they should be collected according to board manufacturer or
brand, not cpu type. So boards/atmel is for boards manufactured by
Atmel, not all boards that happen to have an Atmel cpu on them.
Or at least that's what appears to be the current practice.
Ok, so everybody seem to agree that it is good practice to use the
vendor directories.
The (incremental) patch below moves the AT91CAP9ADK board files into the
vendor directory.
Stelian.
---
AT91CAP9 support : move at91cap9adk board files to Atmel vendor directory.
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
Makefile|2 +-
board/{ = atmel}/at91cap9adk/Makefile |0
board/{ = atmel}/at91cap9adk/at91cap9adk.c |0
board/{ = atmel}/at91cap9adk/config.mk |0
board/{ = atmel}/at91cap9adk/led.c |0
board/{ = atmel}/at91cap9adk/nand.c|0
board/{ = atmel}/at91cap9adk/u-boot.lds|0
7 files changed, 1 insertions(+), 1 deletions(-)
rename board/{ = atmel}/at91cap9adk/Makefile (100%)
rename board/{ = atmel}/at91cap9adk/at91cap9adk.c (100%)
rename board/{ = atmel}/at91cap9adk/config.mk (100%)
rename board/{ = atmel}/at91cap9adk/led.c (100%)
rename board/{ = atmel}/at91cap9adk/nand.c (100%)
rename board/{ = atmel}/at91cap9adk/u-boot.lds (100%)
diff --git a/Makefile b/Makefile
index 743c61f..d5c8b2a 100644
--- a/Makefile
+++ b/Makefile
@@ -2302,7 +2302,7 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst
_cs3boot,,$(subst _cs_autoboot,,$
xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
at91cap9adk_config : unconfig
- @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk NULL at91cap9
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91cap9
at91rm9200dk_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
diff --git a/board/at91cap9adk/Makefile b/board/atmel/at91cap9adk/Makefile
similarity index 100%
rename from board/at91cap9adk/Makefile
rename to board/atmel/at91cap9adk/Makefile
diff --git a/board/at91cap9adk/at91cap9adk.c
b/board/atmel/at91cap9adk/at91cap9adk.c
similarity index 100%
rename from board/at91cap9adk/at91cap9adk.c
rename to board/atmel/at91cap9adk/at91cap9adk.c
diff --git a/board/at91cap9adk/config.mk b/board/atmel/at91cap9adk/config.mk
similarity index 100%
rename from board/at91cap9adk/config.mk
rename to board/atmel/at91cap9adk/config.mk
diff --git a/board/at91cap9adk/led.c b/board/atmel/at91cap9adk/led.c
similarity index 100%
rename from board/at91cap9adk/led.c
rename to board/atmel/at91cap9adk/led.c
diff --git a/board/at91cap9adk/nand.c b/board/atmel/at91cap9adk/nand.c
similarity index 100%
rename from board/at91cap9adk/nand.c
rename to board/atmel/at91cap9adk/nand.c
diff --git a/board/at91cap9adk/u-boot.lds b/board/atmel/at91cap9adk/u-boot.lds
similarity index 100%
rename from board/at91cap9adk/u-boot.lds
rename to board/atmel/at91cap9adk/u-boot.lds
--
1.5.3.3
--
Stelian Pop [EMAIL PROTECTED]
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 4/5] AT91CAP9 support : board/ files
Le samedi 02 février 2008 à 06:59 +0100, Stefan Roese a écrit : I did think of that. I have no strong feeling about that. Except that if we put at91cap9adk under board/atmel, at91rm9200dk should go there too. Right. I always prefer to collect board ports from one manufacturer/brand into a specific directory. Manufacturer or brand/type ? Meaning, what do we do with the other AT91 based boards, which are not made by Atmel (cmc_pu2, csb637, kb9202, mp2usb) ? Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 4/5] AT91CAP9 support : board/ files
Le jeudi 31 janvier 2008 à 23:59 +0100, Ulf Samuelsson a écrit : Signed-off-by: Stelian Pop [EMAIL PROTECTED] --- board/at91cap9adk/Makefile | 50 +++ board/at91cap9adk/at91cap9adk.c | 283 +++ board/at91cap9adk/config.mk |1 + board/at91cap9adk/led.c | 80 +++ board/at91cap9adk/nand.c| 71 ++ board/at91cap9adk/u-boot.lds| 57 I think it would be better if these files were located in the board/atmel/at91cap9adk, instead of board/at91cap9adk I did think of that. I have no strong feeling about that. Except that if we put at91cap9adk under board/atmel, at91rm9200dk should go there too. Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 1/5] AT91CAP9 support : build integration
Signed-off-by: Stelian Pop [EMAIL PROTECTED]
---
CREDITS |4
MAKEALL |1 +
Makefile|3 +++
drivers/mtd/dataflash.c |4 ++--
net/eth.c |4
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CREDITS b/CREDITS
index 57a82d2..350c332 100644
--- a/CREDITS
+++ b/CREDITS
@@ -391,6 +391,10 @@ E: [EMAIL PROTECTED]
D: Support for the Wind River sbc405, sbc8240 board
W: http://www.windriver.com
+N: Stelian Pop
+E: [EMAIL PROTECTED]
+D: Atmel AT91CAP9ADK support
+
N: Stefan Roese
E: [EMAIL PROTECTED]
D: AMCC PPC4xx Support
diff --git a/MAKEALL b/MAKEALL
index d66a5fa..438c926 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -446,6 +446,7 @@ LIST_ARM7= \
#
LIST_ARM9=\
+ at91cap9adk \
at91rm9200dk\
cmc_pu2 \
ap920t \
diff --git a/Makefile b/Makefile
index 0f6cc59..743c61f 100644
--- a/Makefile
+++ b/Makefile
@@ -2301,6 +2301,9 @@ xtract_omap1610xxx = $(subst _cs0boot,,$(subst
_cs3boot,,$(subst _cs_autoboot,,$
xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
+at91cap9adk_config : unconfig
+ @$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk NULL at91cap9
+
at91rm9200dk_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk NULL at91rm9200
diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 2421407..81857a4 100644
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -36,7 +36,7 @@ struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
{CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
};
-#elif defined(CONFIG_AT91SAM9263EK)
+#elif defined(CONFIG_AT91SAM9263EK) || defined(CONFIG_AT91CAP9ADK)
struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */
};
@@ -48,7 +48,7 @@ struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
#endif
/*define the area offsets*/
-#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) ||
defined(CONFIG_AT91SAM9263EK)
+#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) ||
defined(CONFIG_AT91SAM9263EK) || defined(CONFIG_AT91CAP9ADK)
#ifdefined(CONFIG_NEW_PARTITION)
dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
{0x,0x3FFF, FLAG_PROTECT_SET, 0,
Bootstrap}, /* ROM code */
diff --git a/net/eth.c b/net/eth.c
index 75175ec..62297ab 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -63,6 +63,7 @@ extern int atstk1000_eth_initialize(bd_t *);
extern int atngw100_eth_initialize(bd_t *);
extern int mcffec_initialize(bd_t*);
extern int mcdmafec_initialize(bd_t*);
+extern int at91cap9_eth_initialize(bd_t *);
#ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int);
@@ -283,6 +284,9 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_FSLDMAFEC)
mcdmafec_initialize(bis);
#endif
+#if defined(CONFIG_AT91CAP9)
+ at91cap9_eth_initialize(bis);
+#endif
if (!eth_devices) {
puts (No ethernet found.\n);
--
1.5.3.3
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 2/5] AT91CAP9 support : include/ files
Le jeudi 31 janvier 2008 à 08:26 +0100, Jean-Christophe PLAGNIOL-VILLARD a écrit : On 20:49 Tue 29 Jan , Stelian Pop wrote: +#define AT91C_SMC_PS (0x3 28) /* Page Size */ +#defineAT91C_SMC_PS_SIZE_FOUR_BYTES(0x0 28) +#defineAT91C_SMC_PS_SIZE_EIGHT_BYTES (0x1 28) ^ Not needed space Please Remove it Let's hope this is the last one Thanks, Stelian. -- Stelian Pop [EMAIL PROTECTED] - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 5/5] AT91CAP9 support : MACB changes
Signed-off-by: Stelian Pop [EMAIL PROTECTED] Acked-by: Haavard Skinnemoen [EMAIL PROTECTED] --- drivers/net/macb.c |8 drivers/net/macb.h |6 ++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 6657d22..9c98338 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -417,10 +417,18 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) /* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII +#ifdef CONFIG_AT91CAP9ADK + macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); +#else macb_writel(macb, USRIO, 0); +#endif +#else +#ifdef CONFIG_AT91CAP9ADK + macb_writel(macb, USRIO, MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, MACB_BIT(MII)); #endif +#endif /* CONFIG_RMII */ if (!macb_phy_init(macb)) return -1; diff --git a/drivers/net/macb.h b/drivers/net/macb.h index c778e4e..f92a20c 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -222,6 +222,12 @@ #define MACB_TX_PAUSE_ZERO_OFFSET 3 #define MACB_TX_PAUSE_ZERO_SIZE1 +/* Bitfields in USRIO (AT91) */ +#define MACB_RMII_OFFSET 0 +#define MACB_RMII_SIZE 1 +#define MACB_CLKEN_OFFSET 1 +#define MACB_CLKEN_SIZE1 + /* Bitfields in WOL */ #define MACB_IP_OFFSET 0 #define MACB_IP_SIZE 16 -- 1.5.3.3 - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
