]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'iu-boot/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 9 Nov 2013 11:51:47 +0000 (12:51 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 9 Nov 2013 21:59:47 +0000 (22:59 +0100)
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
board/compulab/cm_t35/Makefile
board/corscience/tricorder/Makefile
board/ppcag/bg0900/Makefile
drivers/bootcount/Makefile
include/configs/omap4_common.h
include/configs/pdnb3.h

Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:

board/compulab/common/Makefile
board/udoo/Makefile

include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.

include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.

Note: 'git show' will also list two files just because
they are new:

include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h

40 files changed:
1  2 
arch/arm/cpu/arm926ejs/mxs/Makefile
arch/arm/cpu/armv7/mx6/clock.c
board/compulab/cm_t35/Makefile
board/compulab/cm_t35/cm_t35.c
board/compulab/common/Makefile
board/corscience/tricorder/Makefile
board/ppcag/bg0900/Makefile
board/udoo/Makefile
boards.cfg
doc/README.scrapyard
drivers/bootcount/Makefile
include/configs/afeb9260.h
include/configs/am335x_igep0033.h
include/configs/at91rm9200ek.h
include/configs/at91sam9260ek.h
include/configs/at91sam9261ek.h
include/configs/at91sam9263ek.h
include/configs/at91sam9n12ek.h
include/configs/at91sam9x5ek.h
include/configs/cm_t35.h
include/configs/cpu9260.h
include/configs/cpuat91.h
include/configs/dra7xx_evm.h
include/configs/eb_cpux9k2.h
include/configs/ethernut5.h
include/configs/ipam390.h
include/configs/meesc.h
include/configs/omap3_igep00x0.h
include/configs/otc570.h
include/configs/pm9261.h
include/configs/pm9263.h
include/configs/pm9g45.h
include/configs/sama5d3xek.h
include/configs/sbc35_a9g20.h
include/configs/snapper9260.h
include/configs/stamp9g20.h
include/configs/ti_armv7_common.h
include/configs/top9000.h
include/configs/tricorder.h
include/configs/vl_ma2sc.h

index 13b5a5452263abfc6fa090c4ea74f32d986eeaf8,ea397c7f2a0378cd077d55619c632571cd0cf289..152546eb417a321031559c809b5827827026f9ca
@@@ -5,20 -5,41 +5,20 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
 -include $(TOPDIR)/config.mk
 +extra-$(CONFIG_SPL_BUILD) := start.o
  
 -LIB   = $(obj)lib$(SOC).o
 -
 -COBJS = clock.o mxs.o iomux.o timer.o
 +obj-y = clock.o mxs.o iomux.o timer.o
  
  ifdef CONFIG_SPL_BUILD
 -COBJS += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
 +obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
  endif
  
 -SRCS  := $(START:.o=.S) $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -START := $(addprefix $(obj),$(START))
 -
 -all:  $(obj).depend $(LIB)
 -
 -$(LIB):       $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
  # Specify the target for use in elftosb call
ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
MKIMAGE_TARGET-$(CONFIG_MX23) = mx23
MKIMAGE_TARGET-$(CONFIG_MX28) = mx28
  
- $(OBJTREE)/u-boot.bd: $(SRCTREE)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd
+ $(OBJTREE)/mxsimage.cfg: $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg
        sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@
  
- $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/u-boot.bd
-               elftosb -zf $(ELFTOSB_TARGET-y) -c $(OBJTREE)/u-boot.bd -o $(OBJTREE)/u-boot.sb
+ $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/mxsimage.cfg
+       $(OBJTREE)/tools/mkimage -n $(OBJTREE)/mxsimage.cfg -T mxsimage $@
 -
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
index cf3a38e81393dbb5cbbbc193a25c25a4b6a7ee5a,3bf80e2b016c3b2055de25fad81ce096e0e7e26f..873d9d0fd879b7b3f9f3534220b294c93e46717c
@@@ -48,7 -48,7 +48,7 @@@ void enable_usboh3_clk(unsigned char en
  
  }
  
 -#ifdef CONFIG_I2C_MXC
 +#ifdef CONFIG_SYS_I2C_MXC
  /* i2c_num can be from 0 - 2 */
  int enable_i2c_clk(unsigned char enable, unsigned i2c_num)
  {
@@@ -100,6 -100,32 +100,32 @@@ static u32 decode_pll(enum pll_clocks p
        }
        /* NOTREACHED */
  }
+ static u32 mxc_get_pll_pfd(enum pll_clocks pll, int pfd_num)
+ {
+       u32 div;
+       u64 freq;
+       switch (pll) {
+       case PLL_BUS:
+               if (pfd_num == 3) {
+                       /* No PFD3 on PPL2 */
+                       return 0;
+               }
+               div = __raw_readl(&imx_ccm->analog_pfd_528);
+               freq = (u64)decode_pll(PLL_BUS, MXC_HCLK);
+               break;
+       case PLL_USBOTG:
+               div = __raw_readl(&imx_ccm->analog_pfd_480);
+               freq = (u64)decode_pll(PLL_USBOTG, MXC_HCLK);
+               break;
+       default:
+               /* No PFD on other PLL                                       */
+               return 0;
+       }
+       return (freq * 18) / ((div & ANATOP_PFD_FRAC_MASK(pfd_num)) >>
+                             ANATOP_PFD_FRAC_SHIFT(pfd_num));
+ }
  
  static u32 get_mcu_main_clk(void)
  {
@@@ -144,13 -170,14 +170,14 @@@ u32 get_periph_clk(void
                        freq = decode_pll(PLL_BUS, MXC_HCLK);
                        break;
                case 1:
-                       freq = PLL2_PFD2_FREQ;
+                       freq = mxc_get_pll_pfd(PLL_BUS, 2);
                        break;
                case 2:
-                       freq = PLL2_PFD0_FREQ;
+                       freq = mxc_get_pll_pfd(PLL_BUS, 0);
                        break;
                case 3:
-                       freq = PLL2_PFD2_DIV_FREQ;
+                       /* static / 2 divider */
+                       freq = mxc_get_pll_pfd(PLL_BUS, 2) / 2;
                        break;
                default:
                        break;
@@@ -184,7 -211,7 +211,7 @@@ static u32 get_ipg_per_clk(void
  static u32 get_uart_clk(void)
  {
        u32 reg, uart_podf;
-       u32 freq = PLL3_80M;
+       u32 freq = decode_pll(PLL_USBOTG, MXC_HCLK) / 6; /* static divider */
        reg = __raw_readl(&imx_ccm->cscdr1);
  #ifdef CONFIG_MX6SL
        if (reg & MXC_CCM_CSCDR1_UART_CLK_SEL)
@@@ -204,7 -231,7 +231,7 @@@ static u32 get_cspi_clk(void
        reg &= MXC_CCM_CSCDR2_ECSPI_CLK_PODF_MASK;
        cspi_podf = reg >> MXC_CCM_CSCDR2_ECSPI_CLK_PODF_OFFSET;
  
-       return  PLL3_60M / (cspi_podf + 1);
+       return  decode_pll(PLL_USBOTG, MXC_HCLK) / (8 * (cspi_podf + 1));
  }
  
  static u32 get_axi_clk(void)
  
        if (cbcdr & MXC_CCM_CBCDR_AXI_SEL) {
                if (cbcdr & MXC_CCM_CBCDR_AXI_ALT_SEL)
-                       root_freq = PLL2_PFD2_FREQ;
+                       root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
                else
-                       root_freq = PLL3_PFD1_FREQ;
+                       root_freq = mxc_get_pll_pfd(PLL_USBOTG, 1);
        } else
                root_freq = get_periph_clk();
  
@@@ -244,10 -271,10 +271,10 @@@ static u32 get_emi_slow_clk(void
                root_freq = decode_pll(PLL_USBOTG, MXC_HCLK);
                break;
        case 2:
-               root_freq = PLL2_PFD2_FREQ;
+               root_freq =  mxc_get_pll_pfd(PLL_BUS, 2);
                break;
        case 3:
-               root_freq = PLL2_PFD0_FREQ;
+               root_freq =  mxc_get_pll_pfd(PLL_BUS, 0);
                break;
        }
  
@@@ -270,13 -297,14 +297,14 @@@ static u32 get_mmdc_ch0_clk(void
                freq = decode_pll(PLL_BUS, MXC_HCLK);
                break;
        case 1:
-               freq = PLL2_PFD2_FREQ;
+               freq = mxc_get_pll_pfd(PLL_BUS, 2);
                break;
        case 2:
-               freq = PLL2_PFD0_FREQ;
+               freq = mxc_get_pll_pfd(PLL_BUS, 0);
                break;
        case 3:
-               freq = PLL2_PFD2_DIV_FREQ;
+               /* static / 2 divider */
+               freq =  mxc_get_pll_pfd(PLL_BUS, 2) / 2;
        }
  
        return freq / (podf + 1);
@@@ -359,9 -387,9 +387,9 @@@ static u32 get_usdhc_clk(u32 port
        }
  
        if (clk_sel)
-               root_freq = PLL2_PFD0_FREQ;
+               root_freq = mxc_get_pll_pfd(PLL_BUS, 0);
        else
-               root_freq = PLL2_PFD2_FREQ;
+               root_freq = mxc_get_pll_pfd(PLL_BUS, 2);
  
        return root_freq / (usdhc_podf + 1);
  }
index 66b264a902d96bae7e56f824c03d73cde9a1fd99,213423ec65e0f81ae99234e5995cf1c3ad16c216..6e2e1cbb6ad72436b8b06d00f2dce036407f6187
@@@ -7,7 -7,23 +7,4 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
- obj-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
- obj-$(CONFIG_LCD) += display.o
 -include $(TOPDIR)/config.mk
 -
 -LIB   = $(obj)lib$(BOARD).o
 -
 -COBJS := cm_t35.o leds.o $(COBJS-y)
 -
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
--
 -#########################################################################
 +obj-y += cm_t35.o leds.o
index 19945c105e5ae7d8fc8dda30aa76f84e1429e80b,a6d4aba25033508e521277023e7736eb78bb2095..b9a996594fb0b256a2cb5b9dc1e3fb68c6b937a9
@@@ -33,7 -33,7 +33,7 @@@
  #include <asm/ehci-omap.h>
  #include <asm/gpio.h>
  
- #include "eeprom.h"
+ #include "../common/eeprom.h"
  
  DECLARE_GLOBAL_DATA_PTR;
  
@@@ -160,7 -160,7 +160,7 @@@ static u32 cm_t3x_rev
  u32 get_board_rev(void)
  {
        if (!cm_t3x_rev)
-               cm_t3x_rev = cm_t3x_eeprom_get_board_rev();
+               cm_t3x_rev = cl_eeprom_get_board_rev();
  
        return cm_t3x_rev;
  };
@@@ -509,7 -509,7 +509,7 @@@ static int handle_mac_address(void
        if (rc)
                return 0;
  
-       rc = cm_t3x_eeprom_read_mac_addr(enetaddr);
+       rc = cl_eeprom_read_mac_addr(enetaddr);
        if (rc)
                return rc;
  
@@@ -565,8 -565,7 +565,8 @@@ struct omap_usbhs_board_data usbhs_bdat
  };
  
  #define SB_T35_USB_HUB_RESET_GPIO     167
 -int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 +int ehci_hcd_init(int index, enum usb_init_type init,
 +              struct ehci_hccr **hccr, struct ehci_hcor **hcor)
  {
        u8 val;
        int offset;
        twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, offset, 0xC0);
        udelay(1);
  
 -      return omap_ehci_hcd_init(&usbhs_bdata, hccr, hcor);
 +      return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor);
  }
  
  int ehci_hcd_stop(void)
  {
        return omap_ehci_hcd_stop();
  }
  #endif /* CONFIG_USB_EHCI_OMAP */
index 0000000000000000000000000000000000000000,b399c8f46b076d5ba3079f56010e31ef32121474..831be2e0e74b631cf9ce70aecb0f203eb07fcb29
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,36 +1,10 @@@
 -include $(TOPDIR)/config.mk
 -
 -ifneq ($(OBJTREE),$(SRCTREE))
 -$(shell mkdir -p $(obj)board/$(VENDOR)/common)
 -endif
 -
 -LIB   = $(obj)lib$(VENDOR).o
 -
 -COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
 -COBJS-$(CONFIG_LCD) += omap3_display.o
 -
 -COBJS := $(COBJS-y)
 -SRCS  := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -SOBJS := $(addprefix $(obj),$(SOBJS))
 -
 -all:  $(LIB)
 -
 -$(LIB):       $(obj).depend $(OBJS) $(SOBJS)
 -      $(call cmd_link_o_target, $(OBJS) $(SOBJS))
 -
 -#########################################################################
 -# This is for $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
+ #
+ # (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il>
+ #
+ # Author: Igor Grinberg <grinberg@compulab.co.il>
+ #
+ # SPDX-License-Identifier:    GPL-2.0+
+ #
++obj-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
++obj-$(CONFIG_LCD) += omap3_display.o
index d5316f8d38842e1b9329d0c4b70faae9326407d6,8a7f15c79564dcbe10834ed0758c1e9a2f31cad4..266432dd2de2bb68c0a8d75e23aa886d6b0ea7cf
@@@ -8,4 -8,23 +8,4 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
- obj-y := tricorder.o
 -include $(TOPDIR)/config.mk
 -
 -LIB   = $(obj)lib$(BOARD).o
 -
 -COBJS := tricorder.o tricorder-eeprom.o led.o
 -
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
++obj-y := tricorder.o tricorder-eeprom.o led.o
index 06120f3a846c1366f8fafbd338a07cbec184501e,e17c0a5991b6a30436c68e1e122f04395168725d..74c6db5b1524b39f62003bd46185753a7f381a1a
@@@ -1,8 -1,31 +1,12 @@@
  #
- # (C) Copyright 2006
+ # (C) Copyright 2000-2006
  # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  #
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
- obj-y := flash.o pdnb3.o nand.o
 -include $(TOPDIR)/config.mk
 -
 -LIB   = $(obj)lib$(BOARD).o
 -
+ ifndef        CONFIG_SPL_BUILD
 -COBJS := bg0900.o
++obj-y := bg0900.o
+ else
 -COBJS := spl_boot.o
++obj-y := spl_boot.o
+ endif
 -
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
diff --combined board/udoo/Makefile
index 0000000000000000000000000000000000000000,1f0f6c760fa9737aa38f29560af8b670a32cdde5..80efadaf0da661d0806c87983e9ebd8a53dab14c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,26 +1,7 @@@
 -include $(TOPDIR)/config.mk
 -
 -LIB    = $(obj)lib$(BOARD).o
 -
 -COBJS  := udoo.o
 -
 -SRCS   := $(COBJS:.o=.c)
 -OBJS   := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):        $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
