summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-ubiTom Rini2012-09-12-2/+2
|\
| * ubifs: Fix ubifsload when using ZLIBVeli-Pekka Peltola2012-09-10-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ZLIB compression with UBIFS fails if last data node is not a size of UBIFS_BLOCK_SIZE (4096 bytes). Easiest way to test this is trying to read a file smaller than 4k: => ubifsload 41000000 /etc/fstab Loading file '/etc/fstab' to addr 0x41000000 with size 704 (0x000002c0)... UBIFS error (pid 0): read_block: bad data node (block 0, inode 2506) UBIFS error (pid 0): do_readpage: cannot read page 0 of inode 2506, error -22 Error reading file '/etc/fstab' /etc/fstab not found! exit not allowed from main input shell. => With this patch: => ubifsload 41000000 /etc/fstab Loading file '/etc/fstab' to addr 0x41000000 with size 704 (0x000002c0)... Done => Signed-off-by: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Cc: kmpark@infradead.org Tested-by: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-mmcTom Rini2012-09-12-49/+129
|\ \
| * | mmc: Remove incorrect cmd->flags usageAndy Fleming2012-09-06-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a couple of drivers that were actually using the flags field of the cmd structure, despite the fact that no one ever *set* that field. When we removed the field, those drivers failed to compile. Replaced the references with the correct usage of resp_type. Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: s5p_sdhci: add the set_mmc_clk for cmu controlJaehoon Chung2012-09-05-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Samsung SoC use the cmu control to set clock. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: s5p_sdhci: fixed wrong function argumentJaehoon Chung2012-09-05-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useless code is removed, and get buswidth value. buswidth value will be used to choice the 4bit or 8bit. (Now used 4bit mode in sdhci.c by default) Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungin.park@samsung.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: s5p_sdhci: set the SDHCI_QUIRK_BROKEN_R1BJaehoon Chung2012-09-05-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Samsung SoC is broken busy waiting for R1b type. And clk delay control value is modified the previosuly value. (that value used at the s5p_mmc.c) Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: Add a SDHCI quirk for boards that have no CDJoe Hershberger2012-09-05-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | Some boards have no Card Detect wired. In that case, set the CD test bits in the standard interface. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: Fix version check for clock API in sdhci driverJoe Hershberger2012-09-05-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting up the clocks in the sdhci driver, the "spec version" must be masked off. Otherwise any time the vendor version is not 0, the check will allways assume the interface is version 3. This breaks when the interface is actually version 1 or 2. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmcinfo: Fix help messageBenoît Thébaudeau2012-09-05-2/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Andy Fleming <afleming@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc_get_dev: Return error if mmc_init failsBenoît Thébaudeau2012-09-05-2/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Andy Fleming <afleming@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | tegra: put eMMC environment into the boot sectorsStephen Warren2012-09-05-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I set up Tegra's config files to put the environment into eMMC, I assumed that CONFIG_ENV_OFFSET was a linearized address relative to the start of the eMMC device, and spanning HW partitions boot0, boot1, general* and the user area in order. However, it turns out that the offset is actually relative to the beginning of the user area. Hence, the environment block ended up in a different location to expected and documented. Set CONFIG_SYS_MMC_ENV_PART=2 (boot1) to solve this, and adjust CONFIG_ENV_OFFSET to be relative to the start of boot1, not the entire eMMC. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | env_mmc: allow environment to be in an eMMC partitionStephen Warren2012-09-05-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eMMC devices may have hardware-level partitions: 2 boot partitions, up to 4 general partitions, plus the user area. This change introduces optional config variable CONFIG_SYS_MMC_ENV_PART to indicate which partition the environment should be stored in: 0=user, 1=boot0, 2=boot1, 4..7=general0..3. This allows the environment to be kept out of the user area, which simplifies the management of OS-/user-level (MBR/GPT) partitions within the user area. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: detect boot sectors using EXT_CSD_BOOT_MULT tooStephen Warren2012-09-05-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some eMMC devices contain boot partitions, but do not set the PART_SUPPORT bit in EXT_CSD_PARTITIONING_SUPPORT. Allow partition selection on such devices, by enabling partition switching when EXT_CSD_BOOT_MULT is set. Note that the Linux kernel enables access to boot partitions solely based on the value of EXT_CSD_BOOT_MULT; EXT_CSD_PARTITIONING_SUPPORT only influences access to "general" partitions. eMMC devices affected by this issue exist on various NVIDIA Tegra platforms (and presumably many others too), such as Harmony (plug-in eMMC), Seaboard, Springbank, and Whistler (plug-in eMMC). Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | MMC: u-boot-spl may be compiled without partition supportMikhail Kshevetskiy2012-09-05-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: fix capacity calculation when EXT_CSD_SEC_CNT is usedYoshihiro Shimoda2012-09-05-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the type of "ext_csd" was array of char, the following calculation might fail when the value of ext_csd[EXT_CSD_SEC_CNT] was minus. capacity = ext_csd[EXT_CSD_SEC_CNT] << 0 | ext_csd[EXT_CSD_SEC_CNT + 1] << 8 | ext_csd[EXT_CSD_SEC_CNT + 2] << 16 | ext_csd[EXT_CSD_SEC_CNT + 3] << 24; So, this patch changes the type of "ext_csd" to array of u8. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: sh_mmcif: enable MMC_MODE_HCYoshihiro Shimoda2012-09-05-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The controller can control high capacity cards. So, the patch adds the flag. If the flag is not set, "mmcinfo" will fail when a high capacity card is used. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
| * | mmc: fix wrong timeout check in mmc_send_status()Jongman Heo2012-09-05-1/+1
| |/ | | | | | | | | | | | | | | | | | | (!timeout) condition check in mmc_send_status() can never be met, because do-while loop ends up with negative timeout value, -1. Fix the check to handle TIMEOUT case correctly. Signed-off-by: Jongman Heo <jongman.heo@gmail.com> Signed-off-by: Andy Fleming <afleming@freescale.com>
* | microblaze: board: Use bi_flashstart instead of CONFIG_SYS_FLASH_BASEMichal Simek2012-09-11-4/+6
| | | | | | | | | | | | | | Prepare for device-tree driven configuration. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net>
* | microblaze: Clean microblaze initializationMichal Simek2012-09-11-15/+16
| | | | | | | | | | | | | | | | | | Move board specific function to board_init function in board/ folder Remove externs from generic board.c Use board_init_f function in board.c file. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net>
* | microblaze: timer: Prepare for device-tree initializationMichal Simek2012-09-11-48/+41
| | | | | | | | | | | | | | | | | | Fix CONFIG_SYS_HZ usage in board config. Do not use hardcoded value. Use CONFIG_SYS_HZ instead. Separate static configuration to single block. Signed-off-by: Michal Simek <monstr@monstr.eu>
* | microblaze: intc: Coding style cleanupMichal Simek2012-09-11-13/+13
| | | | | | | | | | | | | | | | | | Just coding style cleanup. Remove unneeded externs. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Simon Glass <sjg@chromium.org> Acked-by: Stephan Linz <linz@li-pro.net>
* | microblaze: intc: Registering interrupt should return valueMichal Simek2012-09-11-8/+19
| | | | | | | | | | | | Return value to find out if un/registration was succesful. Signed-off-by: Michal Simek <monstr@monstr.eu>
* | microblaze: board: Remove compilation warningMichal Simek2012-09-11-1/+2
| | | | | | | | | | | | | | | | | | | | | | Variable is used when CONFIG_SYS_FLASH_CHECKSUM is used. Warning log: board.c: In function 'board_init': board.c:101: warning: unused variable 's' Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net>
* | microblaze: Add support for device tree driven board configurationMichal Simek2012-09-11-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | This is minimum code required to be able to use device-tree for u-boot initialization. Currently only for device driver initialization. Linker script change ensures DTB to be aligned for both options CONFIG_OF_EMBED and CONFIG_OF_SEPARATE. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net> CC: Simon Glass <sjg@chromium.org>
* | spi: xilinx: Remove unused variableStephan Linz2012-09-11-1/+0
| | | | | | | | | | | | | | | | | | | | Warning is: xilinx_spi.c: In function 'spi_setup_slave': xilinx_spi.c:81: warning: unused variable 'regs' Signed-off-by: Stephan Linz <linz@li-pro.net> CC: Michal Simek <monstr@monstr.eu>
* | serial: uartlite: Init all uartlites for serial multiMichal Simek2012-09-11-15/+19
| | | | | | | | | | | | | | | | | | Initialize all possible uartlites and return the first initialized port. For static configuration is initialization done in userial_ports array. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net>
* | serial: Support serial multi for MicroblazeMichal Simek2012-09-11-1/+2
| | | | | | | | | | | | | | enable serial multi for Microblaze. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net>
* | block: systemace: Simplify base and width initializationMichal Simek2012-09-11-13/+25
|/ | | | | | | Use CONFIG parameters only at one location to simplify the code. Also create ace_readw/writew functions. Signed-off-by: Michal Simek <monstr@monstr.eu>
* Merge branch 'master' of git://git.denx.de/u-boot-avr32Wolfgang Denk2012-09-04-4/+2
|\ | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-avr32: net:macb: add line break avr32:portmux: fix setup for macb1 avr32: Remove redundant LDSCRIPT definition Signed-off-by: Wolfgang Denk <wd@denx.de>
| * net:macb: add line breakAndreas Bießmann2012-09-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Without this patch we see annoying output like this: ---8<--- U-Boot> dhcp macb1: PHY not foundmacb0: PHY present at 1 macb0: Starting autonegotiation... --->8--- Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> cc: Joe Hershberger <joe.hershberger@gmail.com>
| * avr32:portmux: fix setup for macb1Andreas Bießmann2012-09-03-1/+1
| | | | | | | | | | | | Use portd_mask instead of portc_mask to setup the pins for port D. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * avr32: Remove redundant LDSCRIPT definitionBenoît Thébaudeau2012-09-02-2/+0
| | | | | | | | | | | | | | | | | | | | AVR32's LD script uses a standard location that is now automatically detected by the main Makefile, so its definition in AVR32's config.mk is now obsolete and redundant. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-ubiWolfgang Denk2012-09-03-5/+6
|\ \ | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-ubi: ubifs: Fix memory leak in ubifs_finddir Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | ubifs: Fix memory leak in ubifs_finddirStefan Roese2012-09-03-5/+6
| | | | | | | | | | | | | | | | | | | | | This patch fixes a memory leak in ubifs_finddir(). Signed-off-by: Stefan Roese <sr@denx.de> Cc: dev.ma.dma@gmail.com
* | | Merge branch 'master' of git://git.denx.de/u-boot-cfi-flashWolfgang Denk2012-09-03-1/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-cfi-flash: cfi: Make the flash erase and write operations abortable cfi: Check for blank before erase Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | cfi: Make the flash erase and write operations abortableJoe Hershberger2012-09-03-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for ctrlc() in operations that take time and loop over the flash addresses. In netconsole, tstc() is expensive. Only check once in a while to not slow down the operation significantly. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * | | cfi: Check for blank before eraseJoe Hershberger2012-09-03-0/+26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Added an optional check in the CFI driver to evaluate if the sector is already blank before issuing an erase command. Improves erase time by over a factor of 10 if already blank. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | | Merge branch 'master' of git://git.denx.de/u-boot-ppc4xxWolfgang Denk2012-09-03-3/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.denx.de/u-boot-ppc4xx: ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit again Signed-off-by: Wolfgang Denk <wd@denx.de>
| * | | ppc4xx: Canyonlands/Glacier: Squeeze NAND image a bit to fit againStefan Roese2012-09-03-3/+0
| |/ / | | | | | | | | | | | | | | | | | | This patch removes some superfluous SDRAM init calls to fit the NAND_SPL image into 4k again. Signed-off-by: Stefan Roese <sr@denx.de>
* | | powerpc: re-add bi_ip_addr to bd_t structAnatolij Gustschin2012-09-02-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 50a47d0523e8efebe912bef539a77ffd42116451 (net: punt bd->bi_ip_addr) booting old 2.4.x ppc kernels is broken due to changed offsets of the fields in struct bd_t. Offsets of the fields after removed bi_ip_addr are wrong, causing wrong bus clocks and console baudrate configurations and various other issues. Re-add the bi_ip_addr field to preserve backward compatibility with older ppc kernels. Setting bi_ip_addr in board.c is not really needed, grepping in the 2.4 linux tree shows that bi_ip_addr is not accessed there. Adding bi_ip_addr to struct bd_t for other arches isn't needed it seems. bd_t is not used by other arches in the 2.4 linux tree. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Wolfgang Denk <wd@denx.de>
* | hush: Don't parse the contents of a dereferenced varJoe Hershberger2012-09-02-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a variable which contains a user-supplied value is dereferenced (e.g. to be echo'ed), make sure that the value is not further parsed by hush. Set the hush local variable "HUSH_NO_EVAL=1" to enable this behavior. Without this patch, a sequence like this occurs: Panda # env set my_user_string Bob\'s favorite device Panda # print my_user_string my_user_string=Bob's favorite device Panda # echo $my_user_string syntax error hush.c:3007 With this patch, it looks like this: Panda # HUSH_NO_EVAL=1 Panda # env set my_user_string Bob\'s favorite device Panda # print my_user_string my_user_string=Bob's favorite device Panda # echo $my_user_string Bob's favorite device Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | hush: Add default value substitution supportJoe Hershberger2012-09-02-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard sh syntax: ${VAR:-default} Use default value: if VAR is set and non-null, expands to $VAR. Otherwise, expands to default. ${VAR:=default} Set default value: if VAR is set and non-null, expands to $VAR. Otherwise, sets hush VAR to default and expands to default. ${VAR:+default} If VAR is set and non-null, expands to the empty string. Otherwise, expands to default. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | README: Cleanup description of supported partitions.Karl O. Pinc2012-09-02-4/+11
| | | | | | | | | | | | README: Cleanup description of supported partitions. Signed-off-by: Karl O. Pinc <kop@meme.com>
* | README.SPL: Move the 'Estimating stack usage' from omap3 to hereTom Rini2012-09-02-22/+23
| | | | | | | | | | | | The instructions are generic, so move to the generic doc. Signed-off-by: Tom Rini <trini@ti.com>
* | README.SPL: Add a small Debugging sectionTom Rini2012-09-02-0/+7
| | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | README: Update ver env var descriptionBenoît Thébaudeau2012-09-02-1/+2
| | | | | | | | | | | | | | | | Commit 155cb01 replaced the read-only property of the ver env var with an auto-restoring behavior. Update the README file accordingly. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Wolfgang Denk <wd@denx.de>
* | dm: Add twserial device documentTomáš Hlaváček2012-09-02-0/+47
| | | | | | | | Signed-off-by: Tomas Hlavacek<tmshlvck@gmail.com>
* | dm: RTC subsystem analysis added.Tomas Hlavacek2012-09-02-0/+258
| | | | | | | | Signed-off-by: Tomas Hlavacek <tmshlvck@gmail.com>
* | dm: Add pcmcia design documentViktor Krivak2012-09-02-0/+78
| | | | | | | | Signed-off-by: Viktor Krivak <viktor.krivak@gmail.com>