summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'u-boot/master' into 'u-boot-arm/master'Albert ARIBAUD2014-02-20-255/+47
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile drivers/net/npe/Makefile These two conflicts arise from commit 0b2d3f20 ("ARM: NET: Remove the IXP NPE ethernet driver") and are resolved by deleting the drivers/net/npe/Makefile file and removing the CONFIG_IXP4XX_NPE line from Makefile.
| * Move #ifdef(CONFIG_DISPLAY_CPUINFO) from caller to calleeMasahiro Yamada2014-02-19-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When CONFIG_DISPLAY_CPUINFO is not enabled, print_cpuinfo() should be defined as an empty function in a header, include/common.h - Remove #ifdef CONFIG_DISPLAY_CPUINFO .. #endif from caller, common/board_f.c and arch/arm/lib/board.c - Remove redundant prototypes in arch/arm/lib/board.c, arch/arm/include/asm/arch-am33x/sys_proto.h and board/nokia/rx51/rx51.h, keeping the one in include/common.h - Add #ifdef CONFIG_DISPLAY_CPUINFO to the func definition where it is missing Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * configs: Delete unused CONFIG_SYS_64BIT_{VSPRINTF, STRTOUL}Masahiro Yamada2014-02-19-6/+0
| | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * configs: Delete obsolete macro, CONFIG_SYS_GBL_DATA_SIZEMasahiro Yamada2014-02-19-51/+8
| | | | | | | | | | | | | | | | | | | | | | CONFIG_SYS_GBL_DATA_SIZE is not used any more. The size of struct "global_data" is automatically calculated by asm-offsets. (See lib/asm-offsets.c) GENERATED_GBL_DATA_SIZE should be used instead of CONFIG_SYS_GBL_DATA_SIZE. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * dts: re-write dts/Makefile more simply with KbuildMasahiro Yamada2014-02-19-1/+1
| | | | | | | | | | | | | | | | | | | | | | Useful rules in scripts/Makefile.lib allows us to easily generate a device tree blob and wrap it in assembly code. We do not need to parse a linker script to get output format and arch. This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * kernel-doc: fix some errorsMasahiro Yamada2014-02-19-3/+3
| | | | | | | | | | | | | | | | | | | | | | - Delete fs.xml from DOCBOOKS to fix an error. Commit e3ff797c added fs.xml to DOCBOOKS but missed to add doc/DocBook/fs.tmpl. - Fix the location of include guard in include/linker_lists.h. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reported-by: Abraham Varricatt <abraham.varricatt@vvdntech.com> Acked-by: Simon Glass <sjg@chromium.org>
| * .gitignore: drop include/asm from ignored file listMasahiro Yamada2014-02-19-1/+0
| | | | | | | | | | | | Commit bb02c536 stopped creaing a symbolic link include/asm. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * common: spl: Add spl sata boot supportDan Murphy2014-02-19-0/+3
| | | | | | | | | | | | | | | | Add spl_sata to read a fat partition from a bootable SATA drive. Signed-off-by: Dan Murphy <dmurphy@ti.com> Reviewed-by: Roger Quadros <rogerq@ti.com>
| * fdt: rename IMAAGE_OF_BOARD_SETUP to IMAGE_OF_BOARD_SETUPMasahiro Yamada2014-02-19-2/+2
| | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
| * config: remove platform CONFIG_SYS_HZ definition part 3Masahiro Yamada2014-02-19-21/+0
| | | | | | | | | | | | | | | | This commit removes platform CONFIG_SYS_HZ definition for the remainders of part1 (commit cdb23792) and part2 (commit f232950f). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Rob Herring <rob.herring@calxeda.com>
| * mini2440.h: Delete remainder of dead boardMasahiro Yamada2014-02-19-170/+0
| | | | | | | | | | | | | | Commit af5b9b1f removed mini2440 board support, but missed to delete include/configs/mini2440.h. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * fat: implement exists() for FAT fsStephen Warren2014-02-19-0/+1
| | | | | | | | | | | | | | | | This hooks into the generic "file exists" support added in an earlier patch, and provides an implementation for the FAT filesystem. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
| * ext4: implement exists() for ext4fsStephen Warren2014-02-19-0/+1
| | | | | | | | | | | | | | | | This hooks into the generic "file exists" support added in an earlier patch, and provides an implementation for the ext4 filesystem. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
| * sandbox: enable CONFIG_CMD_FS_GENERICStephen Warren2014-02-19-0/+1
| | | | | | | | | | | | | | Since the generic ls command no longer segfaults sandbox, enable it. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
| * sandbox: implement exists() functionStephen Warren2014-02-19-0/+1
| | | | | | | | | | | | | | | | This hooks into the generic "file exists" support added in an earlier patch, and provides an implementation for the sandbox test environment. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
| * fs: implement infrastructure for an 'exists' functionStephen Warren2014-02-19-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could be used in scripts such as: if test -e mmc 0:1 /boot/boot.scr; then load mmc 0:1 ${scriptaddr} /boot/boot.scr source ${scriptaddr} fi rather than: if load mmc 0:1 ${scriptaddr} /boot/boot.scr; then source ${scriptaddr} fi This prevents errors being printed by attempts to load non-existent files, which can be important when checking for a large set of files, such as /boot/boot.scr.uimg, /boot/boot.scr, /boot/extlinux.conf, /boot.scr.uimg, /boot.scr, /extlinux.conf. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
| * fs: fix generic save command implementationStephen Warren2014-02-19-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few issues with the generic "save" shell command, and fs_write() function. 1) fstypes[].write wasn't filled in for some file-systems, and isn't checked when used, which could cause crashes/... if executing save on e.g. fat/ext filesystems. 2) fs_write() requires the length argument to be non-zero, since it needs to know exactly how many bytes to write. Adjust the comments and code according to this. 3) fs_write() wasn't prototyped in <fs.h> like other generic functions; other code should be able to call this directly rather than invoking the "save" shell command. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2014-02-19-104/+122
|\ \
| * \ Merge branch 'master' of git://git.denx.de/u-boot-armStefano Babic2014-02-11-3084/+565
| |\ \
| * | | mx6: Enable L2 cache supportFabio Estevam2014-02-11-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add L2 cache support and enable it by default. Configure the L2 cache in the same way as done by FSL kernel: http://git.freescale.com/git/cgit.cgi/imx/linux-2.6-imx.git/tree/arch/arm/mach-mx6/mm.c?h=imx_3.0.35_4.1.0 Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Dirk Behme <dirk.behme@gmail.com> Acked-by: Stefano Babic <sbabic@denx.de>
| * | | mx6sl: Adjust fdt_addr to avoid address overlappingFabio Estevam2014-02-11-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similarly as it was done on commit 6584a1b526 (ARM: mx6: Change the FDT loading address to avoid overlaping), we need to adjust the fdt_addr in order to be able to boot FSL 3.10 kernel. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | vf610twr: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | udoo: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx6slevk: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx6sabre_common: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx6qarm2: Set default environment to use zImageOtavio Salvador2014-02-11-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx53loco: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx51evk: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx28evk: Set default environment to use zImageOtavio Salvador2014-02-11-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | mx23evk: Set default environment to use zImageOtavio Salvador2014-02-11-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | hummingboard: Set default environment to use zImageOtavio Salvador2014-02-11-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | cgtqmx6eval: Set default environment to use zImageOtavio Salvador2014-02-11-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default environment to use zImage instead of uImage, this requires changes to the default environment to load a file named zImage instead of uImage, and to use the 'bootz' command instead of 'bootm' when booting the kernel. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
| * | | ARM: m53evk: Enable CONFIG_REGEXMarek Vasut2014-01-26-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable CONFIG_REGEX on M53EVK to allow usage of regular expressions on environment variables. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de>
| * | | ARM: m53evk: Rename mxc-nand to mxc_nandMarek Vasut2014-01-26-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name the Linux kernel expects is 'mxc_nand' , not 'mxc-nand' . This patch renames the driver name. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Stefano Babic <sbabic@denx.de>
| * | | ARM: mx6: Enable PCIe on SabreliteMarek Vasut2014-01-26-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable PCI express on MX6 Sabrelite. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Eric Nelson <eric.nelson@boundarydevices.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
* | | | zynq: Add support for U-BOOT SPLMichal Simek2014-02-19-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPL is using ps7_init.c/h files which are generated from design tools which have to be copied to boards/xilinx/zynq folder before compilation. BSS section is moved to SDRAM because fat support requires more space than SRAM size. Added: - MMC and QSPI support - Boot OS directly from SPL - Enable SPL command Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@ti.com>
* | | | zynq: Implement dump clock commandSoren Brinkmann2014-02-19-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable and implement dump clock command which shows soc frequencies. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | zynq: Provide a framework to read clock frequenciesSoren Brinkmann2014-02-19-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | common: Provide DIV_ROUND_CLOSEST macroSoren Brinkmann2014-02-19-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the DIV_ROUND_CLOSEST macro - taken from the Linux kernel - in common.h Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | zynq: serial: Simplify serial driver initializationMichal Simek2014-02-19-17/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define both serial uarts in the driver and return default uart based on board configuration. - Move baseaddresses to hardware.h - Define default baudrate and clock values Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | zynq: Enable tftp put commandMichal Simek2014-02-19-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For saving content of memory via tftp to file. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | zynq: Extend kernel image size to 20MBMichal Simek2014-02-19-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend max kernel image size. Gunzip is checking this value. If kernel is larger, message below is shown. Uncompressing Kernel Image ... Error: inflate() returned -5 GUNZIP: uncompress, out-of-mem or overwrite error - must RESET board to recover Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | zynq: Fix incorrect header nameMichal Simek2014-02-19-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Zynq common configuration is placed in zynq-common.h not zynq_common.h. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'Albert ARIBAUD2014-02-19-1063/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | ARM: IXP: Remove dvl_host boardMarek Vasut2014-02-06-222/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board is unmaintained, just like the rest of the IXP. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Michael Schwingen <michael@schwingen.org> Cc: Tom Rini <trini@ti.com>
| * | | ARM: IXP: Remove actux4 boardMarek Vasut2014-02-06-204/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board is unmaintained, just like the rest of the IXP. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Michael Schwingen <michael@schwingen.org> Cc: Tom Rini <trini@ti.com>
| * | | ARM: IXP: Remove actux3 boardMarek Vasut2014-02-06-205/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board is unmaintained, just like the rest of the IXP. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Michael Schwingen <michael@schwingen.org> Cc: Tom Rini <trini@ti.com>
| * | | ARM: IXP: Remove actux2 boardMarek Vasut2014-02-06-206/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board is unmaintained, just like the rest of the IXP. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Michael Schwingen <michael@schwingen.org> Cc: Tom Rini <trini@ti.com>
| * | | ARM: IXP: Remove actux1 boardMarek Vasut2014-02-06-226/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The board is unmaintained, just like the rest of the IXP. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Michael Schwingen <michael@schwingen.org> Cc: Tom Rini <trini@ti.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2014-02-17-240/+490
|\ \ \
generated by cgit v1.1 at 2024-07-08 01:14:49 +0000