+ #
+ # (C) Copyright 2013 Freescale Semiconductor, Inc.
+ #
+ # SPDX-License-Identifier:    GPL-2.0+
+ #
++obj-y  := udoo.o
diff --combined boards.cfg
index 375f2d4718d315bdf6d3ca2eda6040fa79f8d2f9,97c3b43c27f40fb8f32186a34bf1e9a62880a799..ce5b686066ed631a52237c4335e8c94649940e8a
@@@ -196,7 -196,7 +196,7 @@@ Active  arm         arm926ejs      mb86
  Active  arm         arm926ejs      mx25        freescale       mx25pdk             mx25pdk                              mx25pdk:IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg                                                                           Fabio Estevam <fabio.estevam@freescale.com>
  Active  arm         arm926ejs      mx25        karo            tx25                tx25                                 -                                                                                                                                 John Rigby <jcrigby@gmail.com>
  Active  arm         arm926ejs      mx25        syteco          zmx25               zmx25                                -                                                                                                                                 Matthias Weisser <weisserm@arcor.de>
 -Active  arm         arm926ejs      mx27        armadeus        apf27               apf27                                -                                                                                                                                 Philippe Reynes <tremyfr@yahoo.fr>:Eric Jarrige <eric.jarrige@armadeus.org> 
 +Active  arm         arm926ejs      mx27        armadeus        apf27               apf27                                -                                                                                                                                 Philippe Reynes <tremyfr@yahoo.fr>:Eric Jarrige <eric.jarrige@armadeus.org>
  Active  arm         arm926ejs      mx27        logicpd         imx27lite           imx27lite                            -                                                                                                                                 Wolfgang Denk <wd@denx.de>
  Active  arm         arm926ejs      mx27        logicpd         imx27lite           magnesium                            -                                                                                                                                 Heiko Schocher <hs@denx.de>
  Active  arm         arm926ejs      mxs         bluegiga        apx4devkit          apx4devkit                           apx4devkit                                                                                                                        Lauri Hintsala <lauri.hintsala@bluegiga.com>
@@@ -207,6 -207,7 +207,7 @@@ Active  arm         arm926ejs      mx
  Active  arm         arm926ejs      mxs         freescale       mx28evk             mx28evk_auart_console                mx28evk:MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC                                                                  Fabio Estevam <fabio.estevam@freescale.com>
  Active  arm         arm926ejs      mxs         freescale       mx28evk             mx28evk_nand                         mx28evk:ENV_IS_IN_NAND                                                                                                            Fabio Estevam <fabio.estevam@freescale.com>
  Active  arm         arm926ejs      mxs         olimex          mx23_olinuxino      mx23_olinuxino                       mx23_olinuxino                                                                                                                    Marek Vasut <marek.vasut@gmail.com>
+ Active  arm         arm926ejs      mxs         ppcag           bg0900              bg0900                               bg0900                                                                                                                            Marek Vasut <marex@denx.de>
  Active  arm         arm926ejs      mxs         sandisk         sansa_fuze_plus     sansa_fuze_plus                      -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
  Active  arm         arm926ejs      mxs         schulercontrol  sc_sps_1            sc_sps_1                             -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
  Active  arm         arm926ejs      nomadik     st              nhk8815             nhk8815                              -                                                                                                                                 Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com>:Alessandro Rubini <rubini@unipv.it>
@@@ -246,7 -247,7 +247,7 @@@ Active  arm         arm946es       
  Active  arm         armv7          -           armltd          vexpress            vexpress_ca15_tc2                    -                                                                                                                                 -
  Active  arm         armv7          -           armltd          vexpress            vexpress_ca5x2                       -                                                                                                                                 Matt Waddel <matt.waddel@linaro.org>
  Active  arm         armv7          -           armltd          vexpress            vexpress_ca9x4                       -                                                                                                                                 Matt Waddel <matt.waddel@linaro.org>
- Active  arm         armv7          am33xx      isee            igep0033            igep0033                             -                                                                                                                                 Enric Balletbo i Serra <eballetbo@iseebcn.com>
+ Active  arm         armv7          am33xx      isee            igep0033            am335x_igep0033                      -                                                                                                                                 Enric Balletbo i Serra <eballetbo@iseebcn.com>
  Active  arm         armv7          am33xx      phytec          pcm051              pcm051                               pcm051                                                                                                                            Lars Poeschel <poeschel@lemonage.de>
  Active  arm         armv7          am33xx      siemens         dxr2                dxr2                                 -                                                                                                                                 Roger Meier <r.meier@siemens.com>
  Active  arm         armv7          am33xx      siemens         pxm2                pxm2                                 -                                                                                                                                 Roger Meier <r.meier@siemens.com>
