]> 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, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
committerTom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:22:02 +0000 (14:22 -0500)
1  2 
boards.cfg
include/configs/dra7xx_evm.h
include/configs/km/keymile-common.h
include/configs/km/kmp204x-common.h
include/configs/omap5_uevm.h

diff --combined boards.cfg
index c97c4bdd5d5a24a63c07dc69e6c6abd9262a1001,f6a74880b9fa32623f6f1ae52861d52687310ee9..7a8688a627d89a5b476677098e78d49cd482e90e
@@@ -173,6 -173,7 +173,7 @@@ Active  arm         arm926ejs      kirk
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              km_kirkwood_pci                      km_kirkwood:KM_KIRKWOOD_PCI                                                                                                       Valentin Longchamp <valentin.longchamp@keymile.com>
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmcoge5un                            km_kirkwood:KM_COGE5UN                                                                                                            Valentin Longchamp <valentin.longchamp@keymile.com>
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmnusa                               km_kirkwood:KM_NUSA                                                                                                               Valentin Longchamp <valentin.longchamp@keymile.com>
+ Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmsugp1                              km_kirkwood:KM_SUGP1                                                                                                              Valentin Longchamp <valentin.longchamp@keymile.com>
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              kmsuv31                              km_kirkwood:KM_SUV31                                                                                                              Valentin Longchamp <valentin.longchamp@keymile.com>
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              mgcoge3un                            km_kirkwood:KM_MGCOGE3UN                                                                                                          Valentin Longchamp <valentin.longchamp@keymile.com>
  Active  arm         arm926ejs      kirkwood    keymile         km_arm              portl2                               km_kirkwood:KM_PORTL2                                                                                                             Valentin Longchamp <valentin.longchamp@keymile.com>
@@@ -364,6 -365,7 +365,7 @@@ Active  arm         armv7          zyn
  Active  arm         armv7          zynq        xilinx          zynq                zynq_zc770_xm013                     zynq_zc770:ZC770_XM013                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
  Active  arm         armv7          zynq        xilinx          zynq                zynq_zed                             -                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
  Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
+ Active  arm         armv7:arm720t  tegra124    nvidia          venice2             venice2                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
  Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Alban Bedel <alban.bedel@avionic-design.de>
  Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Alban Bedel <alban.bedel@avionic-design.de>
  Active  arm         armv7:arm720t  tegra20     avionic-design  tec                 tec                                  -                                                                                                                                 Alban Bedel <alban.bedel@avionic-design.de>
@@@ -990,7 -992,6 +992,7 @@@ Active  powerpc     mpc85xx        
  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             kmcoge4                              kmp204x:KMCOGE4                                                                                                                   Valentin Longchamp <valentin.longchamp@keymile.com>
  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>
@@@ -1230,9 -1231,6 +1232,9 @@@ Active  sparc       leon3          
  Active  sparc       leon3          -           gaisler         -                   gr_xc3s_1500                         -                                                                                                                                 -
  Active  sparc       leon3          -           gaisler         -                   grsim                                -                                                                                                                                 -
  Active  x86         x86            coreboot    chromebook-x86  coreboot            coreboot-x86                         coreboot:SYS_TEXT_BASE=0x01110000                                                                                                 -
 +Active  arc         arc700         -           synopsys        -                   axs101                               -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 +Active  arc         arc700         -           synopsys        -                   arcangel4                            -                                                                                                                                 Alexey Brodkin <abrodkin@synopsys.com>
 +Active  arc         arc700         -           synopsys        arcangel4           arcangel4-be                            -                                                                                                                              Alexey Brodkin <abrodkin@synopsys.com>
  Orphan  arm         arm1136        mx31        -               imx31_phycore       imx31_phycore_eet                    imx31_phycore:IMX31_PHYCORE_EET                                                                                                   (resigned) Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  Orphan  arm         arm1136        mx31        freescale       -                   mx31ads                              -                                                                                                                                 (resigned) Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  Orphan  arm         pxa            -           -               -                   lubbock                              -                                                                                                                                 (dead address) Kyle Harris <kharris@nexus-tech.net>
index 3c53f0af10ba222da4680430cc65ba3158139c90,04ae3ca41dfba952fa2b20b72b203f6058a9e8bd..86574c836ab440b8d8065d46b9c3e7bb192f2c83
@@@ -4,7 -4,7 +4,7 @@@
   * Lokesh Vutla         <lokeshvutla@ti.com>
   *
   * Configuration settings for the TI DRA7XX board.
