Patchwork [U-Boot,47/52] ARM: remove broken "at91sam9261ek" / "at91sam9g10ek" boards

login
register
mail settings
Submitter Wolfgang Denk
Date July 17, 2011, 10:17 p.m.
Message ID <1310941040-6526-48-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/105117/
State Not Applicable
Delegated to: Reinhard Meyer
Headers show

Comments

Wolfgang Denk - July 17, 2011, 10:17 p.m.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Stelian Pop <stelian.pop@leadtechdesign.com>
Cc: Sedji Gaouaou<sedji.gaouaou@atmel.com>
---
 MAINTAINERS                               |    2 -
 MAKEALL                                   |    2 -
 Makefile                                  |   23 ---
 board/atmel/at91sam9261ek/Makefile        |   56 ------
 board/atmel/at91sam9261ek/at91sam9261ek.c |  292 -----------------------------
 board/atmel/at91sam9261ek/config.mk       |    1 -
 board/atmel/at91sam9261ek/led.c           |   43 -----
 board/atmel/at91sam9261ek/partition.c     |   40 ----
 doc/README.scrapyard                      |    2 +
 include/configs/at91sam9261ek.h           |  240 -----------------------
 10 files changed, 2 insertions(+), 699 deletions(-)
 delete mode 100644 board/atmel/at91sam9261ek/Makefile
 delete mode 100644 board/atmel/at91sam9261ek/at91sam9261ek.c
 delete mode 100644 board/atmel/at91sam9261ek/config.mk
 delete mode 100644 board/atmel/at91sam9261ek/led.c
 delete mode 100644 board/atmel/at91sam9261ek/partition.c
 delete mode 100644 include/configs/at91sam9261ek.h
Xu, Hong - July 18, 2011, 2:52 a.m.
Hi Reinhard,

It's a pity to see that some of the AT91 boards are planed to be removed 
by Wolfgang.

Several weeks ago, the patches for SAM9261/9G10 have got Acks from you.
See http://www.mail-archive.com/u-boot@lists.denx.de/msg54829.html
But I don't know why it's not merged upstream.

For SAM9RL, the V3 patches have been sent long time ago and was pinged. 
But no response any longer.

The similar stories are also applied for SAM9263 and SAM9M10G45.

We of course need the mainline support for all SAM9 boards in U-Boot. 
But it's the time we need your plans/suggestions/NAKs/ACKs to move on.

Thanks.

BR,
Eric

On 07/18/2011 06:17 AM, Wolfgang Denk wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Stelian Pop <stelian.pop@leadtechdesign.com>
> Cc: Sedji Gaouaou<sedji.gaouaou@atmel.com>
> ---
> MAINTAINERS | 2 -
> MAKEALL | 2 -
> Makefile | 23 ---
> board/atmel/at91sam9261ek/Makefile | 56 ------
> board/atmel/at91sam9261ek/at91sam9261ek.c | 292
> -----------------------------
> board/atmel/at91sam9261ek/config.mk | 1 -
> board/atmel/at91sam9261ek/led.c | 43 -----
> board/atmel/at91sam9261ek/partition.c | 40 ----
> doc/README.scrapyard | 2 +
> include/configs/at91sam9261ek.h | 240 -----------------------
> 10 files changed, 2 insertions(+), 699 deletions(-)
> delete mode 100644 board/atmel/at91sam9261ek/Makefile
> delete mode 100644 board/atmel/at91sam9261ek/at91sam9261ek.c
> delete mode 100644 board/atmel/at91sam9261ek/config.mk
> delete mode 100644 board/atmel/at91sam9261ek/led.c
> delete mode 100644 board/atmel/at91sam9261ek/partition.c
> delete mode 100644 include/configs/at91sam9261ek.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9f36643..da3202f 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -630,7 +630,6 @@ Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
> otc570 ARM926EJS (AT91SAM9263 SoC)
>
> Sedji Gaouaou<sedji.gaouaou@atmel.com>
> - at91sam9g10ek ARM926EJS (AT91SAM9G10 SoC)
> at91sam9m10g45ek ARM926EJS (AT91SAM9G45 SoC)
>
> Simon Guinot <simon.guinot@sequanux.org>
> @@ -743,7 +742,6 @@ Manikandan Pillai <mani.pillai@ti.com>
> Stelian Pop <stelian.pop@leadtechdesign.com>
>
> at91sam9260ek ARM926EJS (AT91SAM9260 SoC)
> - at91sam9261ek ARM926EJS (AT91SAM9261 SoC)
> at91sam9263ek ARM926EJS (AT91SAM9263 SoC)
> at91sam9rlek ARM926EJS (AT91SAM9RL SoC)
>
[...]
Albert ARIBAUD - July 18, 2011, 6:39 a.m.
Hi Eric,