@@@ -287,6 -288,7 +288,7 @@@ Active  arm         armv7          mx
  Active  arm         armv7          mx5         genesi          mx51_efikamx        mx51_efikamx                         mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg                                -
  Active  arm         armv7          mx5         genesi          mx51_efikamx        mx51_efikasb                         mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg                                -
  Active  arm         armv7          mx5         ttcontrol       vision2             vision2                              vision2:IMX_CONFIG=board/ttcontrol/vision2/imximage_hynix.cfg                                                                     Stefano Babic <sbabic@denx.de>
+ Active  arm         armv7          mx6         -               udoo              udoo_quad                            udoo:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024          Fabio Estevam <fabio.estevam@freescale.com>
  Active  arm         armv7          mx6         -               wandboard           wandboard_dl                         wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024                                                  Fabio Estevam <fabio.estevam@freescale.com>
  Active  arm         armv7          mx6         -               wandboard           wandboard_quad                       wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048                                                  Fabio Estevam <fabio.estevam@freescale.com>
  Active  arm         armv7          mx6         -               wandboard           wandboard_solo                       wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512                                                     Fabio Estevam <fabio.estevam@freescale.com>
@@@ -310,12 -312,13 +312,13 @@@ Active  arm         armv7          omap
  Active  arm         armv7          omap3       comelit         dig297              dig297                               -                                                                                                                                 Luca Ceresoli <luca.ceresoli@comelit.it>
  Active  arm         armv7          omap3       compulab        cm_t35              cm_t35                               -                                                                                                                                 Igor Grinberg <grinberg@compulab.co.il>
  Active  arm         armv7          omap3       corscience      tricorder           tricorder                            -                                                                                                                                 Thomas Weber <weber@corscience.de>
+ Active  arm         armv7          omap3       corscience      tricorder           tricorder_flash                      tricorder:FLASHCARD                                                                                                               Thomas Weber <weber@corscience.de>
  Active  arm         armv7          omap3       htkw            mcx                 mcx                                  -                                                                                                                                 Ilya Yanok <yanok@emcraft.com>
- Active  arm         armv7          omap3       isee            igep00x0            igep0020                             igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND                                                                                Enric Balletbo i Serra <eballetbo@iseebcn.com>
- Active  arm         armv7          omap3       isee            igep00x0            igep0020_nand                        igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND                                                                                   -
- Active  arm         armv7          omap3       isee            igep00x0            igep0030                             igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND                                                                                Enric Balletbo i Serra <eballetbo@iseebcn.com>
- Active  arm         armv7          omap3       isee            igep00x0            igep0030_nand                        igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND                                                                                   -
- Active  arm         armv7          omap3       isee            igep00x0            igep0032                             igep00x0:MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND                                                                                Enric Balletbo i Serra <eballetbo@iseebcn.com>
+ Active  arm         armv7          omap3       isee            igep00x0            igep0020                             omap3_igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND                                                                          Enric Balletbo i Serra <eballetbo@iseebcn.com>
+ Active  arm         armv7          omap3       isee            igep00x0            igep0020_nand                        omap3_igep00x0:MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND                                                                             -
+ Active  arm         armv7          omap3       isee            igep00x0            igep0030                             omap3_igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND                                                                          Enric Balletbo i Serra <eballetbo@iseebcn.com>
+ Active  arm         armv7          omap3       isee            igep00x0            igep0030_nand                        omap3_igep00x0:MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND                                                                             -
+ Active  arm         armv7          omap3       isee            igep00x0            igep0032                             omap3_igep00x0:MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND                                                                          Enric Balletbo i Serra <eballetbo@iseebcn.com>
  Active  arm         armv7          omap3       logicpd         am3517evm           am3517_evm                           -                                                                                                                                 Vaibhav Hiremath <hvaibhav@ti.com>
  Active  arm         armv7          omap3       logicpd         omap3som            omap3_logic                          -                                                                                                                                 Peter Barada <peter.barada@logicpd.com>
  Active  arm         armv7          omap3       logicpd         zoom1               omap3_zoom1                          -                                                                                                                                 Nishanth Menon <nm@ti.com>
@@@ -333,7 -336,8 +336,8 @@@ Active  arm         armv7          omap
  Active  arm         armv7          omap3       timll           devkit8000          devkit8000                           -                                                                                                                                 Thomas Weber <weber@corscience.de>
  Active  arm         armv7          omap4       ti              panda               omap4_panda                          -                                                                                                                                 Sricharan R <r.sricharan@ti.com>
  Active  arm         armv7          omap4       ti              sdp4430             omap4_sdp4430                        -                                                                                                                                 Sricharan R <r.sricharan@ti.com>
- Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm                           -                                                                                                                                 Lokesh Vutla <lokeshvutla@ti.com>
+ Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm                           dra7xx_evm:CONS_INDEX=1                                                                                                           Lokesh Vutla <lokeshvutla@ti.com>
+ Active  arm         armv7          omap5       ti              dra7xx              dra7xx_evm_uart3                     dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT                                                                                        Lokesh Vutla <lokeshvutla@ti.com>
  Active  arm         armv7          omap5       ti              omap5_uevm          omap5_uevm                           -                                                                                                                                 -
  Active  arm         armv7          rmobile     atmark-techno   armadillo-800eva    armadillo-800eva                     -                                                                                                                                 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  Active  arm         armv7          rmobile     kmc             kzm9g               kzm9g                                -                                                                                                                                 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:Tetsuyuki Kobayashi <koba@kmckk.co.jp>
@@@ -366,8 -370,6 +370,6 @@@ Active  arm         ixp            
  Active  arm         ixp            -           -               actux1              actux1_4_32                          actux1:FLASH2X2,RAM_32MB                                                                                                          Michael Schwingen <michael@schwingen.org>
  Active  arm         ixp            -           -               actux1              actux1_8_16                          actux1:FLASH1X8                                                                                                                   Michael Schwingen <michael@schwingen.org>
  Active  arm         ixp            -           -               actux1              actux1_8_32                          actux1:FLASH1X8,RAM_32MB                                                                                                          Michael Schwingen <michael@schwingen.org>
- Active  arm         ixp            -           prodrive        pdnb3               pdnb3                                -                                                                                                                                 Stefan Roese <sr@denx.de>
- Active  arm         ixp            -           prodrive        pdnb3               scpu                                 pdnb3:SCPU                                                                                                                        Stefan Roese <sr@denx.de>
  Active  arm         pxa            -           -               -                   balloon3                             -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
  Active  arm         pxa            -           -               -                   h2200                                -                                                                                                                                 Lukasz Dalek <luk0104@gmail.com>
  Active  arm         pxa            -           -               -                   palmld                               -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
@@@ -826,34 -828,20 +828,34 @@@ Active  powerpc     mpc85xx        
  Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS                            MPC8572DS                                                                                                                         -
  Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_36BIT                      MPC8572DS:36BIT                                                                                                                   -
  Active  powerpc     mpc85xx        -           freescale       mpc8572ds           MPC8572DS_NAND                       MPC8572DS:NAND                                                                                                                    -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NAND                  P1010RDB:P1010RDB,36BIT,NAND                                                                                                      -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NAND_SECBOOT          P1010RDB:P1010RDB,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                                  -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NOR                   P1010RDB:P1010RDB,36BIT                                                                                                           -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_NOR_SECBOOT           P1010RDB:P1010RDB,36BIT,SECURE_BOOT                                                                                               -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_SDCARD                P1010RDB:P1010RDB,36BIT,SDCARD                                                                                                    -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_SPIFLASH              P1010RDB:P1010RDB,36BIT,SPIFLASH                                                                                                  -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_36BIT_SPIFLASH_SECBOOT      P1010RDB:P1010RDB,36BIT,SPIFLASH,SECURE_BOOT                                                                                      -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NAND                        P1010RDB:P1010RDB,NAND                                                                                                            -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NAND_SECBOOT                P1010RDB:P1010RDB,NAND_SECBOOT,SECURE_BOOT                                                                                        -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NOR                         P1010RDB:P1010RDB                                                                                                                 -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_NOR_SECBOOT                 P1010RDB:P1010RDB,SECURE_BOOT                                                                                                     -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_SDCARD                      P1010RDB:P1010RDB,SDCARD                                                                                                          -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_SPIFLASH                    P1010RDB:P1010RDB,SPIFLASH                                                                                                        -
 -Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB_SPIFLASH_SECBOOT            P1010RDB:P1010RDB,SPIFLASH,SECURE_BOOT                                                                                            -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND               P1010RDB:P1010RDB_PA,36BIT,NAND                                                                                                   -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NAND_SECBOOT       P1010RDB:P1010RDB_PA,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                               -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NOR                P1010RDB:P1010RDB_PA,36BIT                                                                                                        -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_NOR_SECBOOT        P1010RDB:P1010RDB_PA,36BIT,SECURE_BOOT                                                                                            -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_SDCARD             P1010RDB:P1010RDB_PA,36BIT,SDCARD                                                                                                 -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_SPIFLASH           P1010RDB:P1010RDB_PA,36BIT,SPIFLASH                                                                                               -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_36BIT_SPIFLASH_SECBOOT   P1010RDB:P1010RDB_PA,36BIT,SPIFLASH,SECURE_BOOT                                                                                   -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NAND                     P1010RDB:P1010RDB_PA,NAND                                                                                                         -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NAND_SECBOOT             P1010RDB:P1010RDB_PA,NAND_SECBOOT,SECURE_BOOT                                                                                     -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NOR                      P1010RDB:P1010RDB_PA                                                                                                              -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_NOR_SECBOOT              P1010RDB:P1010RDB_PA,SECURE_BOOT                                                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_SDCARD                   P1010RDB:P1010RDB_PA,SDCARD                                                                                                       -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_SPIFLASH                 P1010RDB:P1010RDB_PA,SPIFLASH                                                                                                     -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PA_SPIFLASH_SECBOOT         P1010RDB:P1010RDB_PA,SPIFLASH,SECURE_BOOT                                                                                         -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NAND               P1010RDB:P1010RDB_PB,36BIT,NAND                                                                                                   -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NAND_SECBOOT       P1010RDB:P1010RDB_PB,36BIT,NAND_SECBOOT,SECURE_BOOT                                                                               -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NOR                P1010RDB:P1010RDB_PB,36BIT                                                                                                        -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_NOR_SECBOOT        P1010RDB:P1010RDB_PB,36BIT,SECURE_BOOT                                                                                            -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_SDCARD             P1010RDB:P1010RDB_PB,36BIT,SDCARD                                                                                                 -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_SPIFLASH           P1010RDB:P1010RDB_PB,36BIT,SPIFLASH                                                                                               -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_36BIT_SPIFLASH_SECBOOT   P1010RDB:P1010RDB_PB,36BIT,SPIFLASH,SECURE_BOOT                                                                                   -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NAND                     P1010RDB:P1010RDB_PB,NAND                                                                                                         -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NAND_SECBOOT             P1010RDB:P1010RDB_PB,NAND_SECBOOT,SECURE_BOOT                                                                                     -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NOR                      P1010RDB:P1010RDB_PB                                                                                                              -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_NOR_SECBOOT              P1010RDB:P1010RDB_PB,SECURE_BOOT                                                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_SDCARD                   P1010RDB:P1010RDB_PB,SDCARD                                                                                                       -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_SPIFLASH                 P1010RDB:P1010RDB_PB,SPIFLASH                                                                                                     -
 +Active  powerpc     mpc85xx        -           freescale       p1010rdb            P1010RDB-PB_SPIFLASH_SECBOOT         P1010RDB:P1010RDB_PB,SPIFLASH,SECURE_BOOT                                                                                         -
  Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS                              -                                                                                                                                 Timur Tabi <timur@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS_36BIT                        P1022DS:36BIT                                                                                                                     Timur Tabi <timur@freescale.com>
  Active  powerpc     mpc85xx        -           freescale       p1022ds             P1022DS_36BIT_NAND                   P1022DS:36BIT,NAND                                                                                                                Timur Tabi <timur@freescale.com>
