]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Mon, 10 Mar 2014 18:22:54 +0000 (14:22 -0400)
committerTom Rini <trini@ti.com>
Mon, 10 Mar 2014 18:22:54 +0000 (14:22 -0400)
1  2 
board/atmel/at91sam9263ek/at91sam9263ek.c
boards.cfg
include/configs/am335x_evm.h
include/configs/am335x_igep0033.h
include/configs/omap3_igep00x0.h
include/configs/tegra-common.h

index 7784cd7f0ac4e9d8a7c3db5a0f5e88e90f676d7e,4b1455465a5e2cf55f118337bd6246b11a57f678..db29879801a389b20e232b32e78502af5a01a896
@@@ -7,7 -7,7 +7,7 @@@
   */
  
  #include <common.h>
 -#include <asm/sizes.h>
 +#include <linux/sizes.h>
  #include <asm/arch/at91sam9263.h>
  #include <asm/arch/at91sam9_smc.h>
  #include <asm/arch/at91_common.h>
@@@ -24,6 -24,7 +24,7 @@@
  #include <net.h>
  #endif
  #include <netdev.h>
+ #include <atmel_mci.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
@@@ -214,6 -215,15 +215,15 @@@ void lcd_show_board_info(void
  #endif /* CONFIG_LCD_INFO */
  #endif
  
+ #ifdef CONFIG_GENERIC_ATMEL_MCI
+ int board_mmc_init(bd_t *bd)
+ {
+       at91_mci_hw_init();
+       return atmel_mci_init((void *)ATMEL_BASE_MCI1);
+ }
+ #endif
  int board_early_init_f(void)
  {
        struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
diff --combined boards.cfg
index f36c3b49a68c6ba3fe5c6664ef84afdb1459dc70,e8d7e0f1339ed97377806101242e40a11e5aaa7b..a32f46bc4e45ca1d4e86a0e622ec9e7be65920f8
@@@ -44,9 -44,9 +44,9 @@@
  ###########################################################################################################
  
  Active  aarch64     armv8          -           armltd          vexpress64          vexpress_aemv8a                      vexpress_aemv8a:ARM64                                                                                                             David Feng <fenghua@phytium.com.cn>
 -Active  arc         arc700         -           synopsys        -                   arcangel4                            -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 +Active  arc         arc700         -           synopsys        <none>              arcangel4                            -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
  Active  arc         arc700         -           synopsys        -                   axs101                               -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 -Active  arc         arc700         -           synopsys        arcangel4           arcangel4-be                         -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 +Active  arc         arc700         -           synopsys        <none>              arcangel4-be                         -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
  Active  arm         arm1136        -           armltd          integrator          integratorcp_cm1136                  integratorcp:CM1136                                                                                                               Linus Walleij <linus.walleij@linaro.org>
  Active  arm         arm1136        mx31        -               -                   imx31_phycore                        -                                                                                                                                 -
  Active  arm         arm1136        mx31        davedenx        -                   qong                                 -                                                                                                                                 Wolfgang Denk <wd@denx.de>
@@@ -278,6 -278,8 +278,8 @@@ Active  arm         armv7          am33
  Active  arm         armv7          am33xx      ti              am43xx              am43xx_evm                           am43xx_evm:SERIAL1,CONS_INDEX=1                                                                                                   Lokesh Vutla <lokeshvutla@ti.com>
  Active  arm         armv7          am33xx      ti              ti814x              ti814x_evm                           -                                                                                                                                 Matt Porter <matt.porter@linaro.org>
  Active  arm         armv7          am33xx      ti              ti816x              ti816x_evm                           -                                                                                                                                 -
+ Active  arm         armv7          at91        atmel           sama5d3_xplained    sama5d3_xplained_mmc                 sama5d3_xplained:SAMA5D3,SYS_USE_MMC                                                                                              Bo Shen <voice.shen@atmel.com>
+ Active  arm         armv7          at91        atmel           sama5d3_xplained    sama5d3_xplained_nandflash           sama5d3_xplained:SAMA5D3,SYS_USE_NANDFLASH                                                                                        Bo Shen <voice.shen@atmel.com>
  Active  arm         armv7          at91        atmel           sama5d3xek          sama5d3xek_mmc                       sama5d3xek:SAMA5D3,SYS_USE_MMC                                                                                                    Bo Shen <voice.shen@atmel.com>
  Active  arm         armv7          at91        atmel           sama5d3xek          sama5d3xek_nandflash                 sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH                                                                                              Bo Shen <voice.shen@atmel.com>
  Active  arm         armv7          at91        atmel           sama5d3xek          sama5d3xek_spiflash                  sama5d3xek:SAMA5D3,SYS_USE_SERIALFLASH                                                                                            Bo Shen <voice.shen@atmel.com>
@@@ -453,6 -455,7 +455,6 @@@ Active  m68k        mcf5227x       
  Active  m68k        mcf5227x       -           freescale       m52277evb           M52277EVB_stmicro                    M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000                                                                        TsiChung Liew <Tsi-Chung.Liew@freescale.com>
  Active  m68k        mcf523x        -           freescale       m5235evb            M5235EVB                             M5235EVB:SYS_TEXT_BASE=0xFFE00000                                                                                                 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
  Active  m68k        mcf523x        -           freescale       m5235evb            M5235EVB_Flash32                     M5235EVB:NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000                                                                                TsiChung Liew <Tsi-Chung.Liew@freescale.com>
 -Active  m68k        mcf52x2        -           -               -                   idmr                                 -                                                                                                                                 -
  Active  m68k        mcf52x2        -           -               cobra5272           cobra5272                            -                                                                                                                                 -
  Active  m68k        mcf52x2        -           BuS             eb_cpu5282          eb_cpu5282                           eb_cpu5282:SYS_TEXT_BASE=0xFF000000,SYS_MONITOR_BASE=0xFF000400                                                                   Jens Scharsig <esw@bus-elektronik.de>
  Active  m68k        mcf52x2        -           BuS             eb_cpu5282          eb_cpu5282_internal                  eb_cpu5282:SYS_TEXT_BASE=0xF0000000,SYS_MONITOR_BASE=0xF0000418                                                                   Jens Scharsig <esw@bus-elektronik.de>
@@@ -461,6 -464,7 +463,6 @@@ Active  m68k        mcf52x2        
  Active  m68k        mcf52x2        -           freescale       m5249evb            M5249EVB                             -                                                                                                                                 -
  Active  m68k        mcf52x2        -           freescale       m5253demo           M5253DEMO                            -                                                                                                                                 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
  Active  m68k        mcf52x2        -           freescale       m5253evbe           M5253EVBE                            -                                                                                                                                 Hayden Fraser <Hayden.Fraser@freescale.com>
 -Active  m68k        mcf52x2        -           freescale       m5271evb            M5271EVB                             -                                                                                                                                 -
  Active  m68k        mcf52x2        -           freescale       m5272c3             M5272C3                              -                                                                                                                                 -
  Active  m68k        mcf52x2        -           freescale       m5275evb            M5275EVB                             -                                                                                                                                 -
  Active  m68k        mcf52x2        -           freescale       m5282evb            M5282EVB                             -                                                                                                                                 -
@@@ -500,8 -504,8 +502,8 @@@ Active  m68k        mcf547x_8x     
  Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <monstr@monstr.eu>
  Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <vlad.lungu@windriver.com>
  Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
 -Active  mips        mips32         -           imgtec          malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       Paul Burton <paul.burton@imgtec.com>
 -Active  mips        mips32         -           imgtec          malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    Paul Burton <paul.burton@imgtec.com>
 +Active  mips        mips32         -           imgtec          malta               malta                                malta:SYS_BIG_ENDIAN                                                                                                              Paul Burton <paul.burton@imgtec.com>
 +Active  mips        mips32         -           imgtec          malta               maltael                              malta:SYS_LITTLE_ENDIAN                                                                                                           Paul Burton <paul.burton@imgtec.com>
  Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
  Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand                 vct:VCT_PLATINUM,VCT_ONENAND                                                                                                      -
  Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand_small           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE                                                                                      -
@@@ -981,11 -985,6 +983,11 @@@ Active  powerpc     mpc85xx        
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SPIFLASH     T208xQDS:PPC_T2081,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_NAND         T208xQDS:PPC_T2081,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000
  Active  powerpc     mpc85xx        -           freescale       t208xqds            T2081QDS_SRIO_PCIE_BOOT      T208xQDS:PPC_T2081,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB              T208xRDB:PPC_T2080
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SDCARD       T208xRDB:PPC_T2080,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SPIFLASH     T208xRDB:PPC_T2080,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_NAND         T208xRDB:PPC_T2080,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000
 +Active  powerpc     mpc85xx        -           freescale       t208xrdb            T2080RDB_SRIO_PCIE_BOOT  T208xRDB:PPC_T2080,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS                             T4240QDS:PPC_T4160                                                                                                                -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_SDCARD                      T4240QDS:PPC_T4160,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF40000                                                                    -
  Active  powerpc     mpc85xx        -           freescale       t4qds               T4160QDS_SPIFLASH                    T4240QDS:PPC_T4160,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000                                                                  -
@@@ -1124,14 -1123,22 +1126,14 @@@ Active  powerpc     ppc4xx         
  Active  powerpc     ppc4xx         -           amcc            -                   taihu                                -                                                                                                                                 John Otken <jotken@softadvances.com>
  Active  powerpc     ppc4xx         -           amcc            -                   taishan                              -                                                                                                                                 Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            -                   yucca                                -                                                                                                                                 -
 -Active  powerpc     ppc4xx         -           amcc            acadia              acadia_nand                          acadia:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                                       Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            bamboo              bamboo_nand                          bamboo:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                                       Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            canyonlands         arches                               canyonlands:ARCHES                                                                                                                Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            canyonlands         canyonlands                          canyonlands:CANYONLANDS                                                                                                           Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            canyonlands         canyonlands_nand                     canyonlands:CANYONLANDS,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                      Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            canyonlands         glacier                              canyonlands:GLACIER                                                                                                               Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            canyonlands         glacier_nand                         canyonlands:GLACIER,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                          Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            kilauea             haleakala                            kilauea:HALEAKALA                                                                                                                 Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            kilauea             haleakala_nand                       kilauea:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                                      Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            kilauea             kilauea                              kilauea:KILAUEA                                                                                                                   Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            kilauea             kilauea_nand                         kilauea:NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                                      Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            sequoia             rainier                              sequoia:RAINIER                                                                                                                   Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            sequoia             rainier_nand                         sequoia:RAINIER,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                              Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            sequoia             rainier_ramboot                      sequoia:RAINIER,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds                               Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            sequoia             sequoia                              sequoia:SEQUOIA                                                                                                                   Stefan Roese <sr@denx.de>
 -Active  powerpc     ppc4xx         -           amcc            sequoia             sequoia_nand                         sequoia:SEQUOIA,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000                                                                              Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            sequoia             sequoia_ramboot                      sequoia:SEQUOIA,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/sequoia/u-boot-ram.lds                               Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            walnut              sycamore                             walnut                                                                                                                            Stefan Roese <sr@denx.de>
  Active  powerpc     ppc4xx         -           amcc            walnut              walnut                               -                                                                                                                                 Stefan Roese <sr@denx.de>
index a5736b7f0ab9e7928e67d9697338f7e2588983c0,23c056c82cb6ed006b8434e0fd559a80cfc367d6..2020e7f8143745220364a76ae20ab141d9e5556f
  /* Network. */
  #define CONFIG_PHY_GIGE
  #define CONFIG_PHYLIB
- #define CONFIG_PHY_ADDR                       0
  #define CONFIG_PHY_SMSC
  
  /* NAND support */
  #ifdef CONFIG_NAND
  #define CONFIG_CMD_NAND
 -#define GPMC_NAND_ECC_LP_x16_LAYOUT   1
  #if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT)
  #define MTDIDS_DEFAULT                        "nand0=omap2-nand.0"
  #define MTDPARTS_DEFAULT              "mtdparts=omap2-nand.0:128k(SPL)," \
index c00d54f7b275b9b9952b865ee5885ee491e01029,e72ee05ec8c85fc0f41cf559f2319f6c78d3b03f..c17327fef481a36023876bd40290130282b92f36
  #define CONFIG_NET_RETRY_COUNT         10
  #define CONFIG_NET_MULTI
  #define CONFIG_PHYLIB
- #define CONFIG_PHY_ADDR                       0
  #define CONFIG_PHY_SMSC
  
  /* NAND support */
  #define CONFIG_NAND
  #define CONFIG_NAND_OMAP_GPMC
  #define CONFIG_NAND_OMAP_ELM
 -#define GPMC_NAND_ECC_LP_x16_LAYOUT   1
  #define CONFIG_SYS_NAND_BASE          (0x08000000)    /* phys address CS0 */
  #define CONFIG_SYS_MAX_NAND_DEVICE    1
  #define CONFIG_SYS_NAND_ONFI_DETECTION        1
index 12d8141e2272a4192e8f85fc89393d32ef3a13aa,8cc23c1fb2a1fe651ede382cd9a3cd47462906eb..d56d5b00cc759fb5a38347b34a6c16a9f92319aa
  #define CONFIG_SHOW_BOOT_PROGRESS
  #endif
  
+ /* GPIO banks */
+ #define CONFIG_OMAP3_GPIO_3           /* GPIO64 .. 95 is in GPIO bank 3 */
+ #define CONFIG_OMAP3_GPIO_5           /* GPIO128..159 is in GPIO bank 5 */
+ #define CONFIG_OMAP3_GPIO_6           /* GPIO160..191 is in GPIO bank 6 */
  /* USB */
  #define CONFIG_MUSB_UDC                       1
  #define CONFIG_USB_OMAP3              1
  
  #ifdef CONFIG_NAND
  #define PISMO1_NAND_SIZE              GPMC_SIZE_128M /* Configure the PISMO */
 -#define GPMC_NAND_ECC_LP_x16_LAYOUT   1
  #define CONFIG_ENV_OFFSET             0x260000 /* environment starts here */
  #define CONFIG_ENV_IS_IN_NAND         1
  #define CONFIG_ENV_SIZE                       (512 << 10) /* Total Size Environment */
index 9247aefdb37b840a13e162d1451f238b89e006c3,bbe417a13ec704aab621b7a02d446c3f9625bf37..ae786cfd7a0f17e97f6bb9851fd069c0abd2853c
@@@ -7,7 -7,7 +7,7 @@@
  
  #ifndef _TEGRA_COMMON_H_
  #define _TEGRA_COMMON_H_
 -#include <asm/sizes.h>
 +#include <linux/sizes.h>
  #include <linux/stringify.h>
  
  /*
@@@ -29,7 -29,6 +29,6 @@@
  #define CONFIG_DISPLAY_BOARDINFO
  
  #define CONFIG_CMDLINE_TAG            /* enable passing of ATAGs */
- #define CONFIG_OF_LIBFDT              /* enable passing of devicetree */
  
  /* Environment */
  #define CONFIG_ENV_VARS_UBOOT_CONFIG
  #undef CONFIG_CMD_NET         /* network support */
  
  /* turn on command-line edit/hist/auto */
- #define CONFIG_CMDLINE_EDITING
  #define CONFIG_COMMAND_HISTORY
- #define CONFIG_AUTO_COMPLETE
  
  /* turn on commonly used storage-related commands */
- #define CONFIG_DOS_PARTITION
- #define CONFIG_EFI_PARTITION
  #define CONFIG_PARTITION_UUIDS
- #define CONFIG_FS_EXT4
- #define CONFIG_FS_FAT
- #define CONFIG_CMD_EXT2
- #define CONFIG_CMD_FAT
- #define CONFIG_CMD_FS_GENERIC
  #define CONFIG_CMD_PART
  
  #define CONFIG_SYS_NO_FLASH
  
  #define CONFIG_CONSOLE_MUX
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
- #define CONFIG_BOOTDELAY      2               /* -1 to disable auto boot */
  
  /*
   * Miscellaneous configurable options
   */
- #define CONFIG_SYS_LONGHELP           /* undef to save memory */
- #define CONFIG_SYS_HUSH_PARSER                /* use "hush" command parser */
  #define CONFIG_SYS_PROMPT             V_PROMPT
  /*
   * Increasing the size of the IO buffer as default nfsargs size is more
  #define CONFIG_TEGRA_GPIO
  #define CONFIG_CMD_GPIO
  #define CONFIG_CMD_ENTERRCM
- #define CONFIG_CMD_BOOTZ
- #define CONFIG_SUPPORT_RAW_INITRD
  
  /* Defines for SPL */
  #define CONFIG_SPL
  #define CONFIG_SPL_SERIAL_SUPPORT
  #define CONFIG_SPL_GPIO_SUPPORT
  
 +#ifdef CONFIG_SPL_BUILD
 +# define CONFIG_USE_PRIVATE_LIBGCC
 +#endif
 +
  #define CONFIG_SYS_GENERIC_BOARD
  
  /* Misc utility code */
  #define CONFIG_BOUNCE_BUFFER
  #define CONFIG_CRC32_VERIFY
  
+ #ifndef CONFIG_SPL_BUILD
+ #include <config_distro_defaults.h>
+ #endif
  #endif /* _TEGRA_COMMON_H_ */