-  * See omap5_common.h for omap5 common settings.
+  * See ti_omap5_common.h for omap5 common settings.
   *
   * SPDX-License-Identifier:   GPL-2.0+
   */
@@@ -34,7 -34,7 +34,7 @@@
  
  #define CONFIG_SYS_OMAP_ABE_SYSCK
  
- #include <configs/omap5_common.h>
+ #include <configs/ti_omap5_common.h>
  
  /* CPSW Ethernet */
  #define CONFIG_CMD_NET                        /* 'bootp' and 'tftp' */
@@@ -73,8 -73,6 +73,8 @@@
  #define CONFIG_SPL_SPI_CS              0
  #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
  
 +#define CONFIG_SUPPORT_EMMC_BOOT
 +
  /* USB xHCI HOST */
  #define CONFIG_CMD_USB
  #define CONFIG_USB_HOST
index a4e0f7cf686909e8ac0c139ec58b67ab0ae32f2a,7361072c98275bfc8c8345f8586eb34265d1c8f4..517f46a3a3301b736c40262ad0390ff9a78894ba
  #define CONFIG_KM_UBI_PARTITION_NAME_BOOT     "ubi0"
  #endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
  
 +#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS
 +#define CONFIG_KM_UBI_PART_BOOT_OPTS          ""
 +#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */
 +
  #ifndef CONFIG_KM_UBI_PARTITION_NAME_APP
  /* one flash chip only called boot */
  /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
  # define CONFIG_KM_UBI_LINUX_MTD                                      \
 -      "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT
 +      "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT                    \
 +      CONFIG_KM_UBI_PART_BOOT_OPTS
  # define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI                             \
        "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0"
  #else /* CONFIG_KM_UBI_PARTITION_NAME_APP */
  /* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */
  /* app:  CONFIG_KM_UBI_PARTITION_NAME_APP */
  # define CONFIG_KM_UBI_LINUX_MTD                                      \
 -      "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT " "                \
 +      "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT                    \
 +      CONFIG_KM_UBI_PART_BOOT_OPTS " "                                \
        "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP
  # define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI                             \
        "ubiattach=if test ${boot_bank} -eq 0; then; "                  \
   * - 'release': for a standalone system               kernel/rootfs from flash
   */
  #define CONFIG_KM_DEF_ENV_BOOTTARGETS                                 \
-       "subbootcmds=ubiattach ubicopy cramfsloadfdt cramfsloadkernel " \
-               "flashargs add_default addpanic boot\0"                 \
+       "subbootcmds=ubiattach ubicopy cramfsloadfdt set_fdthigh "      \
+               "cramfsloadkernel flashargs add_default addpanic boot\0"\
        "develop="                                                      \
                "tftp 200000 scripts/develop-${arch}.txt && "           \
                "env import -t 200000 ${filesize} && "                  \
        CONFIG_KM_DEF_ENV_FLASH_BOOT                                    \
        CONFIG_KM_DEF_ENV_CONSTANTS                                     \
        "altbootcmd=run bootcmd\0"                                      \
+       "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"                   \
        "bootcmd=km_checkbidhwk &&  "                                   \
                "setenv bootcmd \'if km_checktestboot; then; "          \
                                "setenv boot_bank ${test_bank}; else; " \
                        "run ${subbootcmds}; reset\' && "               \
                "saveenv && saveenv && boot\0"                          \
        "bootlimit=3\0"                                                 \
+       "cramfsloadfdt="                                                \
+               "cramfsload ${fdt_addr_r} "                             \
+               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
+       "fdt_addr_r="__stringify(CONFIG_KM_FDT_ADDR) "\0"               \
        "init=/sbin/init-overlay.sh\0"                                  \
        "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0"           \
        "load=tftpboot ${load_addr_r} ${u-boot}\0"                      \
index b9e1bacfa729840d968358597d8b2941cf17c72f,569b574a2b95016e21c3f9edf7e12e47e8ace650..0d24f78d4230f68e8b92288230bb7a1e357b8964
  
  #define CONFIG_KM_DEF_NETDEV  "netdev=eth0\0"
  
 +/* an additionnal option is required for UBI as subpage access is
 + * supported in u-boot */
 +#define CONFIG_KM_UBI_PART_BOOT_OPTS          ",2048"
 +
  #define CONFIG_NAND_ECC_BCH
  
  /* common KM defines */