@@@ -961,12 -949,10 +963,12 @@@ Active  powerpc     mpc85xx        
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SDCARD                      T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000                                                                    -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SPIFLASH                    T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000                                                                  -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4240QDS_SRIO_PCIE_BOOT              T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000                                                                  -
 +Active  powerpc     mpc85xx        -           freescale       t1040qds            T1040QDS                             T1040QDS:PPC_T1040                                                                                                                Naveen Burmi <NaveenBurmi@freescale.com>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_36BIT_SDCARD          controlcenterd:36BIT,SDCARD                                                                                                       Dirk Eibach <eibach@gdsys.de>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_36BIT_SDCARD_DEVELOP  controlcenterd:36BIT,SDCARD,DEVELOP                                                                                               Dirk Eibach <eibach@gdsys.de>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_TRAILBLAZER           controlcenterd:TRAILBLAZER,SPIFLASH                                                                                               Dirk Eibach <eibach@gdsys.de>
  Active  powerpc     mpc85xx        -           gdsys           p1022               controlcenterd_TRAILBLAZER_DEVELOP   controlcenterd:TRAILBLAZER,SPIFLASH,DEVELOP                                                                                       Dirk Eibach <eibach@gdsys.de>
 +Active  powerpc     mpc85xx        -           keymile         kmp204x             kmlion1                              kmp204x:KMLION1                                                                                                                   Valentin Longchamp <valentin.longchamp@keymile.com>
  Active  powerpc     mpc85xx        -           stx             stxgp3              stxgp3                               -                                                                                                                                 Dan Malek <dan@embeddedalley.com>
  Active  powerpc     mpc85xx        -           stx             stxssa              stxssa                               stxssa                                                                                                                            Dan Malek <dan@embeddedalley.com>
  Active  powerpc     mpc85xx        -           stx             stxssa              stxssa_4M                            stxssa:STXSSA_4M                                                                                                                  Dan Malek <dan@embeddedalley.com>
@@@ -1222,4 -1208,3 +1224,4 @@@ Orphan  powerpc     mpc8xx         
  Orphan  powerpc     mpc8xx         -           -               mbx8xx              MBX                                  -                                                                                                                                 -
  Orphan  powerpc     mpc8xx         -           -               mbx8xx              MBX860T                              -                                                                                                                                 -
  Orphan  powerpc     mpc8xx         -           -               nx823               NX823                                -                                                                                                                                 -
 +
diff --combined doc/README.scrapyard
index 7cfb3a3772a3e82638d32676e806fcc6aa12a047,151dbdfeb738ec361390f650287f83ee25f9861f..8ed09c71032fe65d2a85176aa696982653351312
@@@ -11,16 -11,17 +11,18 @@@ easily if here is something they might 
  
  Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
  =================================================================================================
- omap1510inn      arm         arm925t        -           -           Kshitij Gupta <kshitij@ti.com>
+ pdnb3            arm         ixp            -           2013-09-24  Stefan Roese <sr@denx.de>
+ scpu             arm         ixp            -           2013-09-24  Stefan Roese <sr@denx.de>
+ omap1510inn      arm         arm925t        0610a16     2013-09-23  Kshitij Gupta <kshitij@ti.com>
  CANBT            powerpc     405CR          fb8f4fd     2013-08-07  Matthias Fuchs <matthias.fuchs@esd.eu>
  Alaska8220       powerpc     mpc8220        d6ed322     2013-05-11
  Yukon8220        powerpc     mpc8220        d6ed322     2013-05-11
  sorcery          powerpc     mpc8220        d6ed322     2013-05-11
 -smdk6400         arm         arm1176        52587f1   2013-04-12  Zhong Hongbo <bocui107@gmail.com>
 -ns9750dev        arm         arm926ejs      4cfc611   2013-02-28  Markus Pietrek <mpietrek@fsforth.de>
 +smdk6400         arm         arm1176        52587f1     2013-04-12  Zhong Hongbo <bocui107@gmail.com>
 +ns9750dev        arm         arm926ejs      4cfc611     2013-02-28  Markus Pietrek <mpietrek@fsforth.de>
  AMX860           powerpc     mpc860         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
  c2mon            powerpc     mpc855         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
 +EP88x            powerpc     mpc885         1b0757e     2012-10-28
  ETX094           powerpc     mpc850         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
  IAD210           powerpc     mpc860         1b0757e     2012-10-28  -
  LANTEC           powerpc     mpc850         1b0757e     2012-10-28  Wolfgang Denk <wd@denx.de>
@@@ -98,5 -99,5 +100,5 @@@ adsvix           ARM         PXA27
  R5200            ColdFire    -              48ead7a     2008-03-31  Zachary P. Landau <zachary.landau@labxtechnologies.com>
  CPCI440          powerpc     440GP          b568fd2     2007-12-27  Matthias Fuchs <matthias.fuchs@esd-electronics.com>
  PCIPPC2          powerpc     MPC740/MPC750  7c9e89b     2013-02-07  Wolfgang Denk <wd@denx.de>
 -PCIPPC6       powerpc MPC740/MPC750 -   -             Wolfgang Denk <wd@denx.de>
 +PCIPPC6          powerpc     MPC740/MPC750  -           -           Wolfgang Denk <wd@denx.de>
  omap2420h4       arm         omap24xx       -           2013-06-04  Richard Woodruff <r-woodruff2@ti.com>
index 012acef9ddd2daad27f2f76e89d5014b8c7d49a3,352a0a16d9b178b41372503cf550def026a53f78..8256ed0f46b290e1037a1de768e6e16edb4f1a06
@@@ -2,8 -2,29 +2,9 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
 -include $(TOPDIR)/config.mk
 -
 -LIB   := $(obj)libbootcount.o
 -
 -COBJS-y                               += bootcount.o
 -COBJS-$(CONFIG_AT91SAM9XE)    += bootcount_at91.o
 -COBJS-$(CONFIG_BLACKFIN)      += bootcount_blackfin.o
 -COBJS-$(CONFIG_SOC_DA8XX)     += bootcount_davinci.o
 -COBJS-$(CONFIG_AM33XX)                += bootcount_davinci.o
 -COBJS-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o
 -
 -COBJS := $(COBJS-y)
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -########################################################################
 +obj-y                         += bootcount.o
 +obj-$(CONFIG_AT91SAM9XE)      += bootcount_at91.o
 +obj-$(CONFIG_BLACKFIN)                += bootcount_blackfin.o
 +obj-$(CONFIG_SOC_DA8XX)               += bootcount_davinci.o
++obj-$(CONFIG_AM33XX)          += bootcount_davinci.o
 +obj-$(CONFIG_BOOTCOUNT_RAM)   += bootcount_ram.o
