summaryrefslogtreecommitdiff
path: root/common
Commit message (Collapse)AuthorAgeLines
...
* | | Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriqTom Rini2015-04-24-5/+11
|\ \ \
| * | | armv8/ls2085aqds: NAND boot supportScott Wood2015-04-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds NAND boot support for LS2085AQDS, using SPL framework. Details of forming NAND image can be found in README. Signed-off-by: Scott Wood <scottwood@freescale.com> [York Sun: Remove +S from defconfig after commit 252ed872] Signed-off-by: York Sun <yorksun@freescale.com>
| * | | armv8/fsl-lsch3: Update early MMU tableYork Sun2015-04-23-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During booting, IFC is mapped to low region. After booting up, IFC is remapped to high region for larger space. The environmental variables are also stored at high region. In order to read the variables during booting, a virtual mapping is required. Cache was enabled for entire IFC space before. Actually the first two entries are big enough (4MB) to cover the boot code and environmental variables. Remove extra entries. Move OCRAM entry out of ifdef. Signed-off-by: York Sun <yorksun@freescale.com>
| * | | cmd_mem: Store last address/size/etc as ulongScott Wood2015-04-23-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Otherwise the high 32 bits get truncated on 64-bit U-boot. Signed-off-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: York Sun <yorksun@freescale.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-dmTom Rini2015-04-23-84/+33
|\ \ \
| * | | dm: Init device tree as well as driver model in SPLSimon Glass2015-04-23-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If enabled, make sure that the device tree is available in SPL before setting up driver model. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | Correct malloc_limit value for pre-relocation malloc()Simon Glass2015-04-23-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The limit is measured from the start of the malloc() area and is not an absolute address. Correct this. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | Move initf_malloc() to a common placeSimon Glass2015-04-23-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow this function to be used from SPL, move it to the malloc() code. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | fdt: Rename setup_fdt() and make it prepare alsoSimon Glass2015-04-23-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is little reason to split these two functions. Bring them together which simplifies the init sequence. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | | fdt: sandbox: Move setup code from board_f to fdtdecSimon Glass2015-04-23-65/+2
| |/ / | | | | | | | | | | | | | | | | | | We want to be able to set up the device tree in SPL, so move this code to a common place. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | cmd, nand: add more info to "nand info"Heiko Schocher2015-04-23-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add subpagesize, nand options and bbt options to the "nand info" output. => nand info Device 0: nand0, sector size 256 KiB Page size 4096 b OOB size 256 b Erase size 262144 b subpagesize 4096 b options 0x 200 bbt options 0x 8000 Signed-off-by: Heiko Schocher <hs@denx.de>
* | | rtc: Set valid date after resetMarek Vasut2015-04-23-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some RTC chips tend to set garbage date after reset. This patch sets the date to 2000-01-01 00:00 immediatelly after the RTC chip reset is issued using the "date reset" command. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@konsulko.com>
* | | cmd_led: Extend led command to support blinking and more ledsStefan Roese2015-04-23-10/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch extends the U-Boot "led" command to support automatic blinking by setting a blink frequency in milliseconds. Additionally the number of supported LEDs is increased to 6 (0...5). This will be used by the PCA9551 LED driver. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | cmd_scsi: Enable SoC AHCI device on platforms with PCItang yuantian2015-04-22-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | unzip: add gzwrite command to write compressed image to block deviceEric Nelson2015-04-22-0/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | Add gzwrite command to write gzip-compressed images to block devices. Input must be gzip-compressed according to RFC1952, since the crc and file size in the trailer will be confirmed during operation. The decompressed file size must be specified on the command line for images with decompressed sizes >= 4GiB because the trailer only contains the low 32 bits of the original file size. Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
* | kconfig: remove duplicated CMD_DNS optionAndrey Skvortsov2015-04-21-5/+0
| | | | | | | | | | | | | | | | two CMD_DNS options were added by commit 60296a835cb17 ("commands: add more command entries in Kconfig") Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com> Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | mii: add read-modify-write option to mii commandTim James2015-04-20-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing PHY registers it is often desirable to only update selected bits, so it is necessary to first read the current value before writing back an modified value with the relevant bits updated. To simplify this and to allow such operations to be incorporated into simple shell scripts propose adding a 'modify' option to the existing mii command, which takes a mask indicating the bits to be updated in addition to a data value containing the new bits, ie, <updated> = (<data> & <mask>) | (<current> & ~<mask>). Signed-off-by: Tim <tim.james@macltd.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Jeroen Hofstee <jeroen@myspectrum.nl> Cc: Tom Rini <trini@konsulko.com> Cc: Tim <tim.james@macltd.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-videoTom Rini2015-04-20-107/+310
|\ \
| * | common/lcd_console: introduce display/framebuffer rotationHannes Petermaier2015-04-18-81/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, for example if the display is mounted in portrait mode or even if it is mounted landscape but rotated by 180 degrees, we need to rotate our content of the display respectively the framebuffer, so that user can read the messages which are printed out. For this we introduce the feature called "CONFIG_LCD_ROTATION", this may be defined in the board-configuration if needed. After this the lcd_console will be initialized with a given rotation from "vl_rot" out of "vidinfo_t" which is provided by the board specific code. If CONFIG_LCD_ROTATION is not defined, the console will be initialized with 0 degrees rotation. Signed-off-by: Hannes Petermaier <hannes.petermaier@br-automation.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at> Acked-by: Nikita Kiryanov <nikita@compulab.co.il> [agust: fixed 'struct vidinfo' has no member named 'vl_rot' errors] Signed-off-by: Anatolij Gustschin <agust@denx.de>
| * | common/lcd_console: move single static variables into common (static) structureHannes Petermaier2015-04-18-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For coming implementation of lcd_console rotation, we will need some more variables for holding information about framebuffer size, rotation, ... For better readability we catch all them into a common structure. Signed-off-by: Hannes Petermaier <hannes.petermaier@br-automation.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at> Acked-by: Nikita Kiryanov <nikita@compulab.co.il>
| * | common/lcd_console: ask only one-time for bg/fg-color per callHannes Petermaier2015-04-18-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call the lcd_getfgcolor and lcd_getbgcolor within the "draw-loop", this only wastes time. Signed-off-by: Hannes Petermaier <hannes.petermaier@br-automation.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at> Acked-by: Nikita Kiryanov <nikita@compulab.co.il>
| * | common/lcd_console: cleanup lcd_drawchars/lcd_putc_xyHannes Petermaier2015-04-18-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the capability of drawing some *str with count from lcd_drawchars is unnary. It is always called from lcd_putc_xy with one character of and count = 1. So we simply rename lcd_drawchars into lcd_putc_xy and remove the loops inside. Signed-off-by: Hannes Petermaier <hannes.petermaier@br-automation.com> Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at> Acked-by: Nikita Kiryanov <nikita@compulab.co.il>
* | | pxe: Ensure all memory access is to mapped memorySjoerd Simons2015-04-19-30/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly map memory through map_sysmem so that pxe can be used from the sandbox. Tested in sandbox as well as on jetson-tk1, odroid-xu3, snow as peach-pi boards Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Acked-by: Simon Glass <sjg@chromium.org>
* | | sandbox: Implement host dev [device]Sjoerd Simons2015-04-19-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common pattern to check if a certain device exists (e.g. in config_distro_bootcmd) is to use: <interface> dev [device] Implement host dev [device] so this pattern can be used for sandbox host devices. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Acked-by: Simon Glass <sjg@chromium.org>
* | | sandbox: Renamed sb command to hostSjoerd Simons2015-04-19-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | As suggested by Simon Glass, rename the sb command to host but keep the old sb command as an alias Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Acked-by: Simon Glass <sjg@chromium.org>
* | | sandbox: exynos: Move CONFIG_CMD_SOUND to KconfigSimon Glass2015-04-18-0/+10
| | | | | | | | | | | | | | | | | | Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Kconfig: Move CONFIG_BOOTSTAGE to KconfigSimon Glass2015-04-18-6/+107
| | | | | | | | | | | | | | | | | | | | | Move CONFIG_BOOT_STAGE and its associated options to Kconfig. Adjust existing users and code. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | dm: net: Adjust PHY interface to work with CONFIG_DM_ETHSimon Glass2015-04-18-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When driver model is used for Ethernet a few functions are passed a udevice instead of an eth_device. Also add a function to find a PHY type given its name. This will be used to decode the device tree node. Finally, put a phy_interface field in struct eth_pdata since this is an important part of the platform data for Ethernet. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | | Avoid calling print_eths() with driver modelSimon Glass2015-04-18-1/+1
| | | | | | | | | | | | | | | | | | | | | This function is not supported with driver model. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | | net: cosmetic: Fix checkpatch.pl failures in net.cJoe Hershberger2015-04-18-14/+14
| | | | | | | | | | | | | | | | | | | | | Finish eliminating CamelCase from net.c and other failures Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Clean up cmd_net variables and functionsJoe Hershberger2015-04-18-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | Make a thorough pass through all variables and function names contained within common/cmd_net.c and remove CamelCase and improve naming. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Clean up DNS variables and functionsJoe Hershberger2015-04-18-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make a thorough pass through all variables and function names contained within dns.c and remove CamelCase and improve naming. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Clean up CDP variables and functionsJoe Hershberger2015-04-18-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | Make a thorough pass through all variables and function names contained within cdp.c and remove CamelCase and improve naming. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Clean up TFTP variables and functionsJoe Hershberger2015-04-18-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Make a thorough pass through all variables and function names contained within tftp and remove CamelCase and improve naming. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Fixup var names for DHCP stringsJoe Hershberger2015-04-18-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Remove CamelCase variable naming. Move the definition to the same compilation unit as the primary use. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Fixup var names related to boot fileJoe Hershberger2015-04-18-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | The variables around the bootfile were inconsistent and used CamelCase. Update them to make the code more readable. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | net: cosmetic: Change IPaddr_t to struct in_addrJoe Hershberger2015-04-18-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is simply clean-up to make the IPv4 type that is used match what Linux uses. It also attempts to move all variables that are IP addresses use good naming instead of CamelCase. No functional change. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
* | | dm: usb: Support driver model with USB keyboardsSimon Glass2015-04-18-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow USB keyboards to work with driver model. The main difference is that we can have multiple buses (each with its own device numbering) and each bus must be scanned. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Split out the keyboard probe into its own functionSimon Glass2015-04-18-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | Before adding driver model support, split out code from this over-long function. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Convert usb_storage to driver modelSimon Glass2015-04-18-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | Add support for scanning USB storage devices with driver model. This mostly involves adding a USB device ID for storage devices. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Move storage device scanning into its own functionSimon Glass2015-04-18-38/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usb_stor_scan() function is quite long, so split out the code that scans each device into its own function. Also, rather than setting up the block device list once at the start, set it up as each device is scanned. This makes it possible to use this code from driver model. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | Revert "usb_storage : scan all interfaces to find a storage device"Simon Glass2015-04-18-28/+17
| | | | | | | | | | | | | | | | | | | | | This reverts commit cd749658d5994978579628a6333e5c2a6c8ec632. The conflicts with this commit are hard for me to figure out. I will re-apply it later.
* | | dm: usb: Adjust usb_storage to work with sandboxSimon Glass2015-04-18-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | With a few tweaks we can compile this code with sandbox and enable testing of the USB storage layer. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Simply device finding code in usb_storageSimon Glass2015-04-18-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | The for() loop is not needed since the value is immediately accessible. Use this instead to simplify the code. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Fix type problems in usb_stor_get_info()Simon Glass2015-04-18-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This function assumes that unsigned long is 32-bits wide, but it is not on 64-bit machines. Use the correct type, and add a few debug() lines also. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Move USB storage definitions to usb_defs.hSimon Glass2015-04-18-43/+2
| | | | | | | | | | | | | | | | | | | | | | | | These are better off in a header file so they can be used by other code (e.g. the sandbox USB storage emulator). Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Add driver model support for hubsSimon Glass2015-04-18-4/+90
| | | | | | | | | | | | | | | | | | | | | | | | Adjust the existing hub code to support driver model, and add a USB driver for hubs. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Split hub detection into its own functionSimon Glass2015-04-18-16/+41
| | | | | | | | | | | | | | | | | | | | | | | | Split out the hub detection logic so it can be used by driver model. Also adjust the code to return errors correctly. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Convert core usb.c file to support driver modelSimon Glass2015-04-18-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | Add the required #ifdefs and remove unwanted data structures so that the USB uclass will be able to use this file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
* | | dm: usb: Complete the splitting up of usb_new_device()Simon Glass2015-04-18-62/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function now calls usb_setup_device() to set up the device and usb_hub_probe() to check if it is a hub. The XHCI special case is now a parameter to usb_setup_device(). The latter will be used by the USB uclass when it is added, since it does not rely on any CONFIGs or legacy data structures. Signed-off-by: Simon Glass <sjg@chromium.org> Bug-fixes for descriptor reading and usb_new_device() return value Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Marek Vasut <marex@denx.de> Tested-by: Tom Rini <trini@konsulko.com>
generated by cgit v1.1 at 2024-11-09 22:07:51 +0000