Le 18/07/2011 04:52, Hong Xu a écrit :
> Hi Reinhard,
>
> It's a pity to see that some of the AT91 boards are planed to be removed
> by Wolfgang.
>
> Several weeks ago, the patches for SAM9261/9G10 have got Acks from you.
> See http://www.mail-archive.com/u-boot@lists.denx.de/msg54829.html
> But I don't know why it's not merged upstream.
>
> For SAM9RL, the V3 patches have been sent long time ago and was pinged.
> But no response any longer.
>
> The similar stories are also applied for SAM9263 and SAM9M10G45.
>
> We of course need the mainline support for all SAM9 boards in U-Boot.
> But it's the time we need your plans/suggestions/NAKs/ACKs to move on.
>
> Thanks.

Note: I'll naturally defer the decision of what to make with the AT91 
boards to Reinhard, and likewise to other ARM custodians for boards the 
architecture of which falls under their 'jurisdiction'.

> BR,
> Eric

Amicalement,
Xu, Hong - July 25, 2011, 7:39 a.m.
Hi Albert,

On 07/18/2011 02:39 PM, Albert ARIBAUD wrote:
> Hi Eric,
>
> Le 18/07/2011 04:52, Hong Xu a écrit :
>  > Hi Reinhard,
>  >
>  > It's a pity to see that some of the AT91 boards are planed to be removed
>  > by Wolfgang.
>  >
>  > Several weeks ago, the patches for SAM9261/9G10 have got Acks from you.
>  > See http://www.mail-archive.com/u-boot@lists.denx.de/msg54829.html
>  > But I don't know why it's not merged upstream.
>  >
>  > For SAM9RL, the V3 patches have been sent long time ago and was pinged.
>  > But no response any longer.
>  >
>  > The similar stories are also applied for SAM9263 and SAM9M10G45.
>  >
>  > We of course need the mainline support for all SAM9 boards in U-Boot.
>  > But it's the time we need your plans/suggestions/NAKs/ACKs to move on.
>  >
>  > Thanks.
>
> Note: I'll naturally defer the decision of what to make with the AT91
> boards to Reinhard, and likewise to other ARM custodians for boards the
> architecture of which falls under their 'jurisdiction'.

Understand. But it looks like Reinhard has bunch of paid work at hand 
and he has his vocation in the near future (He mentioned this in an 
email towards Wolfgang's  [U-Boot] [PATCH 00/52] ARM: remove broken 
boards). We noticed that there are several AT91 fixes in the mailing 
list without any response.

As a suggestion, how about we setup a git branch and collect AT91 
related patches during Reinhard's busy time and vocation time? If yes, 
can we ask for `pull request' from you?

Thanks.

BR,
Eric
Reinhard Meyer - July 26, 2011, 12:59 p.m.
Dear Hong Xu,
> Hi Albert,
> 
> On 07/18/2011 02:39 PM, Albert ARIBAUD wrote:
> > Hi Eric,
> >
> > Le 18/07/2011 04:52, Hong Xu a écrit :
> >  > Hi Reinhard,
> >  >
> >  > It's a pity to see that some of the AT91 boards are planed to be removed
> >  > by Wolfgang.
> >  >
> >  > Several weeks ago, the patches for SAM9261/9G10 have got Acks from you.
> >  > See http://www.mail-archive.com/u-boot@lists.denx.de/msg54829.html
> >  > But I don't know why it's not merged upstream.

Now, an actual at91sam9261_devices.c and at91sam9261.h are on top of
u-boot-atmel/master.
If your board patches for az91sam9261-ek still work with that, I can
apply them again to master.

> >  >
> >  > For SAM9RL, the V3 patches have been sent long time ago and was pinged.
> >  > But no response any longer.

I have changes requested there.

> >  >
> >  > The similar stories are also applied for SAM9263 and SAM9M10G45.

Changes requested as well.

> >  >
> >  > We of course need the mainline support for all SAM9 boards in U-Boot.
> >  > But it's the time we need your plans/suggestions/NAKs/ACKs to move on.
> >  >
> >  > Thanks.
> >
> > Note: I'll naturally defer the decision of what to make with the AT91
> > boards to Reinhard, and likewise to other ARM custodians for boards the
> > architecture of which falls under their 'jurisdiction'.
> 
> Understand. But it looks like Reinhard has bunch of paid work at hand 
> and he has his vocation in the near future (He mentioned this in an 
> email towards Wolfgang's  [U-Boot] [PATCH 00/52] ARM: remove broken 
> boards). We noticed that there are several AT91 fixes in the mailing 
> list without any response.

This is not true. Most have been commented and changes requested.

> 
> As a suggestion, how about we setup a git branch and collect AT91 
> related patches during Reinhard's busy time and vocation time? If yes, 
> can we ask for `pull request' from you?