index a3e4fd267bd8a9d8783a47c19e4e93660f91d13a,d99d6719ae87af9265d6b017212a3f3b3462208a..5e718980fff4db6273dd82b51eb1e0eb5b7d9b0d
@@@ -17,6 -17,7 +17,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_MAIN_CLOCK            18429952        /* from 18.432 MHz crystal */
  #define CONFIG_SYS_AT91_SLOW_CLOCK            32768
 -#define CONFIG_SYS_HZ                         1000
  
  #define CONFIG_BOARD_EARLY_INIT_F
  #define CONFIG_DISPLAY_CPUINFO
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
index 2c69d4e30c53c5ea2ff112d7f1e121a395722bf2,3e18a657faa6f94b6f20c013f03ea142d183c914..2c69d4e30c53c5ea2ff112d7f1e121a395722bf2
  /* Platform/Board specific defs */
  #define CONFIG_SYS_TIMERBASE          0x48040000      /* Use Timer2 */
  #define CONFIG_SYS_PTV                        2       /* Divisor: 2^(PTV+1) => 8 */
 -#define CONFIG_SYS_HZ                 1000    /* 1ms clock */
  
  /* NS16550 Configuration */
  #define CONFIG_SYS_NS16550
index c03f3854cec1b868efd36654790668727f326a13,27e32e24e3ff3db323bc272f7657cdd8a4c53e73..5d96c31f99cef96a859835986459720a8a1ffb78
@@@ -43,6 -43,7 +43,6 @@@
  #define AT91C_MAIN_CLOCK              ((AT91C_XTAL_CLOCK / 4) * 39)
  #define AT91C_MASTER_CLOCK            (AT91C_MAIN_CLOCK / 3 )
  #define CONFIG_SYS_HZ_CLOCK           (AT91C_MASTER_CLOCK / 2)
 -#define CONFIG_SYS_HZ                 1000
  
  /* CPU configuration */
  #define CONFIG_AT91RM9200
   * USB Config
   */
  #define CONFIG_USB_ATMEL                      1
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW                   1
  #define CONFIG_USB_KEYBOARD                   1
  #define CONFIG_USB_STORAGE                    1
index ce0ca806fa645f4b69c1b20cc7a959e331dfc37f,248d6ee73cdd845efba07d9546ed95b6b6619c76..1c4bb812f07f9f74105cb936c294d7461a2ac8ef
@@@ -28,6 -28,7 +28,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000        /* main clock xtal */
 -#define CONFIG_SYS_HZ                 1000
  
  /* Define actual evaluation board type from used processor type */
  #ifdef CONFIG_AT91SAM9G20
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW           1
  #define CONFIG_SYS_USB_OHCI_CPU_INIT          1
  #define CONFIG_SYS_USB_OHCI_REGS_BASE         0x00500000      /* AT91SAM9260_UHP_BASE */
index fcdf044671c9311bc7f48d3b8de11c8ec7f8b7e0,819ae72bcdb0f53b0fec58119bb3b2144e220bfe..226f8c1612a0c7c43e0166f72113f04268c41b66
@@@ -14,6 -14,7 +14,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000        /* 18.432 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000
  
  #ifdef CONFIG_AT91SAM9G10
  #define CONFIG_AT91SAM9G10EK          /* It's an Atmel AT91SAM9G10 EK*/
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
index 5a39392d6703feefdff28020e0d425f225b0def2,e3faec729de949e35bbd57951f2a6e5641d96b3d..0a1969df98e5cbb30712dfa9d5a16f599cae1f39
@@@ -26,6 -26,7 +26,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    16367660 /* 16.367 MHz crystal */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768
 -#define CONFIG_SYS_HZ                 1000
  
  #define CONFIG_AT91SAM9263EK  1       /* It's an AT91SAM9263EK Board */
  
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW           1
  #define CONFIG_DOS_PARTITION          1
  #define CONFIG_SYS_USB_OHCI_CPU_INIT          1
index 415a997221db355d86d647138fa69bf00e2d1502,4cdaed178bb1afaae7503d745c5e59e6a6dd2fc9..4ec1799ebc155ed45686a7d954ea909419bbbf0a
@@@ -24,6 -24,7 +24,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    16000000        /* main clock xtal */
 -#define CONFIG_SYS_HZ                 1000
  
  /* Misc CPU related */
  #define CONFIG_CMDLINE_TAG            /* enable passing of ATAGs */
@@@ -82,6 -83,7 +82,7 @@@
  #define CONFIG_CMD_SF
  #define CONFIG_CMD_MMC
  #define CONFIG_CMD_FAT
+ #define CONFIG_CMD_USB
  
  #define CONFIG_NR_DRAM_BANKS          1
  #define CONFIG_SYS_SDRAM_BASE         0x20000000
  #define CONFIG_SYS_MEMTEST_START      CONFIG_SYS_SDRAM_BASE
  #define CONFIG_SYS_MEMTEST_END                0x26e00000
  
+ /* USB host */
+ #ifdef CONFIG_CMD_USB
+ #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
+ #define CONFIG_USB_OHCI_NEW
+ #define CONFIG_SYS_USB_OHCI_CPU_INIT
+ #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI
+ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9n12"
+ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS    1
+ #define CONFIG_USB_STORAGE
+ #endif
  #ifdef CONFIG_SYS_USE_SPIFLASH
  
  /* bootstrap + u-boot + env + linux in dataflash on CS0 */
index bb126b02b8f25d4a716f68d5ec1188dc51258f32,cb57be0b5d920572773f9504d7c3e212b2fb0d83..ea9a50e0b1f2ba277b882445e94d686d11faa5a6
@@@ -16,6 -16,7 +16,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768
  #define CONFIG_SYS_AT91_MAIN_CLOCK    12000000        /* 12 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000
  
  #define CONFIG_AT91SAM9X5EK
  #define CONFIG_AT91FAMILY
  #define CONFIG_USB_EHCI_ATMEL
  #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS    2
  #else
+ #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_UPLL
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
  #define CONFIG_SYS_USB_OHCI_REGS_BASE         ATMEL_BASE_OHCI
  #define CONFIG_SYS_USB_OHCI_SLOT_NAME         "at91sam9x5"
  #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS    3
  #endif
- #define CONFIG_USB_ATMEL
  #define CONFIG_USB_STORAGE
  #endif
  
diff --combined include/configs/cm_t35.h
index 38fe06407e53aa21020a078e67ba6b1fe7076013,eff35b9b0dbaaa744e86fd178c36937c3f74068d..516ef7f3015a2d81c18147943dedad5416c3a6c4
@@@ -23,6 -23,7 +23,7 @@@
  #define CONFIG_OMAP   /* in a TI OMAP core */
  #define CONFIG_OMAP34XX       /* which is a 34XX */
  #define CONFIG_OMAP_GPIO
+ #define CONFIG_CMD_GPIO
  #define CONFIG_CM_T3X /* working with CM-T35 and CM-T3730 */
  #define CONFIG_OMAP_COMMON
  
  #define CONFIG_SYS_MAX_NAND_DEVICE    1               /* Max number of NAND */
                                                        /* devices */
  /* Environment information */
- #define CONFIG_BOOTDELAY              10
+ #define CONFIG_BOOTDELAY              3
  #define CONFIG_ZERO_BOOTDELAY_CHECK
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
   */
  #define CONFIG_SYS_TIMERBASE          (OMAP34XX_GPT2)
  #define CONFIG_SYS_PTV                        2       /* Divisor: 2^(PTV+1) => 8 */
 -#define CONFIG_SYS_HZ                 1000
  
  /*-----------------------------------------------------------------------
   * Physical Memory Map
index 021be83437c12f6109e5e61ada2a1c14a3f94b3d,796dfc39a595cc6226dc5c5b3c0976d6b0ed1964..ccf36a5f93847abb1de613fcd77386d88b158972
@@@ -20,6 -20,7 +20,6 @@@
  #define AT91_DBGU     (0xfffff200 - AT91_BASE_SYS)
  
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000
 -#define CONFIG_SYS_HZ         1000
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768
  
  #if defined(CONFIG_CPU9G20)
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
index 3572ac57f80a72c28fad28dadb568db37cc32565,67732de3a89a307889d2cd5d51525dbbdc326a51..49cfabdc6bda7a28d61dc8c59fcd838c669222aa
@@@ -25,6 -25,7 +25,6 @@@
  #define AT91C_MAIN_CLOCK              ((AT91C_XTAL_CLOCK / 4) * 39)
  #define AT91C_MASTER_CLOCK            (AT91C_MAIN_CLOCK / 3)
  #define CONFIG_SYS_HZ_CLOCK           (AT91C_MASTER_CLOCK / 2)
 -#define CONFIG_SYS_HZ                 1000
  
  #define CONFIG_ARM920T
  #define CONFIG_AT91RM9200
  
  #if defined(CONFIG_CMD_USB)
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_USB_STORAGE
  #define CONFIG_DOS_PARTITION
index a9f39f24e2bd45d04a25419afeeb55accee7e06e,7186ce709cbfaa75da3a109dd10b6d6455c308f8..8a69c7d0a6c1b4f10a85e2be205e43ad0e715b9f
  #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
  #define CONFIG_CMD_SAVEENV
  
+ #if (CONFIG_CONS_INDEX == 1)
  #define CONSOLEDEV                    "ttyO0"
- #define CONFIG_CONS_INDEX             1
- #define CONFIG_SYS_NS16550_COM1               UART1_BASE
+ #elif (CONFIG_CONS_INDEX == 3)
+ #define CONSOLEDEV                    "ttyO2"
+ #endif
+ #define CONFIG_SYS_NS16550_COM1               UART1_BASE      /* Base EVM has UART0 */
+ #define CONFIG_SYS_NS16550_COM2               UART2_BASE      /* UART2 */
+ #define CONFIG_SYS_NS16550_COM3               UART3_BASE      /* UART3 */
  #define CONFIG_BAUDRATE                       115200
  
  #define CONFIG_SYS_OMAP_ABE_SYSCK
  #define CONFIG_SPL_SPI_CS              0
  #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
  
 +/* USB xHCI HOST */
 +#define CONFIG_CMD_USB
 +#define CONFIG_USB_HOST
 +#define CONFIG_USB_XHCI
 +#define CONFIG_USB_XHCI_OMAP
 +#define CONFIG_USB_STORAGE
 +#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
 +
 +#define CONFIG_OMAP_USB_PHY
 +#define CONFIG_OMAP_USB2PHY2_HOST
 +
  #endif /* __CONFIG_DRA7XX_EVM_H */
