summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* bd_info: remove bi_barudrate member from struct bd_infoMasahiro Yamada2014-05-12-61/+23
| | | | | | | | | | | | | | | | | gd->bd->bi_baudrate is a copy of gd->baudrate. Since baudrate is a common feature for all architectures, keep gd->baudrate only. It is true that bi_baudrate was passed to the kernel in that structure but it was a long time ago. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Tom Rini <trini@ti.com> Cc: Simon Glass <sjg@chromium.org> Cc: Wolfgang Denk <wd@denx.de> Cc: Heiko Schocher <hs@denx.de> Acked-by: Michal Simek <monstr@monstr.eu> (For microblaze)
* Prepare v2014.07-rc1Tom Rini2014-05-12-2/+2
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* Merge branch 'tom' of git://git.denx.de/u-boot-x86Tom Rini2014-05-09-120/+379
|\
| * sandbox: ignore sandbox.dtbMasahiro Yamada2014-05-09-0/+1
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
| * sandbox: move source files from board/ to arch/sandbox/Masahiro Yamada2014-05-09-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 33a02da0, all boards must have board/${BOARD}/ or board/${VENDOR}/${BOARD}/ directory. Now this rule is obsolete. It looks weird that sandbox defines "vendor" and "board" just for meeting the old U-Boot directory structure. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org>
| * patman: Avoid duplicate sign-offsSimon Glass2014-05-09-2/+23
| | | | | | | | | | | | | | Keep track of all Signed-off-by tags in a commit and silently suppress any duplicates. Signed-off-by: Simon Glass <sjg@chromium.org>
| * patman: Deal with 'git apply' failures correctlySimon Glass2014-05-09-2/+4
| | | | | | | | | | | | | | This sort of failure is rare, but the code to deal with it is wrong. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * sandbox: Update and expand the READMESimon Glass2014-05-09-7/+226
| | | | | | | | | | | | | | Now that sandbox has a good base of features, the README is quite out of date. Update it, and document the new features. Signed-off-by: Simon Glass <sjg@chromium.org>
| * sandbox: Provide a build option to avoid using SDLSimon Glass2014-05-09-2/+20
| | | | | | | | | | | | | | | | | | | | | | Some machines do not have SDL libraries installed, and it is still useful to build sandbox without LCD/keyboard support. Add an option for this, used as follows: make sandbox_config all NO_SDL=1 Signed-off-by: Simon Glass <sjg@chromium.org>
| * Make 'run' use run_command_list() instead of run_command()Simon Glass2014-05-09-1/+1
| | | | | | | | | | | | | | | | In the case where an environment variable spans multiple lines, we should use run_command_list() so that all lines are executed. This shold be backwards compatible with existing behaviour for existing scripts. Signed-off-by: Simon Glass <sjg@chromium.org>
| * sandbox: Support 'env import' and 'env export'Simon Glass2014-05-09-13/+18
| | | | | | | | | | | | | | | | | | Adjust the code for these commands so that they work on sandbox. Signed-off-by: Simon Glass <sjg@chromium.org> (Adjusted to fix minor merge comflict, when applied) Change-Id: I987dee6194cd5c83f82604caf894fc85e4eb71a8
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2014-05-09-7128/+10253
|\ \ | |/ |/|
| * Merge branch 'u-boot/master'Albert ARIBAUD2014-05-09-38607/+9772
| |\ | | | | | | | | | | | | | | | | | | Conflicts: drivers/net/Makefile (trivial merge)
| * | ARM: highbank: use default promptRob Herring2014-05-02-1/+0
| | | | | | | | | | | | | | | | | | | | | Since highbank is actually shared between Highbank and Midway platforms, remove the Highbank name from the prompt and use the default. Signed-off-by: Rob Herring <robh@kernel.org>
| * | ARM: highbank: use config_distro_defaults.hRob Herring2014-05-02-23/+2
| | | | | | | | | | | | | | | | | | | | | Adapt highbank to use config_distro_defaults.h and remove the redundant defines. Signed-off-by: Rob Herring <robh@kernel.org>
| * | Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'Albert ARIBAUD2014-04-21-996/+5866
| |\ \
| | * | am43xx_evm: Drop SPI SPLTom Rini2014-04-17-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QSPI booting on this board does not use SPL, so drop SPI-SPL related options. Signed-off-by: Tom Rini <trini@ti.com>
| | * | arm, da850: staticize funtionsManish Badarkhe2014-04-17-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make funtions static which are locally used in file and remove the declaration from header file. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com>
| | * | am335x: Switch to CONFIG_SKIP_LOWLEVEL_INIT from guarding SPL or NOR_BOOTTom Rini2014-04-17-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of SPL or NOR_BOOT (no SPL involved) we need to include certain code in the build. Use !CONFIG_SKIP_LOWLEVEL_INIT rather than CONFIG_SPL_BUILD || CONFIG_NOR_BOOT to make the code clearer, and to make supporting XIP QSPI boot clearer in the code. Signed-off-by: Tom Rini <trini@ti.com> Reviewed-by: Wolfgang Denk <wd@denx.de>
| | * | omap3: zoom1: switch to generic ti_omap3_common config headerNishanth Menon2014-04-17-109/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ti_omap3_common contains a lot of common header definitions that help reduce the size of the zoom1 config file. So, use the generic header and customize as needed for the platform (example: no spl). Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | omap3: zoom1: fix default consoleNishanth Menon2014-04-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not use ttyS2 anymore in Linux, it changed to ttyO2 a few years back. never too late to update. Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | omap3: zoom1: enable bootzNishanth Menon2014-04-17-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Boot from zImage and fdt_file if uImage is not available to maintain the legacy behavior. Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | omap3: zoom1: disable JFFS2 and enable FS_GENERICNishanth Menon2014-04-17-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more in line with commits 664979a2a9f764b63b8094458b87247d254b0cc1(omap3_beagle: remove JFFS2 support.) and 102ce9ea7afdda80fe25aa786975e1722196bdb9 (omap3_beagle: enable CMD_FS_GENERIC and simplify load of image/ramdisk) CMD_FS_GENERIC allows us to simplify where we load up our image from either from ext2/fat etc. So, lets use that instead of cumbersome options we'd have to use. Sticking with existing conventions, defaults will be: bootfile=uImage bootpart=0:1 (first partition) bootdir=/ (/ in first partition) Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | omap3: zoom1: enable common network commandsNishanth Menon2014-04-17-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Basic networking commands for usability. Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | OMAP3: zoom1: enable LAN9211Nishanth Menon2014-04-17-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Zoom1 was wrongly setup for LAN91C96. Fix it by enabling LAN9211. Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | OMAP3: zoom1: Configure GPMC for EthernetNishanth Menon2014-04-17-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | zoom1 uses LAN9211 configured over GPMC Chip Select 1. Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | omap3: zoom1: enable CONFIG_SYS_GENERIC_BOARDNishanth Menon2014-04-17-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SYS_GENERIC_BOARD should now be enabled for generic functionality Further information in doc/README.generic-board Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | keystone2: net: add keystone ethernet driverKaricheri, Muralidharan2014-04-17-0/+1057
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ethernet driver configures the CPSW, SGMI and Phy and uses the the Navigator APIs. The driver supports 4 Ethernet ports and can work with only one port at a time. Port configurations are defined in board.c. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
| | * | keystone2: add keystone multicore navigator driverVitaly Andrianov2014-04-17-0/+570
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multicore navigator consists of Network Coprocessor (NetCP) and Queue Manager sub system. More details on the hardware can be obtained from the following links:- Network Coprocessor: http://www.ti.com/lit/pdf/sprugz6 Multicore Navigator: http://www.ti.com/lit/pdf/sprugr9 Multicore navigator driver implements APIs to configure the Queue Manager and NetCP Pkt DMA. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * | k2hk-evm: add configuration for spi1 and spi2 supportKaricheri, Muralidharan2014-04-17-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently only spi0 is enabled on k2hk evm. This configuration update is needed to enable spi1 and spi2. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * | spi: davinci: add support for multiple bus and chip selectKaricheri, Muralidharan2014-04-17-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently davinci spi driver supports only bus 0 cs 0. This patch allows driver to support bus 1 and bus 2 with configurable number of chip selects. Also defaults are selected in a way to avoid regression on other platforms that uses davinci spi driver and has only one spi bus. Signed-off-by: Rex Chang <rchang@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
| | * | k2hk: add support for k2hk SOC and EVMVitaly Andrianov2014-04-17-0/+2778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | k2hk EVM is based on Texas Instruments Keystone2 Hawking/Kepler SoC. Keystone2 SoC has ARM v7 Cortex-A15 MPCore processor. Please refer the ti/k2hk_evm/README for details on the board, build and other information. This patch add support for keystone architecture and k2hk evm. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Sandeep Nair <sandeep_n@ti.com>
| | * | i2c, davinci: convert driver to new mutlibus/mutliadapter frameworkVitaly Andrianov2014-04-17-235/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add davinci driver to new multibus/multiadpater support - adapted all config files, which uses this driver Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Heiko Schocher <hs@denx.de>
| | * | i2c, davinci: move i2c_defs.h to the drivers/i2c directoryKaricheri, Muralidharan2014-04-17-68/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the davinci i2c_defs.h file to drivers.i2c directory. It will allow to reuse the davinci_i2c driver for TI Keystone2 SOCs. Not used "git mv" command to move the file because small part of it with definitions specific for Davinci SOCs has to remain in the arch/arm/include/asm/arch-davinci. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * | NAND: DaVinci: allow forced disable of subpage writesKaricheri, Muralidharan2014-04-17-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a configurable mechanism to disable subpage writes in the DaVinci NAND driver. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * | arm: add support for arch timerVitaly Andrianov2014-04-17-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add basic support for the architecture timer found on recent ARMv7 based SoCs. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
| | * | tools: mkimage: add support for gpimage formatKaricheri, Muralidharan2014-04-17-93/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add support for gpimage format as a preparatory patch for porting u-boot for keystone2 devices and is based on omapimage format. It re-uses gph header to store the size and loadaddr as done in omapimage.c Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * | fdt: call ft_board_setup_ex() at the end of image_setup_libfdt()Vitaly Andrianov2014-04-17-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keystone2 SOC requires to fix all 32 bit aliased addresses to their 36 physical format. This has to happen after all fdt nodes are added or modified. Signed-off-by: Vitaly Andrianov <vitalya@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tom Rini <trini@ti.com>
| | * | TI:omap3: Convert omap3_beagle to ti_omap3_common.hTom Rini2014-04-17-170/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert to using the common config files. This requires a little more flexibility in the common files than we had been using before. Signed-off-by: Tom Rini <trini@ti.com>
| | * | TI:armv7: Switch to CONFIG_SYS_BOARD_GENERICTom Rini2014-04-17-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on AM335x GP EVM, AM335x EVM SK, Beaglebone White, Beaglebone Black, AM437xx GP EVM, OMAP5 uEVM, OMAP4 Pandaboard Signed-off-by: Tom Rini <trini@ti.com>
| | * | dra7xx_evm: Add QSPI_4 support, qspiboot build targetTom Rini2014-04-17-1/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously only supported QSPI_1 (single) support. Add QSPI_4 (quad) read support as well. This means we can be given one of two boot device values, but don't care which it is, so perform a fixup on the QSPI_4 value. We add a qspiboot build target to better show how you would use QSPI as a boot device in deployment. When we boot from QSPI, we can check the environment for 'boot_os' to control Falcon Mode. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
| | * | SPL:SPI: Add Falcon Mode supportTom Rini2014-04-17-6/+40
| | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| | * | am335x_evm: Drop SPI SPL support from the default buildTom Rini2014-04-17-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only useful with the _spiboot build target anyhow, so only include it then. Drop CONFIG_SPL_OS_BOOT support then as the flash is small and didn't include a spot for the device tree already. Signed-off-by: Tom Rini <trini@ti.com>
| | * | spi: ti_qspi: Add delay for successful bulk erase.Poddar, Sourav2014-04-17-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk erase is not happening properly on dra7 due to erase timing constraints, add a delay so that erase timing constraints are properly met. Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> Tested-by: Yebio Mesfin <ymesfin@ti.com>
| | * | TI:armv7: Change Falcon Mode DT load addressTom Rini2014-04-17-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general, we want to load the DT at base+128MB, so that we ahve sufficient room for the kernel and a larger device tree. In the case of OMAP3, use 64MB instead as we have a number of boards with 128MB DDR. Signed-off-by: Tom Rini <trini@ti.com>
| | * | TI:omap5: Move CONFIG_ENV_SIZE to board config filesTom Rini2014-04-17-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of the environment depends on the backing store, move this to the board config files. Signed-off-by: Tom Rini <trini@ti.com>
| | * | am43xx_evm: Update the ramdisk args, we pass things in just fine via DTTom Rini2014-04-17-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| | * | am335x_evm: Update the ramdisk args, we pass things in just fine via DTTom Rini2014-04-17-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| | * | TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment stringTom Rini2014-04-17-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To deal with a reoccurring problem properly we need to specify addresses for the Linux kernel, Flatted Device Tree and ramdisk that obey the constraints within the kernel's Documentation/arm/Booting file but also make sure that we relocate things within a valid address range. It is possible with these addresses to also set fdt_high and initrd_high to the value of 0xffffffff. We don't do this by default to allow for the most likely success of people using custom addresses however. Signed-off-by: Tom Rini <trini@ti.com>
| | * | spl_mmc/CONFIG_SPL_OS_BOOT: Allow environment to determine what to bootTom Rini2014-04-17-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add two new environment variables, falcon_args_file and falcon_image_file, which when set will override the compiled in default values for falcon mode. Signed-off-by: Tom Rini <trini@ti.com>
generated by cgit v1.1 at 2024-11-09 09:36:52 +0000