summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge git://git.denx.de/u-boot-armStefano Babic2013-07-31-95031/+13229
|\ | | | | | | | | | | | | | | | | Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>
| * gpio: omap5-uevm: Configure the tca6424 gpio expanderDan Murphy2013-07-30-0/+29
| | | | | | | | | | | | | | Configure the tca6424 gpio expander This allows use of the debug and tri color LEDs. Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * gpio: tca642x: Add the tca642x gpio expander driverDan Murphy2013-07-30-0/+403
| | | | | | | | | | | | | | | | | | Add the tca642x gpio expander driver Datasheet: http://www.ti.com/product/tca6424a Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * am335x_evm: Add am335x_boneblack variantJustin Waters2013-07-30-0/+1
| | | | | | | | | | | | | | | | The BeagleBone Black differs from the other AM335x boards in a few significant ways, so it makes sense to create a custom configuration for it. In particular, it uses eMMC instead of NAND flash. Signed-off-by: Justin Waters <justin.waters@timesys.com>
| * am335x_evm: Add support for eMMC environmentJustin Waters2013-07-30-1/+6
| | | | | | | | | | | | | | | | | | 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 <justin.waters@timesys.com>
| * Add additional MLO images to .gitignoreJustin Waters2013-07-30-1/+1
| | | | | | | | | | | | This rule catches images such as MLO.byteswap Signed-off-by: Justin Waters <justin.waters@timesys.com>
| * am335x_evm: Rework bootcmd to handle two MMC devsJustin Waters2013-07-30-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <justin.waters@timesys.com>
| * am335x_evm: Add command line editingJustin Waters2013-07-30-0/+3
| | | | | | | | | | | | | | | | | | 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 <justin.waters@timesys.com>
| * am335x_evm: Make NAND support modularJustin Waters2013-07-30-20/+33
| | | | | | | | | | | | | | | | | | | | 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 <justin.waters@timesys.com> [trini: Make apply on top of other series] Signed-off-by: Tom Rini <trini@ti.com>
| * net, phy, cpsw: fix gigabit register accessHeiko Schocher2013-07-30-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | accessing a lan9303 switch with the cpsw driver results in wrong speed detection, as the switch sets the BMSR_ERCAP in BMSR register, and follow read of the MII_STAT1000 register fails, as the switch does not support it. Current code did not check, if a phy_read() fails ... fix this. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Joe Hershberger <joe.hershberger@gmail.com> Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
| * board/ti/am335x/README: Document NOR programmingTom Rini2013-07-30-0/+23
| | | | | | | | | | | | | | The Beaglebone White may be populated with a memory cape that has a NOR module. Document how to program it. Signed-off-by: Tom Rini <trini@ti.com>
| * am335x_evm: Add support to boot from NOR.Steve Kipisz2013-07-30-11/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <albert.u.boot@aribaud.net> Signed-off-by: Steve Kipisz <s-kipisz2@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
| * am335x_evm: Add support for the NOR module on the memory capeSteve Kipisz2013-07-30-0/+108
| | | | | | | | | | | | | | | | | | | | | | 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 <s-kipisz2@ti.com> [trini: Clean up config changes slightly] Signed-off-by: Tom Rini <trini@ti.com>
| * am33xx: Correct gpmc_cfg->irqstatus/enableTom Rini2013-07-30-2/+2
| | | | | | | | | | | | | | | | Based on our usage of the GPMC, either with NOR or NAND we do not need to be setting the irqstatus or irqenable bits and should clear them like we have historically. Signed-off-by: Tom Rini <trini@ti.com>
| * am335x_evm: Rework board_is_foo() checksTom Rini2013-07-30-58/+63
| | | | | | | | | | | | | | | | | | | | We rework the various board_is_foo() checks to take a pointer to struct am335x_baseboard_id rather than using a local copy in board.c. This allows us to make use of the same checks in mux.c as well as fixing problems when this code could be running from read-only memory. Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Tom Rini <trini@ti.com>
| * am335x_evm: Update SPI_BOOT support, add MTDPARTS infoTom Rini2013-07-30-21/+26
| | | | | | | | | | | | | | | | | | | | | | - 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 <jacmet@sunsite.dk> Signed-off-by: Tom Rini <trini@ti.com>
| * am335x_evm: Drop useless CONFIG_ENV_IS_NOWHERETom Rini2013-07-30-4/+0
| | | | | | | | | | | | | | | | We always set a CONFIG_ENV_IS_...somewhere... so drop the initial define of NOWHERE. Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Tom Rini <trini@ti.com>
| * board/ti/am335x/README: Document NAND programmingTom Rini2013-07-30-0/+24
| | | | | | | | | | | | | | The AM335x GP EVM ships with NAND. Document programming of the chip including the redundant locations that the ROM will check. Signed-off-by: Tom Rini <trini@ti.com>
| * omap3_beagle: support booting from zImage and device tree as last optionNishanth Menon2013-07-26-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <nm@ti.com>
| * omap3_beagle: support findfdt and loadfdt for devicetree supportNishanth Menon2013-07-26-0/+15
| | | | | | | | | | | | | | | | | | | | 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 <nm@ti.com>
| * omap3_beagle: enable CMD_FS_GENERIC and simplify load of image/ramdiskNishanth Menon2013-07-26-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <nm@ti.com>
| * beagleboard: remove RevB support for BeagleBoard XmNishanth Menon2013-07-26-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | As reported in http://marc.info/?l=u-boot&m=137358037827735&w=2 There is no need for the "xMB" variant, as the gpio pins used for identification where never changed from the xMA when the newer silcon was used for the xMB, So rename XM A revision as AB revision and report accordingly Reported-by: Robert Nelson <robertcnelson@gmail.com> Signed-off-by: Nishanth Menon <nm@ti.com>
| * omap3_beagle: replace uImage.beagle with generic uImageNishanth Menon2013-07-26-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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 <nm@ti.com>
| * omap3_beagle: remove JFFS2 support.Nishanth Menon2013-07-26-8/+0
| | | | | | | | | | | | | | | | | | 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 <nm@ti.com> Acked-by: Joel Fernandes <joelf@ti.com>
| * ARM: DRA7xx: Enable CPSW Ethernet supportMugunthan V N2013-07-26-0/+19
| | | | | | | | | | | | Enabling CPSW Ethernet support in DRA7xx EVM. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
| * ARM: DRA7xx: Add CPSW and MDIO pinmux supportMugunthan V N2013-07-26-0/+14
| | | | | | | | | | | | Adding CPSW Slave 0 and MDIO pinmux support for DRA7xx EVM Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
| * ARM: DRA7xx: Add CPSW support to DRA7xx EVMMugunthan V N2013-07-26-5/+185
| | | | | | | | | | | | Adding support for CPSW Ethernet support found in DRA7xx EVM Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
| * ARM: DRA7xx: Enable GMAC clock controlMugunthan V N2013-07-26-1/+12
| | | | | | | | | | | | Enabling CPSW module by enabling GMAC clock control Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
| * ARM: DRA7xx: Lock DPLL_GMACLokesh Vutla2013-07-26-0/+32
| | | | | | | | | | | | | | | | | | Locking DPLL_GMAC [mugunthanvnm@ti.com:Configure only if CPSW is selected] Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
| * drivers: net: cpsw: Enable statistics for all portMugunthan V N2013-07-26-0/+1
| | | | | | | | | | | | Enable hardware statistics for all ports, enabling only to host port is useless Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
| * drivers: net: cpsw: remove hard coding bd ram for cpswMugunthan V N2013-07-26-3/+4
| | | | | | | | | | | | | | 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 <mugunthanvnm@ti.com>
| * am335x_evm: Add basic READMETom Rini2013-07-26-0/+113
| | | | | | | | | | | | | | | | | | Add a README for the family of boards the am335x_evm covers, and include instructions on preparing and using falcon mode, for various media. Signed-off-by: Tom Rini <trini@ti.com> Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
| * am335x_evm: Correct CONFIG_CMD_SPL_WRITE_SIZETom Rini2013-07-26-1/+1
| | | | | | | | | | | | | | | | 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 <trini@ti.com>
| * am335x_evm: Update eMMC falcon mode locationsTom Rini2013-07-26-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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 <trini@ti.com> Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk>
| * am335x_evm: Correct DFU ALT settings for falcon modeTom Rini2013-07-26-3/+8
| | | | | | | | | | | | | | | | | | | | 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 <trini@ti.com> Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk>
| * README.falcon: Note how we determine if we can boot the OS or notTom Rini2013-07-26-0/+2
| | | | | | | | | | Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Tom Rini <trini@ti.com>
| * omap3/sys_info: fix printout of OMAP36XX L3 freqencyAndreas Bießmann2013-07-26-3/+3
| | | | | | | | | | | | | | | | | | The OMAP36xx/OMAP37xx family uses L3 frequency of 200MHz instead of 165MHz used by OMAP34xx/OMAP35xx. Also fix checkpatch warning about alignment. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| * spl_mmc.c: Detect missing kernel image in RAW MMCTom Rini2013-07-26-0/+4
| | | | | | | | | | | | | | | | | | Currently, we assume that if we can read from MMC correctly, we have found a valid image. This is not the case as an empty area will read just fine. Add a check for a valid IH_MAGIC. Signed-off-by: Tom Rini <trini@ti.com> Reviewed-by: Peter Korsgaard <jacmet@sunsite.dk>
| * da850evm: Use clrbits function with correct endianessChristian Riesch2013-07-26-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | The current code uses clrbits_be32 which is incorrect since we are on a little endian machine here. This patch fixes this issue and also removes some unnecessary code: Reading the current GPIO bank state is not required if we are using the SET and CLEAR GPIO registers for setting/clearing bits. Signed-off-by: Christian Riesch <christian.riesch@omicron.at> Cc: Nagabhushana Netagunte <nagabhushana.netagunte@ti.com> Cc: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
| * arm: omap3: spl: Fix problem with 8bit NAND devicesStefan Roese2013-07-26-0/+12
| | | | | | | | | | | | | | | | Currently in OMAP3 SPL, the GPMC for NAND is configured for 16bit access. This patch adds support for 8bit NAND devices as well. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Tom Rini <trini@ti.com>
| * Merge branch 'u-boot/master' into u-boot-arm/masterAlbert ARIBAUD2013-07-25-94824/+11753
| |\
| | * Merge branch 'master' of git://git.denx.de/u-boot-nds32Tom Rini2013-07-25-43/+384
| | |\
| | | * nds32: Enable FPU if the version of CPU supportedken kuo2013-07-25-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some version of Andes core support FPU coprocessor, if this is the case, and toolchain support FPU instruction set, we should enable it at low level initialization time. Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com> Cc: Macpaul Lin <macpaul@gmail.com>
| | | * nds32: Update <asm/io.h> and <asm/setup.h> with SPDX license identifiersTom Rini2013-07-25-6/+2
| | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
| | | * nds32: Convert Makefiles to use COBJS-y styleken kuo2013-07-25-21/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com> Cc: Macpaul Lin <macpaul@gmail.com>
| | | * nds32: ag101/ag102: Fix setting lastdec and now valuesAxel Lin2013-07-24-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timer3 counter unit for lastdesc and now values are inconsistent in current code. The unit of "readl(&tmr->timer3_counter) / (CONFIG_SYS_CLK_FREQ / 2)" is second. However, CONFIG_SYS_HZ is defined as 1000 in board config file. This means the accuracy of "lastdec" and "now" should be in millisecond, thus fix the equation to set lastdec and now variables accordingly. Signed-off-by: Axel Lin <axel.lin@ingics.com>
| | | * nds32: Enable the function of passing parameters to Linuxken kuo2013-07-24-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a header file, setup.h, which copy from Linux source code, this file contain structures are used to pass initialisation parameters to Linux. Enable this function on adp-ag101/adp-ag101p target Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com> Cc: Macpaul Lin <macpaul@gmail.com>
| | | * nds32: Enable SDIO and EXT2 command support for Andes boardken kuo2013-07-24-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com> Cc: Macpaul Lin <macpaul@gmail.com>
| | | * nds32: Enable two banks of SDRAM on Andes boardken kuo2013-07-24-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original adp-ag101/adp-ag101p initialize only one bank(64MB) by default at boot time, but it is not enough for some application, so increasing to two banks(128M). Signed-off-by: Kuan-Yu Kuo <ken.kuoky@gmail.com> Cc: Macpaul Lin <macpaul@gmail.com>
| | | * nds32: adp-ag102: use 'faraday/ftpci100.h' for pci_ftpci_initGabor Juhos2013-07-24-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to improper external function declaration, building U-Boot for the adp-ag102 board shows this warning: adp-ag102.c: In function 'pci_init_board': adp-ag102.c:95: warning: function declaration isn't a prototype Include the 'faraday/ftpci100.h' header which provides the proper declaration and remove the local declaration to get rid of the warning. Compile tested only. Cc: Macpaul Lin <macpaul@andestech.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
generated by cgit v1.1 at 2024-11-19 11:46:29 +0000