index cafaf88d91faa439ead506a533ee500ee937d24a,5c2c73ad4bc0f700ced27596408a4c2a03e489d3..2d8c42cf57812fb18319123c838c865d41806321
@@@ -36,7 -36,7 +36,7 @@@
  #define CONFIG_SYS_TEXT_BASE          0x00000000
  #else
  #define CONFIG_SKIP_LOWLEVEL_INIT
- #define CONFIG_SYS_TEXT_BASE          0x21f00000
+ #define CONFIG_SYS_TEXT_BASE          0x21800000
  #endif
  #define CONFIG_SYS_LOAD_ADDR          0x21000000  /* default load address */
  #define CONFIG_STANDALONE_LOAD_ADDR   0x21000000
@@@ -60,6 -60,7 +60,6 @@@
  
  #define AT91C_MAIN_CLOCK      179404800       /* from 12.288 MHz * 73 / 5 */
  #define AT91C_MASTER_CLOCK    (AT91C_MAIN_CLOCK / 3)
 -#define CONFIG_SYS_HZ         1000
  #define CONFIG_SYS_HZ_CLOCK   (AT91C_MASTER_CLOCK / 2)
  
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock */
  #define CONFIG_CMD_UBI
  #define CONFIG_CMD_MTDPARTS
  #define CONFIG_CMD_UBIFS
  #define CONFIG_SYS_LONGHELP
  
  /*
   * Hardware drivers
   */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_AT91C_PQFP_UHPBUG
  #define CONFIG_USB_STORAGE
index 5d33c766e7835800698773adbf2d433e8cb7b0de,7fd0b51860fd690a662121ef3656eacea5b677bd..252df54e98cc2e820e4238a226133fd53392435d
@@@ -31,6 -31,7 +31,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768   /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000 /* 18.432 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000
  
  /* 32kB internal SRAM */
  #define CONFIG_SRAM_BASE      0x00300000 /*AT91SAM9XE_SRAM_BASE */
  /* USB */
  #ifdef CONFIG_CMD_USB
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
  #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000
index 3b5a1cd2f65d8ed92be231e48ad9234463e7376a,155663eb2dcfccf18d6803c06ac71a13909931a7..fdd5680741bcd36a5af740fb623bb444f66b6992
@@@ -33,6 -33,7 +33,6 @@@
  #define CONFIG_SYS_OSCIN_FREQ         24000000
  #define CONFIG_SYS_TIMERBASE          DAVINCI_TIMER0_BASE
  #define CONFIG_SYS_HZ_CLOCK           clk_get(DAVINCI_AUXCLK_CLKID)
 -#define CONFIG_SYS_HZ                 1000
  #define CONFIG_SYS_DA850_PLL_INIT
  #define CONFIG_SYS_DA850_DDR_INIT
  #define CONFIG_SYS_TEXT_BASE          0xc1080000
        (3 << DV_DDR_SDCR_IBANK_SHIFT) |        \
        (2 << DV_DDR_SDCR_PAGESIZE_SHIFT))
  
- #define CONFIG_SYS_DA850_CS3CFG       (DAVINCI_ABCR_WSETUP(2) | \
+ #define CONFIG_SYS_DA850_CS3CFG       (DAVINCI_ABCR_WSETUP(1) | \
                                DAVINCI_ABCR_WSTROBE(2) | \
-                               DAVINCI_ABCR_WHOLD(1)   | \
+                               DAVINCI_ABCR_WHOLD(0)   | \
                                DAVINCI_ABCR_RSETUP(1)  | \
-                               DAVINCI_ABCR_RSTROBE(4) | \
-                               DAVINCI_ABCR_RHOLD(0)   | \
-                               DAVINCI_ABCR_TA(1)      | \
+                               DAVINCI_ABCR_RSTROBE(2) | \
+                               DAVINCI_ABCR_RHOLD(1)   | \
+                               DAVINCI_ABCR_TA(0)      | \
                                DAVINCI_ABCR_ASIZE_8BIT)
  
  
  #undef CONFIG_SYS_NAND_HW_ECC
  #define CONFIG_SYS_MAX_NAND_DEVICE    1 /* Max number of NAND devices */
  #define CONFIG_SYS_NAND_HW_ECC_OOBFIRST
+ #define CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
  #define CONFIG_SYS_NAND_5_ADDR_CYCLE
  #define CONFIG_SYS_NAND_PAGE_SIZE     (2 << 10)
  #define CONFIG_SYS_NAND_BLOCK_SIZE    (128 << 10)
                                        CONFIG_SYS_MALLOC_LEN -       \
                                        GENERATED_GBL_DATA_SIZE)
  #define CONFIG_SYS_NAND_ECCPOS                {                               \
-                               24, 25, 26, 27, 28, \
-                               29, 30, 31, 32, 33, 34, 35, 36, 37, 38, \
-                               39, 40, 41, 42, 43, 44, 45, 46, 47, 48, \
-                               49, 50, 51, 52, 53, 54, 55, 56, 57, 58, \
-                               59, 60, 61, 62, 63 }
+                       6,   7,  8,  9, 10,     11, 12, 13, 14, 15,     \
+                       22, 23, 24, 25, 26,     27, 28, 29, 30, 31,     \
+                       38, 39, 40, 41, 42,     43, 44, 45, 46, 47,     \
+                       54, 55, 56, 57, 58,     59, 60, 61, 62, 63}
  #define CONFIG_SYS_NAND_PAGE_COUNT    64
  #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
  #define CONFIG_SYS_NAND_ECCSIZE               512
  #define CONFIG_CMDLINE_TAG
  #define CONFIG_REVISION_TAG
  #define CONFIG_SETUP_MEMORY_TAGS
- #define CONFIG_BOOTARGS               \
-       "mem=128M console=ttyS0,115200n8 root=/dev/mtdblock0p4 rw noinitrd ip=dhcp"
- #define CONFIG_BOOTDELAY      3
+ #define CONFIG_BOOTDELAY      2
  #define CONFIG_EXTRA_ENV_SETTINGS \
+       "defbootargs=setenv bootargs mem=128M console=ttyS0,115200n8 " \
+               "root=/dev/mtdblock5 rw noinitrd " \
+               "rootfstype=jffs2 noinitrd\0" \
        "hwconfig=dsp:wake=yes\0" \
+       "bootcmd=nboot kernel;run defbootargs addmtd;bootm 0xc0700000\0" \
+       "bootfile=uImage\0" \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"      \
+       "mtddevname=uboot-env\0" \
+       "mtddevnum=0\0" \
        "mtdids=" MTDIDS_DEFAULT "\0"                           \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                       \
+       "u-boot=/tftpboot/ipam390/u-boot.ais\0"                 \
+       "upd_uboot=tftp c0000000 ${u-boot};nand erase.part u-boot;" \
+               "nand write c0000000 20000 ${filesize}\0"       \
        "setbootparms=nand read c0100000 200000 400000;"        \
+               "run defbootargs addmtd;"                       \
                "spl export atags c0100000;"                    \
                "nand erase.part bootparms;"                    \
                "nand write c0000100 180000 20000\0"            \
diff --combined include/configs/meesc.h
index f188102edb41715a9ce2be9b0718eea8c91c77d0,46a8e012c8e3bd5534f985f5aadac54efc58f062..91f6e2f8d3b38bd6abcd266a1acc320228dc0bf0
@@@ -40,6 -40,7 +40,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768   /* 32.768 kHz crystal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    16000000/* 16.0 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000    /* decrementer freq */
  
  /* Misc CPU related */
  #define CONFIG_SKIP_LOWLEVEL_INIT
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
  
  #endif
  
 -#define CONFIG_SYS_PROMPT             "=> "
  #define CONFIG_SYS_CBSIZE             512
  #define CONFIG_SYS_MAXARGS            16
  #define CONFIG_SYS_PBSIZE             (CONFIG_SYS_CBSIZE + \
index ac36ac69504b27fa5cedf04c96b2a84ebf4b88b2,e92bb684843e3bdb7da32edb375599e365ac790a..ac36ac69504b27fa5cedf04c96b2a84ebf4b88b2
   */
  #define CONFIG_SYS_TIMERBASE          (OMAP34XX_GPT2)
  #define CONFIG_SYS_PTV                        2       /* Divisor: 2^(PTV+1) => 8 */
 -#define CONFIG_SYS_HZ                 1000
  
  /*
   * Physical Memory Map
diff --combined include/configs/otc570.h
index ae4054bd8aeb256f68927527c284c4afb663812c,d5eba587e443c9314a938c1b6d878d1fc88e9880..3f4e0734ab6ae056dcb1efb20165ad07dab895d7
@@@ -39,6 -39,7 +39,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768   /* 32.768 kHz crystal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    16000000/* 16.0 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000    /* decrementer freq */
  
  /* Misc CPU related */
  #define CONFIG_SKIP_LOWLEVEL_INIT
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
  
  #endif
  
 -#define CONFIG_SYS_PROMPT             "=> "
  #define CONFIG_SYS_CBSIZE             512
  #define CONFIG_SYS_MAXARGS            16
  #define CONFIG_SYS_PBSIZE             (CONFIG_SYS_CBSIZE + \
