summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2013-08-01Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini
2013-07-31Merge git://git.denx.de/u-boot-armStefano Babic
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <[email protected]>
2013-07-30gpio: omap5-uevm: Configure the tca6424 gpio expanderDan Murphy
Configure the tca6424 gpio expander This allows use of the debug and tri color LEDs. Signed-off-by: Dan Murphy <[email protected]>
2013-07-30gpio: tca642x: Add the tca642x gpio expander driverDan Murphy
Add the tca642x gpio expander driver Datasheet: http://www.ti.com/product/tca6424a Signed-off-by: Dan Murphy <[email protected]>
2013-07-30am335x_evm: Add support for eMMC environmentJustin Waters
Some boards, such as the BeagleBone Black, have an eMMC chip intstead of NAND. We can use the eMMC boot partition to store the environment, since it isn't used for anything else. This allows us to have a configurable environment on those boards. Signed-off-by: Justin Waters <[email protected]>
2013-07-30am335x_evm: Rework bootcmd to handle two MMC devsJustin Waters
The BeagleBone Black can boot from either the MMC card or eMMC chip on board. We should try both interfaces. This modification also allows a graceful fallback if a device exists but boot images are not present on it. Changes for v2: * Fix boot partition - it should always show up as mmcblk0p2 * Fix missing FDT load Signed-off-by: Justin Waters <[email protected]>
2013-07-30am335x_evm: Add command line editingJustin Waters
Many modern U-Boot ports enable command line editing and a history buffer. The am335x_evm configuration is fairly comprehensive as it is, so a few extra kb should not be noticable, and it adds a very convenient feature. Signed-off-by: Justin Waters <[email protected]>
2013-07-30am335x_evm: Make NAND support modularJustin Waters
Give the user the ability to disable NAND support by defining CONFIG_NO_NAND. This will allow custom hardware to easily support this configuration. Signed-off-by: Justin Waters <[email protected]> [trini: Make apply on top of other series] Signed-off-by: Tom Rini <[email protected]>
2013-07-30am335x_evm: Add support to boot from NOR.Steve Kipisz
NOR requires that s_init be within the first 4KiB of the image so that we can perform the rest of the required pinmuxing to talk with the rest of NOR that we are found on. When NOR_BOOT is set we save our environment in NOR at 512KiB and a redundant copy at 768KiB. We avoid using SPL for this case and u-boot.bin is written directly to the start of NOR. We enclose the DMM-related parts of arch/arm/cpu/armv7/am33xx/emif4.c with TI81xx checks as at this time U-Boot does not discard unused sections in the main build and this code relies on functions specific to (and only provided in) ti81xx-related code. Cc: Albert ARIBAUD <[email protected]> Signed-off-by: Steve Kipisz <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2013-07-30am335x_evm: Add support for the NOR module on the memory capeSteve Kipisz
This patch adds support for the NOR module that attaches to the memory cape for a Beaglebone board. This does not add booting support; only support so that you can boot from SD/MMC and see the NOR module so that it can be programmed. Signed-off-by: Steve Kipisz <[email protected]> [trini: Clean up config changes slightly] Signed-off-by: Tom Rini <[email protected]>
2013-07-30am335x_evm: Update SPI_BOOT support, add MTDPARTS infoTom Rini
- Style cleanup (# define -> #define) - Due to ROM issues, redudant loading isn't feasible, so drop. - Given extra space, increase max size of U-Boot to 512KiB - Correct env size to match usage (we had not re-defined ENV_SIZE). - Given extra space, keep env size as 128KiB, add redundant environment. Reviewed-by: Peter Korsgaard <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2013-07-30am335x_evm: Drop useless CONFIG_ENV_IS_NOWHERETom Rini
We always set a CONFIG_ENV_IS_...somewhere... so drop the initial define of NOWHERE. Reviewed-by: Peter Korsgaard <[email protected]> Signed-off-by: Tom Rini <[email protected]>
2013-07-30cfi_flash: Add prototypes of overridable functionsMasahiro Yamada
This commit adds some prototypes into include/mtd/cfi_flash.h. These functions are defined with a weak attribute in drivers/mtd/cfi_flash.c. This means they can be overrided by board-specific ones if necessary. When defining such functions under board/ directory or somewhere, cfi_flash.h should be included. This makes sure that board-specfic cfi functions are defined in a correct prototype. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Stefan Roese <[email protected]>
2013-07-29dfu: Implementation of target reset after communication with dfu-util's -R ↵Lukasz Majewski
switch This patch extends dfu code to support transmission with -R switch specified at dfu-util. When -R is specified, the extra USB_REQ_DFU_DETACH request is sent after successful data transmission. Then dfu resources are released and reset command is issued. Signed-off-by: Lukasz Majewski <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2013-07-29usb: mv_udc: Add bounce bufferMarek Vasut
The requests sent to the controller are not properly cache aligned most of the time, thus implement a simple bounce buffer to avoid problem with cache. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-29usb: mv_udc: Improve allocation of qTD itemsMarek Vasut
Allocate the qTD items all at once instead of allocating them separately. Moreover, make sure each qTD is properly aligned to 32-bytes boundary and that cache can be safely flushed over each qTD touple. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-29usb: mv_udc: Move QH and qTD into mv_drvMarek Vasut
Both the endpoint queue head and the endpoint item list is a controller specific thing. Move them both into controller private data. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-29usb: mv_udc: Make use of struct ehci_ctrlMarek Vasut
The usb_lowlevel_init() call already fills and passes back struct ehci_ctrl , which readily contains correctly determined address of the port register block address computed from values from controller configuration registers. Leverage this and make use of this value as this makes the code mode universal, but also gets us rid of the CONFIG_USB_REG_BASE configuration option. Moreover, this patch cleans up the usb_gadget_register_driver() call a little by correcting the error handling. Note the usb_lowlevel_init() and mvudc_probe() are now called in reversed order, but this has no impact on the code. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-29usb: mv_udc: Clean up the EP initializationMarek Vasut
Move the constant values that are programmed into mv_ep.ep into separate static const structure so they can be memcpy()'d when the initialization happens. Moveover, we only every init NUM_ENDPOINTS, not 2 * NUM_ENDPOINTS, so fix this bug as well. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-29usb: mv_udc: Move endpoint array into driver dataMarek Vasut
The endpoints are operated on a per-controller basis, move the endpoint array into controller's private data. Also shuffle the struct mv_ep structure definition just above the definition of the struct mv_drv so they're well grouped together. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-29usb: mv_udc: Clean up mv_udc.hMarek Vasut
Do a coding-style cleanup of this file and throw away useless defined values. These values were likely a result of a copy-paste job. Signed-off-by: Marek Vasut <[email protected]> Cc: Fabio Estevam <[email protected]> Cc: Lei Wen <[email protected]> Cc: Otavio Salvador <[email protected]> Cc: Stefano Babic <[email protected]>
2013-07-27mx6qsabresd: Add splash screen support via HDMIPardeep Kumar Singla
Signed-off-by: Pardeep Kumar Singla <[email protected]>
2013-07-27mx6: Factor out common HDMI setup codePardeep Kumar Singla
Instead of duplicating HDMI setup code for every mx6 board, factor out the common code Signed-off-by: Pardeep Kumar Singla <[email protected]> Acked-By: Eric Nelson <[email protected]>
2013-07-26omap3_beagle: support booting from zImage and device tree as last optionNishanth Menon
If no other bootoption works, try loading up device tree and zImage. This is selected as the last option to allow backward compatibility as well as support the recent trend in moving kernel boot to using zImage and device tree. NOTE: if uImage is present in bootpart, it will try this first and will assume this is to be booted with bootm (so may be concatenated image or plain vanilla ATAG MACHINE_ID based image) Signed-off-by: Nishanth Menon <[email protected]>
2013-07-26omap3_beagle: support findfdt and loadfdt for devicetree supportNishanth Menon
For folks not using concatenated device tree with uImage, having an handy function to find and load device tree is very handy. So introduce findfdt and loadfdt and run findfdt by default to make it easier on user scripts. Signed-off-by: Nishanth Menon <[email protected]>
2013-07-26omap3_beagle: enable CMD_FS_GENERIC and simplify load of image/ramdiskNishanth Menon
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 currently use. Sticking with existing conventions, defaults will be: ramdisk=ramdisk.gz bootpart=0:2 (second partition) bootdir=/boot (/boot in second partition) This matches with the default behavior, these can be overriden by env files as needed. Signed-off-by: Nishanth Menon <[email protected]>
2013-07-26omap3_beagle: replace uImage.beagle with generic uImageNishanth Menon
e682930867f7dfc4a01784fe452fad9e962d65a (BeagleBoard: config: use uImage.beagle for tftp) Introduced uImage.beagle which does not happen to be default output file of Linux kernel build make uImage (output is uImage). So, replace uImage.beagle with uImage Signed-off-by: Nishanth Menon <[email protected]>
2013-07-26omap3_beagle: remove JFFS2 support.Nishanth Menon
We do not use JFFS2 by default and it conflicts with CONFIG_CMD_FS_GENERIC (ls command is the same). Since most of our BOOTCMD can be simplified by using the FS_GENERIC, dropping JFFS2 Signed-off-by: Nishanth Menon <[email protected]> Acked-by: Joel Fernandes <[email protected]>
2013-07-26ARM: DRA7xx: Enable CPSW Ethernet supportMugunthan V N
Enabling CPSW Ethernet support in DRA7xx EVM. Signed-off-by: Mugunthan V N <[email protected]>
2013-07-26drivers: net: cpsw: remove hard coding bd ram for cpswMugunthan V N
BD ram address may vary in various SOC, so removing the hardcoding and passing the same information through platform data Signed-off-by: Mugunthan V N <[email protected]>
2013-07-26am335x_evm: Correct CONFIG_CMD_SPL_WRITE_SIZETom Rini
We use CONFIG_CMD_SPL_WRITE_SIZE when reading/writing the args portion of falcon mode to NAND. Previously it was half the size of the eraseblock which is too small, increase to eraseblock size. Signed-off-by: Tom Rini <[email protected]>
2013-07-26am335x_evm: Update eMMC falcon mode locationsTom Rini
The previous location used for the "args" portion of falcon mode was too small to allow for a device tree to be saved there, so move the location slightly and increase the size. In addition, our previous kernel location was part of the area we set aside for U-Boot itself, so move it up a bit higher. Signed-off-by: Tom Rini <[email protected]> Reviewed-by: Peter Korsgaard <[email protected]>
2013-07-26am335x_evm: Correct DFU ALT settings for falcon modeTom Rini
Now that we have falcon mode enabled, the partiton numbers for NAND have changed, and we need to list entries for updating these parts of the system. While adding falcon mode entires for eMMC (raw), we round up the limit on U-Boot for ease of math later. Signed-off-by: Tom Rini <[email protected]> Reviewed-by: Peter Korsgaard <[email protected]>
2013-07-26mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6xFabio Estevam
mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier. Tested booting a mainline device tree kernel on a mx6qsabrelite board. Signed-off-by: Fabio Estevam <[email protected]>
2013-07-25powerpc/ppc4xx: Remove CONFIG_SYS_FLASH_PROTECTION from gdsys boardsDirk Eibach
CONFIG_SYS_FLASH_PROTECTION was active on most gdsys boards by default, while hardware flash protection was not implemented. Hardware support was added recently and we get into trouble because backward compatibility is broken (u-boot can't unprotect the protected flash after a downgrade). So we decided to disable hardware flash protection for all our boards. Signed-off-by: Dirk Eibach <[email protected]> Signed-off-by: Stefan Roese <[email protected]>
2013-07-25powerpc/ppc4xx: Support gdsys multichannel iocon hardwareDirk Eibach
Signed-off-by: Dirk Eibach <[email protected]> Signed-off-by: Stefan Roese <[email protected]>
2013-07-25powerpc/ppc4xx: Use generic accessor functions for gdsys FPGADirk Eibach
A set of accessor functions was added to be able to access not only memory mapped FPGA in a generic way. Thanks to Wolfgang Denk for getting this sorted properly. Signed-off-by: Dirk Eibach <[email protected]> Signed-off-by: Stefan Roese <[email protected]>
2013-07-25Merge branch 'u-boot/master' into u-boot-arm/masterAlbert ARIBAUD
2013-07-25Merge branch 'master' of git://git.denx.de/u-boot-nds32Tom Rini
2013-07-25qemu-malta: Update for SPDX license identifiersTom Rini
Signed-off-by: Tom Rini <[email protected]>
2013-07-25Merge branch 'master' of git://git.denx.de/u-boot-mipsTom Rini
Conflict over SPDX changes means that one change was effectively dropped as it was fixing typos in a removed hunk of text. Conflicts: arch/mips/cpu/mips64/start.S Signed-off-by: Tom Rini <[email protected]>
2013-07-25highbank: enable keyed autoboot stopRob Herring
Restrict autoboot interruption to "s" or "d" keys. This will prevent some unwanted stopping and also allow disabling the reset on command timeout. Signed-off-by: Rob Herring <[email protected]>
2013-07-25ARM: highbank: setup peripherals based on power domain statusRob Herring
Accessing powered down peripherals will hang the bus, so check power domain status before initializing SATA and fixup the FDT to disable unused peripherals. Signed-off-by: Rob Herring <[email protected]>
2013-07-25ARM: highbank: enable reset on command timeoutRob Herring
Enable resetting on command timeout. The timeout is set with environment setting bootretry. Signed-off-by: Rob Herring <[email protected]>
2013-07-25ARM: highbank: update config optionsRob Herring
Various changes to highbank config: Enable EFI partitions Enable ext4 and FAT filesystems Enable bootz command and raw initrd Increase cmd and print buffer size to 1K Change serial baudrate to 115200 Enable hush shell Signed-off-by: Rob Herring <[email protected]>
2013-07-24MIPS: qemu-malta: bring up ethernetGabor Juhos
Qemu emulates a PCNET PCI card for the Malta CoreLV board. Enable the pcnet driver and add board specific ethernet initialization function to bring it up. Also enable the CONFIG_CMD_NET and CONFIG_CMD_PING options. Signed-off-by: Gabor Juhos <[email protected]> Cc: Daniel Schwierzeck <[email protected]>
2013-07-24MIPS: qemu-malta: add PCI supportGabor Juhos
Qemu emulates the Galileo GT64120 System Controller which provides a CPU bus to PCI bus bridge. The patch adds driver for this bridge and enables PCI support for the emulated Malta board. Signed-off-by: Gabor Juhos <[email protected]> Cc: Daniel Schwierzeck <[email protected]>
2013-07-24MIPS: qemu-malta: enable flash supportGabor Juhos
Signed-off-by: Gabor Juhos <[email protected]> Cc: Daniel Schwierzeck <[email protected]>
2013-07-24MIPS: qemu-malta: add support for emulated MIPS Malta boardGabor Juhos
Add minimal support for the MIPS Malta CoreLV board emulated by Qemu. The only supported peripherial is the UART. This is enough to boot U-Boot to the command prompt both in little and big endian mode. Signed-off-by: Gabor Juhos <[email protected]> Cc: Daniel Schwierzeck <[email protected]>
2013-07-24MIPS: import gt64120.h header from LinuxGabor Juhos
The Linux specific register access macros, the extern function declarations and the UL suffixes has been removed. The header file will be used for the qemu-malta board. Signed-off-by: Gabor Juhos <[email protected]> Cc: Daniel Schwierzeck <[email protected]>