I do not think such a "diagonal" approach is desired by anyone.

Anyway, for work reasons, there will be no extended vacation this
summer :(

Again, the work flow, as I want it followed, is as such:

1. convert/fix all SoC specific files for 9263 9g45 etc. to be in line
and equivalent to the now existing files for 9260 and 9261.
(Next should be for 9263, we should be looking at existing patches to
fix that SoC).
I will NOT accept patches that do not fully implement the name schemes
laid out in 9260 and 9261.

2. Fix any boards to use those files AND to use relocation properly.

3. Make sure those build without warning or errors.

4. Make sure those boards still "boot" with that u-boot.

5. When a board has passed those tests (I cannot test point 4) the
"removal" patch for that board will not be applied.

Best Regards,
Reinhard
Andreas Bießmann - July 26, 2011, 1:21 p.m.
Dear all,

Am 26.07.2011 14:59, schrieb Reinhard Meyer:
> Dear Hong Xu,
>> Hi Albert,

<snip>

>> As a suggestion, how about we setup a git branch and collect AT91 
>> related patches during Reinhard's busy time and vocation time? If yes, 
>> can we ask for `pull request' from you?
> 
> I do not think such a "diagonal" approach is desired by anyone.
> 
> Anyway, for work reasons, there will be no extended vacation this
> summer :(

How sad!

> Again, the work flow, as I want it followed, is as such:

<snip>

> 5. When a board has passed those tests (I cannot test point 4) the
> "removal" patch for that board will not be applied.

A removed board can always added again, if one cares.

regards

Andreas Bießmann
Xu, Hong - July 27, 2011, 2:07 a.m.
Hi Reinhard,

On 07/26/2011 08:59 PM, Reinhard Meyer wrote:
> Dear Hong Xu,
>  > Hi Albert,
>  >
>  > On 07/18/2011 02:39 PM, Albert ARIBAUD wrote:
>  > > Hi Eric,
>  > >
>  > > Le 18/07/2011 04:52, Hong Xu a écrit :
>  > > > Hi Reinhard,
>  > > >
>  > > > It's a pity to see that some of the AT91 boards are planed to be
> removed
>  > > > by Wolfgang.
>  > > >
>  > > > Several weeks ago, the patches for SAM9261/9G10 have got Acks
> from you.
>  > > > See http://www.mail-archive.com/u-boot@lists.denx.de/msg54829.html
>  > > > But I don't know why it's not merged upstream.
>
> Now, an actual at91sam9261_devices.c and at91sam9261.h are on top of
> u-boot-atmel/master.
> If your board patches for az91sam9261-ek still work with that, I can
> apply them again to master.

OK, I'll check and resend the board fix.

>
>  > > >
>  > > > For SAM9RL, the V3 patches have been sent long time ago and was
> pinged.
>  > > > But no response any longer.
>
> I have changes requested there.

You mean the change requests for V3 patches? I never saw them. Is it a 
general comments towards AT91 or specific to V3 patches?

But anyway, I'd like to send the patches again in the coming days.

>
>  > > >
>  > > > The similar stories are also applied for SAM9263 and SAM9M10G45.
>
> Changes requested as well.

Ditto.

[...]
>
> Anyway, for work reasons, there will be no extended vacation this
> summer :(

Sorry to hear this.

> Again, the work flow, as I want it followed, is as such:
>
> 1. convert/fix all SoC specific files for 9263 9g45 etc. to be in line
> and equivalent to the now existing files for 9260 and 9261.
> (Next should be for 9263, we should be looking at existing patches to
> fix that SoC).
> I will NOT accept patches that do not fully implement the name schemes
> laid out in 9260 and 9261.
>
> 2. Fix any boards to use those files AND to use relocation properly.
>
> 3. Make sure those build without warning or errors.
>
> 4. Make sure those boards still "boot" with that u-boot.
>
> 5. When a board has passed those tests (I cannot test point 4) the
> "removal" patch for that board will not be applied.

OK, the SoC fixes for 9263 and 9G45 will come firstly.

Thanks.

BR,
Eric

> Best Regards,
> Reinhard
>

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 9f36643..da3202f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -630,7 +630,6 @@  Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
 	otc570		ARM926EJS (AT91SAM9263 SoC)
 
 Sedji Gaouaou<sedji.gaouaou@atmel.com>
-	at91sam9g10ek		ARM926EJS (AT91SAM9G10 SoC)
 	at91sam9m10g45ek	ARM926EJS (AT91SAM9G45 SoC)
 
 Simon Guinot <simon.guinot@sequanux.org>
@@ -743,7 +742,6 @@  Manikandan Pillai <mani.pillai@ti.com>
 Stelian Pop <stelian.pop@leadtechdesign.com>
 
 	at91sam9260ek	ARM926EJS (AT91SAM9260 SoC)
-	at91sam9261ek	ARM926EJS (AT91SAM9261 SoC)
 	at91sam9263ek	ARM926EJS (AT91SAM9263 SoC)
 	at91sam9rlek	ARM926EJS (AT91SAM9RL SoC)
 
diff --git a/MAKEALL b/MAKEALL
index d43bcc5..2e2826c 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -394,9 +394,7 @@  LIST_ARMV7="		\
 LIST_at91="$(boards_by_soc at91)\
 	$(boards_by_soc at91rm9200)\
 	at91sam9260ek		\
-	at91sam9261ek		\
 	at91sam9263ek		\
-	at91sam9g10ek		\
 	at91sam9g20ek		\
 	at91sam9m10g45ek	\
 	at91sam9rlek		\
diff --git a/Makefile b/Makefile
index af6ff87..b98754a 100644
--- a/Makefile
+++ b/Makefile
@@ -796,29 +796,6 @@  M5485HFE_config :	unconfig
 ## ARM926EJ-S Systems
 #########################################################################
 
-at91sam9261ek_nandflash_config \
-at91sam9261ek_dataflash_cs0_config \
-at91sam9261ek_dataflash_cs3_config \
-at91sam9261ek_config \
-at91sam9g10ek_nandflash_config \
-at91sam9g10ek_dataflash_cs0_config \
-at91sam9g10ek_dataflash_cs3_config \
-at91sam9g10ek_config	:	unconfig
-	@mkdir -p $(obj)include
-	@if [ "$(findstring 9g10,$@)" ] ; then \
-		echo "#define CONFIG_AT91SAM9G10EK 1"	>>$(obj)include/config.h ; \
-	else \
-		echo "#define CONFIG_AT91SAM9261EK 1"	>>$(obj)include/config.h ; \
-	fi;
-	@if [ "$(findstring _nandflash,$@)" ] ; then \
-		echo "#define CONFIG_SYS_USE_NANDFLASH 1"	>>$(obj)include/config.h ; \
-	elif [ "$(findstring dataflash_cs0,$@)" ] ; then \
-		echo "#define CONFIG_SYS_USE_DATAFLASH_CS3 1"	>>$(obj)include/config.h ; \
-	else \
-		echo "#define CONFIG_SYS_USE_DATAFLASH_CS0 1"	>>$(obj)include/config.h ; \
-	fi;
-	@$(MKCONFIG) -n $@ -a at91sam9261ek arm arm926ejs at91sam9261ek atmel at91
-
 at91sam9263ek_norflash_config \
 at91sam9263ek_norflash_boot_config \
 at91sam9263ek_nandflash_config \
diff --git a/board/atmel/at91sam9261ek/Makefile b/board/atmel/at91sam9261ek/Makefile
deleted file mode 100644
index 9d20ba0..0000000
--- a/board/atmel/at91sam9261ek/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@ 
-#
-# (C) Copyright 2003-2008
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# (C) Copyright 2008
-# Stelian Pop <stelian.pop@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 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).o
-
-COBJS-y += at91sam9261ek.o
-COBJS-y += led.o
-COBJS-$(CONFIG_HAS_DATAFLASH) += partition.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS-y))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-clean:
-	rm -f $(SOBJS) $(OBJS)
-
-distclean:	clean
-	rm -f $(LIB) core *.bak $(obj).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
deleted file mode 100644
index de5cfae..0000000
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ /dev/null
@@ -1,292 +0,0 @@ 
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian.pop@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 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/arch/at91sam9261.h>
-#include <asm/arch/at91sam9261_matrix.h>
-#include <asm/arch/at91sam9_smc.h>
-#include <asm/arch/at91_common.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
-#include <asm/arch/clk.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>
-#include <netdev.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* ------------------------------------------------------------------------- */
-/*
- * Miscelaneous platform dependent initialisations
- */
-
-#ifdef CONFIG_CMD_NAND
-static void at91sam9261ek_nand_hw_init(void)
-{
-	unsigned long csa;
-
-	/* Enable CS3 */
-	csa = at91_sys_read(AT91_MATRIX_EBICSA);
-	at91_sys_write(AT91_MATRIX_EBICSA,
-		       csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
-
-	/* Configure SMC CS3 for NAND/SmartMedia */
-#ifdef CONFIG_AT91SAM9G10EK
-	at91_sys_write(AT91_SMC_SETUP(3),
-		       AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) |
-		       AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0));
-	at91_sys_write(AT91_SMC_PULSE(3),
-		       AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(7) |
-		       AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(7));
-	at91_sys_write(AT91_SMC_CYCLE(3),
-		       AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
-#else
-	at91_sys_write(AT91_SMC_SETUP(3),
-		       AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
-		       AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));
-	at91_sys_write(AT91_SMC_PULSE(3),
-		       AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
-		       AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));
-	at91_sys_write(AT91_SMC_CYCLE(3),
-		       AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));
-#endif
-	at91_sys_write(AT91_SMC_MODE(3),
-		       AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-		       AT91_SMC_EXNWMODE_DISABLE |
-#ifdef CONFIG_SYS_NAND_DBW_16
-		       AT91_SMC_DBW_16 |
-#else /* CONFIG_SYS_NAND_DBW_8 */
-		       AT91_SMC_DBW_8 |
-#endif
-		       AT91_SMC_TDF_(2));
-
-	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_PIOC);
-
-	/* Configure RDY/BSY */
-	at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
-
-	/* Enable NandFlash */
-	at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
-
-	at91_set_A_periph(AT91_PIN_PC0, 0);	/* NANDOE */
-	at91_set_A_periph(AT91_PIN_PC1, 0);	/* NANDWE */
-}
-#endif
-
-#ifdef CONFIG_DRIVER_DM9000
-static void at91sam9261ek_dm9000_hw_init(void)
-{
-	/* Configure SMC CS2 for DM9000 */
-#ifdef CONFIG_AT91SAM9G10EK
-	at91_sys_write(AT91_SMC_SETUP(2),
-		       AT91_SMC_NWESETUP_(3) | AT91_SMC_NCS_WRSETUP_(0) |
-		       AT91_SMC_NRDSETUP_(3) | AT91_SMC_NCS_RDSETUP_(0));
-	at91_sys_write(AT91_SMC_PULSE(2),
-		       AT91_SMC_NWEPULSE_(6) | AT91_SMC_NCS_WRPULSE_(8) |
-		       AT91_SMC_NRDPULSE_(6) | AT91_SMC_NCS_RDPULSE_(8));
-	at91_sys_write(AT91_SMC_CYCLE(2),
-		       AT91_SMC_NWECYCLE_(20) | AT91_SMC_NRDCYCLE_(20));
-	at91_sys_write(AT91_SMC_MODE(2),
-		       AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-		       AT91_SMC_EXNWMODE_DISABLE |
-		       AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16 |
-		       AT91_SMC_TDF_(1));
-#else
-	at91_sys_write(AT91_SMC_SETUP(2),
-		       AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) |
-		       AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0));
-	at91_sys_write(AT91_SMC_PULSE(2),
-		       AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(8) |
-		       AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(8));
-	at91_sys_write(AT91_SMC_CYCLE(2),
-		       AT91_SMC_NWECYCLE_(16) | AT91_SMC_NRDCYCLE_(16));
-	at91_sys_write(AT91_SMC_MODE(2),
-		       AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-		       AT91_SMC_EXNWMODE_DISABLE |
-		       AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16 |
-		       AT91_SMC_TDF_(1));
-#endif
-
-	/* Configure Reset signal as output */
-	at91_set_gpio_output(AT91_PIN_PC10, 0);
-
-	/* Configure Interrupt pin as input, no pull-up */
-	at91_set_gpio_input(AT91_PIN_PC11, 0);
-}
-#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);
-
-#ifdef CONFIG_AT91SAM9G10EK
-	gd->fb_base = CONFIG_AT91SAM9G10_LCD_BASE;
-#else
-	gd->fb_base = AT91SAM9261_SRAM_BASE;
-#endif
-}
-
-#ifdef CONFIG_LCD_INFO
-#include <nand.h>
-#include <version.h>
-
-void lcd_show_board_info(void)
-{
-	ulong dram_size, nand_size;
-	int i;
-	char temp[32];
-
-	lcd_printf ("%s\n", U_BOOT_VERSION);
-	lcd_printf ("(C) 2008 ATMEL Corp\n");
-	lcd_printf ("at91support@atmel.com\n");
-	lcd_printf ("%s CPU at %s MHz\n",
-		CONFIG_SYS_AT91_CPU_NAME,
-		strmhz(temp, get_cpu_clk_rate()));
-
-	dram_size = 0;
-	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++)
-		dram_size += gd->bd->bi_dram[i].size;
-	nand_size = 0;
-	for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++)
-		nand_size += nand_info[i].size;
-	lcd_printf ("  %ld MB SDRAM, %ld MB NAND\n",
-		dram_size >> 20,
-		nand_size >> 20 );
-}
-#endif /* CONFIG_LCD_INFO */
-#endif
-
-int board_init(void)
-{
-	/* Enable Ctrlc */
-	console_init_f();
-
-#ifdef CONFIG_AT91SAM9G10EK
-	/* arch number of AT91SAM9G10EK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G10EK;
-#else
-	/* arch number of AT91SAM9261EK-Board */
-	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9261EK;
-#endif
-	/* adress of boot parameters */
-	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-
-	at91_serial_hw_init();
-#ifdef CONFIG_CMD_NAND
-	at91sam9261ek_nand_hw_init();
-#endif
-#ifdef CONFIG_HAS_DATAFLASH
-	at91_spi0_hw_init(1 << 0);
-#endif
-#ifdef CONFIG_DRIVER_DM9000
-	at91sam9261ek_dm9000_hw_init();
-#endif
-#ifdef CONFIG_LCD
-	at91sam9261ek_lcd_hw_init();
-#endif
-	return 0;
-}
-
-#ifdef CONFIG_DRIVER_DM9000
-int board_eth_init(bd_t *bis)
-{
-	return dm9000_initialize(bis);
-}
-#endif
-
-int dram_init(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
-	return 0;
-}
-
-#ifdef CONFIG_RESET_PHY_R
-void reset_phy(void)
-{
-#ifdef CONFIG_DRIVER_DM9000
-	/*
-	 * Initialize ethernet HW addr prior to starting Linux,
-	 * needed for nfsroot
-	 */
-	eth_init(gd->bd);
-#endif
-}
-#endif
diff --git a/board/atmel/at91sam9261ek/config.mk b/board/atmel/at91sam9261ek/config.mk
deleted file mode 100644
index e554a45..0000000
--- a/board/atmel/at91sam9261ek/config.mk
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_SYS_TEXT_BASE = 0x23f00000
diff --git a/board/atmel/at91sam9261ek/led.c b/board/atmel/at91sam9261ek/led.c
deleted file mode 100644
index 5d1c5f2..0000000
--- a/board/atmel/at91sam9261ek/led.c
+++ /dev/null
@@ -1,43 +0,0 @@ 
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian.pop@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 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-#include <asm/arch/at91sam9261.h>
-#include <asm/arch/at91_pmc.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
-
-void coloured_LED_init(void)
-{
-	/* Enable clock */
-	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9261_ID_PIOA);
-
-	at91_set_gpio_output(CONFIG_RED_LED, 1);
-	at91_set_gpio_output(CONFIG_GREEN_LED, 1);
-	at91_set_gpio_output(CONFIG_YELLOW_LED, 1);
-
-	at91_set_gpio_value(CONFIG_RED_LED, 0);
-	at91_set_gpio_value(CONFIG_GREEN_LED, 1);
-	at91_set_gpio_value(CONFIG_YELLOW_LED, 1);
-}
diff --git a/board/atmel/at91sam9261ek/partition.c b/board/atmel/at91sam9261ek/partition.c
deleted file mode 100644
index c739b11..0000000
--- a/board/atmel/at91sam9261ek/partition.c
+++ /dev/null
@@ -1,40 +0,0 @@ 
-/*
- * (C) Copyright 2008
- * Ulf Samuelsson <ulf@atmel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- */
-#include <common.h>
-#include <config.h>
-#include <asm/hardware.h>
-#include <dataflash.h>
-
-AT91S_DATAFLASH_INFO dataflash_info[CONFIG_SYS_MAX_DATAFLASH_BANKS];
-
-struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = {
-	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
-	{CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3, 3}
-};
-
-/*define the area offsets*/
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-	{0x00000000, 0x000041FF, FLAG_PROTECT_SET,   0, "Bootstrap"},
-	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
-	{0x00008400, 0x00041FFF, FLAG_PROTECT_SET,   0, "U-Boot"},
-	{0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0,	"Kernel"},
-	{0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0,	"FS"},
-};
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index 936c3fb..2bb5870 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -11,6 +11,8 @@  easily if here is something they might want to dig for...
 
 Board	Arch	CPU	removed	    Commit	last known maintainer/contact
 =============================================================================
+at91sam9g10ek arm arm926ejs -	  2011-07-17	Sedji Gaouaou<sedji.gaouaou@atmel.com>
+at91sam9261ek arm arm926ejs -	  2011-07-17	Stelian Pop <stelian.pop@leadtechdesign.com>
 at91rm9200dk arm arm920t -	  2011-07-17
 m501sk	arm	arm920t	-	  2011-07-17
 kb9202	arm	arm920t	-	  2011-07-17
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
deleted file mode 100644
index 401478b..0000000
--- a/include/configs/at91sam9261ek.h
+++ /dev/null
@@ -1,240 +0,0 @@ 
-/*
- * (C) Copyright 2007-2008
- * Stelian Pop <stelian.pop@leadtechdesign.com>
- * Lead Tech Design <www.leadtechdesign.com>
- *
- * Configuation settings for the AT91SAM9261EK board.
- *
- * 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 __CONFIG_H
-#define __CONFIG_H
-
-#define CONFIG_AT91_LEGACY
-
-/* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_MAIN_CLOCK	18432000	/* 18.432 MHz crystal */
-#define CONFIG_SYS_HZ		1000
-
-#define CONFIG_ARM926EJS	1	/* This is an ARM926EJS Core	*/
-#ifdef CONFIG_AT91SAM9G10EK
-#define CONFIG_AT91SAM9G10	1	/* It's an Atmel AT91SAM9G10 SoC*/
-#else
-#define CONFIG_AT91SAM9261	1	/* It's an Atmel AT91SAM9261 SoC*/
-#endif
-#define CONFIG_ARCH_CPU_INIT
-#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
-
-#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG	1
-
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/*
- * Hardware drivers
- */
-#define CONFIG_AT91_GPIO	1
-#define CONFIG_ATMEL_USART	1
-#undef CONFIG_USART0
-#undef CONFIG_USART1
-#undef CONFIG_USART2
-#define CONFIG_USART3		1	/* USART 3 is DBGU */
-
-/* LCD */
-#define CONFIG_LCD			1
-#define LCD_BPP				LCD_COLOR8
-#define CONFIG_LCD_LOGO			1
-#undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO			1
-#define CONFIG_LCD_INFO_BELOW_LOGO	1
-#define CONFIG_SYS_WHITE_ON_BLACK		1
-#define CONFIG_ATMEL_LCD		1
-#ifdef CONFIG_AT91SAM9261EK
-#define CONFIG_ATMEL_LCD_BGR555		1
-#else
-#define	CONFIG_AT91SAM9G10_LCD_BASE		0x23E00000	/* LCD is no more in SRAM */
-#endif
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV		1
-
-/* LED */
-#define CONFIG_AT91_LED
-#define	CONFIG_RED_LED		AT91_PIN_PA23	/* this is the power led */
-#define	CONFIG_GREEN_LED	AT91_PIN_PA13	/* this is the user1 led */
-#define	CONFIG_YELLOW_LED	AT91_PIN_PA14	/* this is the user2 led */
-
-#define CONFIG_BOOTDELAY	3
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE	1
-#define CONFIG_BOOTP_BOOTPATH		1
-#define CONFIG_BOOTP_GATEWAY		1
-#define CONFIG_BOOTP_HOSTNAME		1
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_SOURCE
-
-#define CONFIG_CMD_PING		1
-#define CONFIG_CMD_DHCP		1
-#define CONFIG_CMD_NAND		1
-#define CONFIG_CMD_USB		1
-
-/* SDRAM */
-#define CONFIG_NR_DRAM_BANKS		1
-#define PHYS_SDRAM			0x20000000
-#define PHYS_SDRAM_SIZE			0x04000000	/* 64 megs */
-
-/* DataFlash */
-#define CONFIG_ATMEL_DATAFLASH_SPI
-#define CONFIG_HAS_DATAFLASH		1
-#define CONFIG_SYS_SPI_WRITE_TOUT		(5*CONFIG_SYS_HZ)
-#define CONFIG_SYS_MAX_DATAFLASH_BANKS		2
-#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
-#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3	0xD0000000	/* CS3 */
-#define AT91_SPI_CLK			15000000
-#define DATAFLASH_TCSS			(0x1a << 16)
-#define DATAFLASH_TCHS			(0x1 << 24)
-
-/* NAND flash */
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_NAND_ATMEL
-#define CONFIG_SYS_MAX_NAND_DEVICE		1
-#define CONFIG_SYS_NAND_BASE			0x40000000
-#define CONFIG_SYS_NAND_DBW_8			1
-/* our ALE is AD22 */
-#define CONFIG_SYS_NAND_MASK_ALE		(1 << 22)
-/* our CLE is AD21 */
-#define CONFIG_SYS_NAND_MASK_CLE		(1 << 21)
-#define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIN_PC14
-#define CONFIG_SYS_NAND_READY_PIN		AT91_PIN_PC15
-
-#endif
-
-/* NOR flash - no real flash on this board */
-#define CONFIG_SYS_NO_FLASH			1
-
-/* Ethernet */
-#define CONFIG_NET_MULTI		1
-#define CONFIG_DRIVER_DM9000		1
-#define CONFIG_DM9000_BASE		0x30000000
-#define DM9000_IO			CONFIG_DM9000_BASE
-#define DM9000_DATA			(CONFIG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT		1
-#define CONFIG_DM9000_NO_SROM		1
-#define CONFIG_NET_RETRY_COUNT		20
-#define CONFIG_RESET_PHY_R		1
-
-/* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_DOS_PARTITION		1
-#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9261_UHP_BASE */
-#ifdef CONFIG_AT91SAM9G10EK
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9g10"
-#else
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9261"
-#endif
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
-#define CONFIG_USB_STORAGE		1
-#define CONFIG_CMD_FAT			1
-
-#define CONFIG_SYS_LOAD_ADDR			0x22000000	/* load address */
-
-#define CONFIG_SYS_MEMTEST_START		PHYS_SDRAM
-#define CONFIG_SYS_MEMTEST_END			0x23e00000
-
-#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
-
-/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_IS_IN_DATAFLASH	1
-#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define CONFIG_ENV_OFFSET	0x4200
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_SIZE		0x4200
-#define CONFIG_BOOTCOMMAND	"cp.b 0xC0042000 0x22000000 0x210000; bootm"
-#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-				"root=/dev/mtdblock0 "			\
-				"mtdparts=atmel_nand:-(root) "		\
-				"rw rootfstype=jffs2"
-
-#elif CONFIG_SYS_USE_DATAFLASH_CS3
-
-/* bootstrap + u-boot + env + linux in dataflash on CS3 */
-#define CONFIG_ENV_IS_IN_DATAFLASH	1
-#define CONFIG_SYS_MONITOR_BASE	(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + 0x8400)
-#define CONFIG_ENV_OFFSET	0x4200
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET)
-#define CONFIG_ENV_SIZE		0x4200
-#define CONFIG_BOOTCOMMAND	"cp.b 0xD0042000 0x22000000 0x210000; bootm"
-#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-				"root=/dev/mtdblock0 "			\
-				"mtdparts=atmel_nand:-(root) "		\
-				"rw rootfstype=jffs2"
-
-#else /* CONFIG_SYS_USE_NANDFLASH */
-
-/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND	1
-#define CONFIG_ENV_OFFSET		0x60000
-#define CONFIG_ENV_OFFSET_REDUND	0x80000
-#define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
-#define CONFIG_BOOTCOMMAND	"nand read 0x22000000 0xA0000 0x200000; bootm"
-#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
-				"root=/dev/mtdblock5 "			\
-				"mtdparts=atmel_nand:128k(bootstrap)ro,"	\
-				"256k(uboot)ro,128k(env1)ro,"		\
-				"128k(env2)ro,2M(linux),-(root) "	\
-				"rw rootfstype=jffs2"
-
-#endif
-
-#define CONFIG_BAUDRATE		115200
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
-
-#define CONFIG_SYS_PROMPT		"U-Boot> "
-#define CONFIG_SYS_CBSIZE		256
-#define CONFIG_SYS_MAXARGS		16
-#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_LONGHELP		1
-#define CONFIG_CMDLINE_EDITING	1
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN		ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
-
-#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
-
-#ifdef CONFIG_USE_IRQ
-#error CONFIG_USE_IRQ not supported
-#endif
-
-#endif