diff --combined include/configs/pm9261.h
index 37c43f4d33e75566b0aecf3ed49c4b1c14c78573,792f4cd41849406e3f0312db90c09d6356243638..fc95cf0bfa0542093dcc8be18ae63f1927e4ab75
@@@ -28,6 -28,8 +28,6 @@@
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000
  
 -#define CONFIG_SYS_HZ         1000
 -
  #define CONFIG_SYS_AT91_CPU_NAME      "AT91SAM9261"
  #define CONFIG_PM9261         1       /* on a Ronetix PM9261 Board    */
  #define CONFIG_ARCH_CPU_INIT
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW                   1
  #define CONFIG_DOS_PARTITION                  1
  #define CONFIG_SYS_USB_OHCI_CPU_INIT          1
diff --combined include/configs/pm9263.h
index eccc027fe25eb62c8ba6273b0d88927a0a0f5ee1,ff379a54b0f655726ea429e404b1b69c32436646..533e249a7cc30a94efc80f705f237b7435ca1569
@@@ -28,6 -28,8 +28,6 @@@
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  
 -#define CONFIG_SYS_HZ         1000
 -
  #define CONFIG_SYS_AT91_CPU_NAME      "AT91SAM9263"
  #define CONFIG_PM9263         1       /* on a Ronetix PM9263 Board    */
  #define CONFIG_ARCH_CPU_INIT
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW                   1
  #define CONFIG_DOS_PARTITION                  1
  #define CONFIG_SYS_USB_OHCI_CPU_INIT          1
diff --combined include/configs/pm9g45.h
index 51fe0be935593a0d024222501f21118443ac3ec2,f15ae6dd7fe814b62608d118f6ffa7f013e37621..e0c388e70c687910a6f30fa96e1d8d0aad499ecd
@@@ -31,6 -31,7 +31,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    12000000 /* from 12 MHz crystal */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
 -#define CONFIG_SYS_HZ                 1000
  #define CONFIG_SYS_TEXT_BASE          0x73f00000
  
  #define CONFIG_ARCH_CPU_INIT
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_UPLL
  #define CONFIG_USB_OHCI_NEW           1
  #define CONFIG_DOS_PARTITION          1
  #define CONFIG_SYS_USB_OHCI_CPU_INIT  1
index c38cf222891e3e1372078e2cda05e89765f2ef4f,924d7fabac34c39497e7b04cc62ddb5ac91c9894..5a6f0fc70806568cdcf77dbe9a4536c57bc8782c
@@@ -20,6 -20,7 +20,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
  #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000
  
  #define CONFIG_AT91FAMILY
  #define CONFIG_ARCH_CPU_INIT
  
  #ifdef CONFIG_CMD_USB
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_UPLL
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
  #define CONFIG_SYS_USB_OHCI_REGS_BASE         ATMEL_BASE_OHCI
index 1b07da4291d57922a703179d50aa895f01536db1,3cf693bdc9ed2b49b6807e0a16742fcc4bcf86c8..cbcd4e16b2cf869808ebffd9d63fb271ef997503
@@@ -26,6 -26,7 +26,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    12000000        /* 12.000 MHz crystal */
 -#define CONFIG_SYS_HZ                 1000
  
  #define CONFIG_ARCH_CPU_INIT
  
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
index 988b68058b0857e7874ee3e5684cba6f7578d49d,c5de89e1f806e2b0d3d610116d4ec599594e7b53..5436bae15e306f53ebc38e4654d09f53230dbc94
@@@ -20,6 -20,7 +20,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000 /* External Crystal, in Hz */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768
 -#define CONFIG_SYS_HZ                 1000
  
  /* CPU */
  #define CONFIG_ARCH_CPU_INIT
@@@ -64,6 -65,7 +64,7 @@@
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
index 7d6f62b326aa7a71ca0de8df32226ba66f23905a,95fc26ba9b220eacde6bc4adb94cd21d65d5914d..248e657e4cf3e709b66c13b8bbc0489f2f052b9a
@@@ -35,6 -35,7 +35,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000        /* 18.432MHz crystal */
 -#define CONFIG_SYS_HZ                 1000            /* 1ms resolution */
  
  /* misc settings */
  #define CONFIG_CMDLINE_TAG            /* pass commandline to Kernel */
  
  /* USB configuration */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_USB_STORAGE
  #define CONFIG_DOS_PARTITION
index de83f7afc4105917190f69d02e526c57eb634481,13ed8751358f583540e1212434375ee743c25899..84269ad262c09d32bbc6e8f7e8a5a7017d8628d7
@@@ -56,6 -56,7 +56,6 @@@
  
  /* Timer information. */
  #define CONFIG_SYS_PTV                        2       /* Divisor: 2^(PTV+1) => 8 */
 -#define CONFIG_SYS_HZ                 1000    /* 1ms clock */
  
  /* I2C IP block */
  #define CONFIG_I2C
  #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME      "u-boot.img"
  
  #ifdef CONFIG_SPL_OS_BOOT
- #define CONFIG_SYS_SPL_ARGS_ADDR              (CONFIG_SYS_SDRAM_BASE + 0x100)
+ #define CONFIG_SYS_SPL_ARGS_ADDR              0x80F80000
  
  /* FAT */
  #define CONFIG_SPL_FAT_LOAD_KERNEL_NAME               "uImage"
index 578ba5670873fabbb77a197b2380b4a2772a078a,159a8bca1081aa347aa0ee462f38a9be010d42d1..a96a9cb41679804b820fe0c34d243c597f007c01
@@@ -51,6 -51,7 +51,6 @@@
  /* ARM asynchronous clock */
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock xtal */
  #define CONFIG_SYS_AT91_MAIN_CLOCK    18432000        /* main clock xtal */
 -#define CONFIG_SYS_HZ                 1000
  
  /* Misc CPU related */
  #define CONFIG_ARCH_CPU_INIT
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
index d0cfd8e8847e63609f31e18af063b4e1bce32a0c,ac9a1dd2b7960a61e93826c1e343ef0d3b69ba11..d57394e55016e7b5f3ec80628e049dc73bc0b49c
@@@ -39,6 -39,9 +39,9 @@@
  #define CONFIG_DISPLAY_CPUINFO
  #define CONFIG_DISPLAY_BOARDINFO
  
+ #define CONFIG_SILENT_CONSOLE
+ #define CONFIG_ZERO_BOOTDELAY_CHECK
  /* Clock Defines */
  #define V_OSCK                                26000000 /* Clock output from T2 */
  #define V_SCLK                                (V_OSCK >> 1)
  #define CONFIG_OF_LIBFDT
  
  /* Size of malloc() pool */
- #define CONFIG_ENV_SIZE                       (128 << 10)     /* 128 KiB */
-                                               /* Sector */
  #define CONFIG_SYS_MALLOC_LEN         (1024*1024)
  
  /* Hardware drivers */
  
+ /* GPIO support */
+ #define CONFIG_OMAP_GPIO
+ /* LED support */
+ #define CONFIG_STATUS_LED
+ #define CONFIG_BOARD_SPECIFIC_LED
+ #define CONFIG_CMD_LED                        /* LED command */
+ #define STATUS_LED_BIT                        (1 << 0)
+ #define STATUS_LED_STATE              STATUS_LED_ON
+ #define STATUS_LED_PERIOD             (CONFIG_SYS_HZ / 2)
+ #define STATUS_LED_BIT1                       (1 << 1)
+ #define STATUS_LED_STATE1             STATUS_LED_ON
+ #define STATUS_LED_PERIOD1            (CONFIG_SYS_HZ / 2)
+ #define STATUS_LED_BIT2                       (1 << 2)
+ #define STATUS_LED_STATE2             STATUS_LED_ON
+ #define STATUS_LED_PERIOD2            (CONFIG_SYS_HZ / 2)
  /* NS16550 Configuration */
  #define CONFIG_SYS_NS16550
  #define CONFIG_SYS_NS16550_SERIAL
  #define CONFIG_SYS_I2C_SPEED          100000
  #define CONFIG_SYS_I2C_SLAVE          1
  #define CONFIG_DRIVER_OMAP34XX_I2C    1
+ #define CONFIG_I2C_MULTI_BUS
+ /* EEPROM */
+ #define CONFIG_SYS_I2C_MULTI_EEPROMS
+ #define CONFIG_CMD_EEPROM
+ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN        2
+ #define CONFIG_SYS_EEPROM_BUS_NUM     1
  
  /* TWL4030 */
  #define CONFIG_TWL4030_POWER
  /* Board NAND Info */
  #define CONFIG_SYS_NO_FLASH           /* no NOR flash */
  #define CONFIG_MTD_DEVICE             /* needed for mtdparts commands */
- #define MTDIDS_DEFAULT                        "nand0=nand"
- #define MTDPARTS_DEFAULT              "mtdparts=nand:" \
-                                               "512k(u-boot-spl)," \
-                                               "1920k(u-boot)," \
-                                               "128k(u-boot-env)," \
-                                               "4m(kernel)," \
-                                               "-(fs)"
+ #define MTDIDS_DEFAULT                        "nand0=omap2-nand.0"
+ #define MTDPARTS_DEFAULT              "mtdparts=omap2-nand.0:" \
+                                               "128k(SPL)," \
+                                               "1m(u-boot)," \
+                                               "384k(u-boot-env1)," \
+                                               "1152k(mtdoops)," \
+                                               "384k(u-boot-env2)," \
+                                               "5m(kernel)," \
+                                               "2m(fdt)," \
+                                               "-(ubi)"
  
  #define CONFIG_NAND_OMAP_GPMC
  #define CONFIG_SYS_NAND_ADDR          NAND_BASE       /* physical address */
  #define CONFIG_MTD_DEVICE       /* needed for mtdparts commands */
  #define CONFIG_MTD_PARTITIONS
  