@@@ -152,6 -148,8 +152,6 @@@ unsigned long get_board_sys_clk(unsigne
  #define CONFIG_KM_KERNEL_ADDR 0x1000000       /* max kernel size 15.5Mbytes */
  #define CONFIG_KM_FDT_ADDR    0x1F80000       /* max dtb    size  0.5Mbytes */
  
 -#define CONFIG_BOOTCOUNT_LIMIT
 -
  /*
   * Local Bus Definitions
   */
  #define CONFIG_SYS_BR1_PRELIM  CONFIG_SYS_QRIO_BR_PRELIM /* QRIO Base Address */
  #define CONFIG_SYS_OR1_PRELIM  CONFIG_SYS_QRIO_OR_PRELIM /* QRIO Options */
  
 +/* bootcounter in QRIO */
 +#define CONFIG_BOOTCOUNT_LIMIT
 +#define CONFIG_SYS_BOOTCOUNT_ADDR     (CONFIG_SYS_QRIO_BASE + 0x20)
 +
  #define CONFIG_BOARD_EARLY_INIT_F
  #define CONFIG_BOARD_EARLY_INIT_R     /* call board_early_init_r function */
 +#define CONFIG_MISC_INIT_F
  #define CONFIG_MISC_INIT_R
  #define CONFIG_LAST_STAGE_INIT
  
  #define CONFIG_FIT_VERBOSE    /* enable fit_format_{error,warning}() */
  
  /* I2C */
 +
  #define CONFIG_SYS_I2C
 +#define CONFIG_SYS_I2C_INIT_BOARD
 +#define CONFIG_SYS_I2C_SPEED          100000 /* deblocking */
  #define CONFIG_SYS_NUM_I2C_BUSES      3
  #define CONFIG_SYS_I2C_MAX_HOPS               1
  #define CONFIG_SYS_I2C_FSL            /* Use FSL I2C driver */
                                        {0, {{I2C_MUX_PCA9547, 0x70, 1 } } }, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 2 } } }, \
                                }
 +#ifndef __ASSEMBLY__
 +void set_sda(int state);
 +void set_scl(int state);
 +int get_sda(void);
 +int get_scl(void);
 +#endif
  
  #define CONFIG_KM_IVM_BUS             1       /* I2C1 (Mux-Port 1)*/
  
  #define CONFIG_SPI_FLASH
  #define CONFIG_SPI_FLASH_BAR  /* 4 byte-addressing */
  #define CONFIG_SPI_FLASH_STMICRO
 +#define CONFIG_SPI_FLASH_SPANSION
  #define CONFIG_CMD_SF
  #define CONFIG_SF_DEFAULT_SPEED         20000000
  #define CONFIG_SF_DEFAULT_MODE          0
        "update="                                                       \
                "sf probe 0;sf erase 0 +${filesize};"                   \
                "sf write ${load_addr_r} 0 ${filesize};\0"              \
+       "set_fdthigh=true\0"                                            \
        ""
  
  #define CONFIG_HW_ENV_SETTINGS                                                \
index 3df502eda02e628d27980c7e5f904cc4b3392102,51dff23623efee87a78f20a9c9bb7390abf7d9f5..783b7c3e32999a11f03bf63152f3c802c29ae17a
@@@ -4,7 -4,7 +4,7 @@@
   * Sricharan R          <r.sricharan@ti.com>
   *
   * Configuration settings for the TI EVM5430 board.
-  * See omap5_common.h for omap5 common settings.
+  * See ti_omap5_common.h for omap5 common settings.
   *
   * SPDX-License-Identifier:   GPL-2.0+
   */
@@@ -17,7 -17,7 +17,7 @@@
        "uuid_disk=${uuid_gpt_disk};" \
        "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
  
- #include <configs/omap5_common.h>
+ #include <configs/ti_omap5_common.h>
  
  #define CONFIG_CONS_INDEX             3
  #define CONFIG_SYS_NS16550_COM3               UART3_BASE
@@@ -37,7 -37,6 +37,7 @@@
  #define CONFIG_PARTITION_UUIDS
  #define CONFIG_CMD_PART
  #define CONFIG_HSMMC2_8BIT
 +#define CONFIG_SUPPORT_EMMC_BOOT
  
  /* Required support for the TCA642X GPIO we have on the uEVM */
  #define CONFIG_TCA642X