- /* Environment information */
- #define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */
+ /* Environment information (this is the common part) */
  
- #define CONFIG_BOOTDELAY              3
+ #define CONFIG_BOOTDELAY              0
  
- #define CONFIG_EXTRA_ENV_SETTINGS \
-       "loadaddr=0x82000000\0" \
+ /* hang() the board on panic() */
+ #define CONFIG_PANIC_HANG
+ /* environment placement (for NAND), is different for FLASHCARD but does not
+  * harm there */
+ #define CONFIG_ENV_OFFSET             0x120000    /* env start */
+ #define CONFIG_ENV_OFFSET_REDUND      0x2A0000    /* redundant env start */
+ #define CONFIG_ENV_SIZE                       (16 << 10)  /* use 16KiB for env */
+ #define CONFIG_ENV_RANGE              (384 << 10) /* allow badblocks in env */
+ /* the loadaddr is the same as CONFIG_SYS_LOAD_ADDR, unfortunately the defiend
+  * value can not be used here! */
+ #define CONFIG_LOADADDR               0x82000000
+ #define CONFIG_COMMON_ENV_SETTINGS \
        "console=ttyO2,115200n8\0" \
        "mmcdev=0\0" \
-       "vram=12M\0" \
-       "lcdmode=800x600\0" \
+       "vram=3M\0" \
        "defaultdisplay=lcd\0" \
-       "kernelopts=rw rootwait\0" \
+       "kernelopts=mtdoops.mtddev=3\0" \
+       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdids=" MTDIDS_DEFAULT "\0" \
        "commonargs=" \
                "setenv bootargs console=${console} " \
+               "${mtdparts} " \
+               "${kernelopts} " \
+               "vt.global_cursor_default=0 " \
                "vram=${vram} " \
-               "omapfb.mode=lcd:${lcdmode} " \
-               "omapdss.def_disp=${defaultdisplay}\0" \
+               "omapdss.def_disp=${defaultdisplay}\0"
+ #define CONFIG_BOOTCOMMAND "run autoboot"
+ /* specific environment settings for different use cases
+  * FLASHCARD: used to run a rdimage from sdcard to program the device
+  * 'NORMAL': used to boot kernel from sdcard, nand, ...
+  *
+  * The main aim for the FLASHCARD skin is to have an embedded environment
+  * which will not be influenced by any data already on the device.
+  */
+ #ifdef CONFIG_FLASHCARD
+ #define CONFIG_ENV_IS_NOWHERE
+ /* the rdaddr is 16 MiB before the loadaddr */
+ #define CONFIG_ENV_RDADDR     "rdaddr=0x81000000\0"
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+       CONFIG_COMMON_ENV_SETTINGS \
+       CONFIG_ENV_RDADDR \
+       "autoboot=" \
+       "run commonargs; " \
+       "setenv bootargs ${bootargs} " \
+               "flashy_updateimg=/dev/mmcblk0p1:corscience_update.img " \
+               "rdinit=/sbin/init; " \
+       "mmc dev ${mmcdev}; mmc rescan; " \
+       "fatload mmc ${mmcdev} ${loadaddr} uImage; " \
+       "fatload mmc ${mmcdev} ${rdaddr} uRamdisk; " \
+       "bootm ${loadaddr} ${rdaddr}\0"
+ #else /* CONFIG_FLASHCARD */
+ #define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */
+ #define CONFIG_ENV_IS_IN_NAND
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+       CONFIG_COMMON_ENV_SETTINGS \
        "mmcargs=" \
                "run commonargs; " \
                "setenv bootargs ${bootargs} " \
                "root=/dev/mmcblk0p2 " \
-               "${kernelopts}\0" \
+               "rootwait " \
+               "rw\0" \
        "nandargs=" \
                "run commonargs; " \
                "setenv bootargs ${bootargs} " \
-               "omapfb.mode=lcd:${lcdmode} " \
-               "omapdss.def_disp=${defaultdisplay} " \
                "root=ubi0:root " \
-               "ubi.mtd=4 " \
+               "ubi.mtd=7 " \
                "rootfstype=ubifs " \
-               "${kernelopts}\0" \
+               "ro\0" \
        "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "source ${loadaddr}\0" \
        "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
-       "eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \
-       "loaduimage_ubi=mtd default; " \
-               "ubi part fs; " \
+       "loaduimage_ubi=ubi part ubi; " \
                "ubifsmount ubi:root; " \
                "ubifsload ${loadaddr} /boot/uImage\0" \
+       "loaduimage_nand=nand read ${loadaddr} kernel 0x500000\0" \
        "nandboot=echo Booting from nand ...; " \
                "run nandargs; " \
-               "run loaduimage_ubi; " \
+               "run loaduimage_nand; " \
                "bootm ${loadaddr}\0" \
        "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
                        "if run loadbootscript; then " \
                        "fi; " \
                "else run nandboot; fi\0"
  
- #define CONFIG_BOOTCOMMAND "run autoboot"
+ #endif /* CONFIG_FLASHCARD */
  
  /* Miscellaneous configurable options */
  #define CONFIG_SYS_LONGHELP           /* undef to save memory */
  #define CONFIG_SYS_HUSH_PARSER                /* use "hush" command parser */
+ #define CONFIG_CMDLINE_EDITING                /* enable cmdline history */
  #define CONFIG_AUTO_COMPLETE
  #define CONFIG_SYS_PROMPT             "OMAP3 Tricorder # "
  #define CONFIG_SYS_CBSIZE             512     /* Console I/O Buffer Size */
  /* Boot Argument Buffer Size */
  #define CONFIG_SYS_BARGSIZE           (CONFIG_SYS_CBSIZE)
  
- #define CONFIG_SYS_MEMTEST_START      (OMAP34XX_SDRC_CS0 + 0x07000000)
+ #define CONFIG_SYS_MEMTEST_START      (OMAP34XX_SDRC_CS0 + 0x00000000)
  #define CONFIG_SYS_MEMTEST_END                (CONFIG_SYS_MEMTEST_START + \
-                                       0x01000000) /* 16MB */
+                                       0x07000000) /* 112 MB */
  
  #define CONFIG_SYS_LOAD_ADDR          (OMAP34XX_SDRC_CS0 + 0x02000000)
  
   */
  #define CONFIG_SYS_TIMERBASE          (OMAP34XX_GPT2)
  #define CONFIG_SYS_PTV                        2 /* Divisor: 2^(PTV+1) => 8 */
 -#define CONFIG_SYS_HZ                 1000
  
  /*  Physical Memory Map  */
  #define CONFIG_NR_DRAM_BANKS          2 /* CS1 may or may not be populated */
  
  #define CONFIG_SYS_MONITOR_LEN                (256 << 10)     /* Reserve 2 sectors */
  
- #define CONFIG_ENV_IS_IN_NAND         1
- #define CONFIG_ENV_OFFSET             0x260000 /* environment starts here */
  #define CONFIG_SYS_SDRAM_BASE         PHYS_SDRAM_1
  #define CONFIG_SYS_INIT_RAM_ADDR      0x4020f800
  #define CONFIG_SYS_INIT_RAM_SIZE      0x800
  #define CONFIG_SPL_NAND_SIMPLE
  
  #define CONFIG_SPL_BOARD_INIT
+ #define CONFIG_SPL_GPIO_SUPPORT
  #define CONFIG_SPL_LIBCOMMON_SUPPORT
  #define CONFIG_SPL_LIBDISK_SUPPORT
  #define CONFIG_SPL_I2C_SUPPORT
  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
  
  #define CONFIG_SPL_TEXT_BASE          0x40200000 /*CONFIG_SYS_SRAM_START*/
- #define CONFIG_SPL_MAX_SIZE           (55 * 1024)     /* 7 KB for stack */
+ #define CONFIG_SPL_MAX_SIZE           (57 * 1024)     /* 7 KB for stack */
  #define CONFIG_SPL_STACK              LOW_LEVEL_SRAM_STACK
  
  #define CONFIG_SPL_BSS_START_ADDR     0x80000000 /*CONFIG_SYS_SDRAM_BASE*/
  
  #define CONFIG_SYS_NAND_U_BOOT_START  CONFIG_SYS_TEXT_BASE
  
- #define CONFIG_SYS_NAND_U_BOOT_OFFS   0x80000
- #define CONFIG_SYS_NAND_U_BOOT_SIZE   0x200000
+ #define CONFIG_SYS_NAND_U_BOOT_OFFS   0x20000
+ #define CONFIG_SYS_NAND_U_BOOT_SIZE   0x100000
  
  #define CONFIG_SYS_SPL_MALLOC_START   0x80208000
  #define CONFIG_SYS_SPL_MALLOC_SIZE    0x100000        /* 1 MB */
  
+ #define CONFIG_SYS_ALT_MEMTEST
+ #define CONFIG_SYS_MEMTEST_SCRATCH    0x81000000
  #endif /* __CONFIG_H */
index 4c73134645368ec0b2d363371de3520c1a957e88,f5d856493cb05d5ef836646fd08bcf18c1b5cf44..14890800413e9263f2faad1f34f76f84e141ffea
  
  /* USB */
  #define CONFIG_USB_ATMEL
+ #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
  #define CONFIG_USB_OHCI_NEW
  #define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_USB_OHCI_CPU_INIT
  
  /* clocks */
  
 -#define CONFIG_SYS_HZ                 1000
  #define CONFIG_SYS_AT91_SLOW_CLOCK    32768           /* slow clock */
  
  #define MHZ180