summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'Albert ARIBAUD2013-08-17-1018/+443
|\
| * Merge git://git.denx.de/u-boot-armStefano Babic2013-07-31-14767/+3405
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>
| * | mx6qsabresd: Add splash screen support via HDMIPardeep Kumar Singla2013-07-27-1/+21
| | | | | | | | | | | | Signed-off-by: Pardeep Kumar Singla <b45784@freescale.com>
| * | mx6: Factor out common HDMI setup codePardeep Kumar Singla2013-07-27-0/+2
| | | | | | | | | | | | | | | | | | | | | Instead of duplicating HDMI setup code for every mx6 board, factor out the common code Signed-off-by: Pardeep Kumar Singla <b45784@freescale.com> Acked-By: Eric Nelson <eric.nelson@boundarydevices.com>
| * | mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6xFabio Estevam2013-07-26-298/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <fabio.estevam@freescale.com>
| * | wandboard: Use splash image at screen center by defaultOtavio Salvador2013-07-24-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
| * | ARM: mxs: Consolidate configuration optionsMarek Vasut2013-07-24-732/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull all the duplicate configuration options into configs/mxs.h from the board configuration files. This reduces the files greatly and makes them somewhat more readable. Besides, we do no longer have such a horrible duplication of code. Note that the mx23evk grew in size slightly. This is due to the CONFIG_SYS_CBSIZE now being set to 1024 as it is on the rest of MXS systems. This patch also fixes the OCRAM size for i.MX23. The i.MX23 has only 32kB of OCRAM, while i.MX28 has 128kB of OCRAM. I verified the configuration didn't change for each of the boards, but I didn't boot-test it on the boards I do not have. I configured U-Boot for each board using the "make ... <board>_config" command and then ran "cpp -I include -dM include/config.h" , which dumped all the configuration options. I did this both before and after this patch and finally compared the results for each MXS board. Actually, the results do differ slightly, since the configs/mxs.h file now properly includes the correct iomux-mx23.h or iomux-mx28.h , so while comparing, I had to ignore these new defines. These have no impact on U-Boot configuration though. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Lauri Hintsala <lauri.hintsala@bluegiga.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Stefano Babic <sbabic@denx.de>
* | | Add TI816X evm board supportTENART Antoine2013-08-15-0/+180
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com> [trini: Change to SPDX, fix a few compiler warnings, adapt to CONFIG_OMAP_COMMON] Signed-off-by: Tom Rini <trini@ti.com>
* | | arm, da850: add ipam390 board supportHeiko Schocher2013-08-15-0/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the am1808 based ipam390 board from Barix. - 128MByte, DDR2, synchronous RAM 16bit databus to SDRAM interface - 128MByte, NAND Flash, 8bit databus to the NANDFlash Interface - Ethernet PHY Micrel KSZ8051R via RMII - Console on UART 0 - booting fron nand flash - spl falcon bootmode Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com>
* | | bootstage: get more BOOTSTAGE_ID* in show_boot_progress()Heiko Schocher2013-08-15-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case CONFIG_BOOTSTAGE is not defined, call from bootstage_mark_name() show_boot_progress(), so get more BOOTSTAGE_ID* ids in show_boot_progress() if CONFIG_BOOTSTAGE is not defined. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Acked-by: Simon Glass <sjg@chromium.org>
* | | TI:armv7: Enable CONFIG_CMD_GPIOTom Rini2013-08-15-0/+1
| | | | | | | | | | | | | | | | | | | | | Add the generic "poke a GPIO" command, with the GPIO related defines. Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
* | | TI:armv7: Enable CONFIG_CMD_SPITom Rini2013-08-15-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add the generic "poke the SPI bus" command, with the SPI related defines. Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
* | | TI:omap5/dra7xx: Convert to ti_armv7_common.hTom Rini2013-08-15-177/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update omap5_common.h to use ti_armv7_common.h, and in turn update dra7xx_evm.h and omap5_uevm.h slightly. The biggest changes here are that IP blocks which exist on the platform, and had clocks enabled, now have the drivers being built as well. Signed-off-by: Tom Rini <trini@ti.com>
* | | TI:am33xx: Create common config files for TI ARMv7 platforms, and AM33xxTom Rini2013-08-15-218/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We create two new files, include/configs/ti_armv7_common.h for all of the common IP blocks and related features / commands we share in virtually all of our platforms. We then create include/configs/ti_am335x_common.h for everything common to the am335x SoC leaving just the board specific parts to include/configs/ti_am335x_common.h. Signed-off-by: Tom Rini <trini@ti.com>
* | | am335x_evm: Bring in 'boot_fdt' logic from i.MXTom Rini2013-08-15-5/+16
| | | | | | | | | | | | | | | | | | | | | Bring in the 'boot_fdt' environment variable that i.MX boards use to try and load a device tree when booting. Signed-off-by: Tom Rini <trini@ti.com>
* | | am335x_evm: Use default baud rate tableTom Rini2013-08-15-2/+0
| | | | | | | | | | | | Signed-off-by: Tom Rini <trini@ti.com>
* | | am33xx: Stop using PHYS_DRAM_1 defineTom Rini2013-08-15-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | We defined PHYS_DRAM_1 to 0x80000000 (start of DRAM) and then used this for CONFIG_SYS_SDRAM_BASE. But then we kept on referencing PHYS_DRAM_1 in other places. Change to directly setting CONFIG_SYS_DRAM_BASE and then using that name in code. Signed-off-by: Tom Rini <trini@ti.com>
* | | am33xx: CONFIG_DMA_COHERENT defines are unused, removeTom Rini2013-08-15-10/+0
| | | | | | | | | | | | | | | Acked-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: Tom Rini <trini@ti.com>
* | | OMAP3: igep00x0: allow booting with a FDT from MMCJavier Martinez Canillas2013-08-15-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IGEP boards now have Device Tree support in the mainline kernel. To boot an IGEP board using a DT, a uEnv.txt plain text file could be used to define a custom uenvcmd that will be run by the default boot command. It is more convenient to change the default boot command to allow loading a FDT if it is stored in the boot dir of the rootfs uSD/MMC partition. If no FDT is found then the defaul command tries to boot a zImage without a DT using legacy boot. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
* | | ARM: igep00x0.h: Enable the use of CMD_EXT4, CMD_FS_GENERIC and zImage.Enric Balletbo i Serra2013-08-15-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Able to load the kernel from some form of ext[234] or FAT. Also, with v3.9 and later of the Linux Kernel, uImage isn't builtable anymore by default, so we should switch to use the bootz command. Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
* | | ARM: IGEP0033: Remove duplicate / unused #defines.Enric Balletbo i Serra2013-08-15-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As config was originally based on am335x_evm.h we have also some duplicate / unnused #defines. Commit 15191c91 removed these #defines on various AM335x boards but not for IGEP COM AQUILA. This patch simply removes them for this board. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
* | | ARM: IGEP0033: Add support to boot from NAND.Enric Balletbo i Serra2013-08-15-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to the default environment the possibily to boot from NAND using a ubi rootfs. Also the partition scheme is set as follows: Start Size SPL : 0x00000000 0x00080000 (512KiB) U-Boot : 0x00080000 0x00100000 (1MiB) U-Boot Env : 0x00180000 0x00020000 (128KiB) File System : 0x001C0000 - The ubiboot script gets the kernel and the dtb file from the boot directory of the File System. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
* | | ARM: IGEP0033: Add support for Flattened Device Tree.Enric Balletbò i Serra2013-08-15-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, the default kernel to boot the IGEP COM AQUILA is device tree based. As old kernel is deprecated we should adapt the boot commands to use DTB files. Also, with v3.9 and later of the Linux Kernel, uImage isn't builtable anymore by default, so we should switch to use the bootz command. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
* | | ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTESTEnric Balletbo i Serra2013-08-15-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit: 79cd2f814b1c75efd47161ac27f4cbebf768240f config_cmd_default.h: Remove CONFIG_CMD_MEMTEST It's not necessary to undef the CONFIG_CMD_MEMTEST, so we can remove it from configuration file. Signed-off-by: Enric Balletbo i Serra <eballetbo@iseebcn.com> Reviewed-by: Javier Martinez Canillas <javier@dowhile0.org>
* | | ARM: AM43xx: Add config fileLokesh Vutla2013-08-15-0/+135
| | | | | | | | | | | | | | | | | | Add config file Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
* | | ARM: OMAP: Add CONFIG_OMAP_COMMONLokesh Vutla2013-08-15-0/+25
| |/ |/| | | | | | | | | | | Adding a new CONFIG_OMAP_COMMON which is included by all boards that needs to build cpu/armv7/omap-common folder. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
* | gpio: omap5-uevm: Configure the tca6424 gpio expanderDan Murphy2013-07-30-0/+5
| | | | | | | | | | | | | | 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/+69
| | | | | | | | | | | | | | | | | | Add the tca642x gpio expander driver Datasheet: http://www.ti.com/product/tca6424a Signed-off-by: Dan Murphy <dmurphy@ti.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>
* | 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-19/+32
| | | | | | | | | | | | | | | | | | | | 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>
* | am335x_evm: Add support to boot from NOR.Steve Kipisz2013-07-30-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+28
| | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* | 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>
* | 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>
* | drivers: net: cpsw: remove hard coding bd ram for cpswMugunthan V N2013-07-26-0/+1
| | | | | | | | | | | | | | 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: 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>
* | Merge branch 'u-boot/master' into u-boot-arm/masterAlbert ARIBAUD2013-07-25-14693/+3111
|\ \
| * \ Merge branch 'master' of git://git.denx.de/u-boot-nds32Tom Rini2013-07-25-3/+121
| |\ \
| | * | nds32: Enable the function of passing parameters to Linuxken kuo2013-07-24-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.1 at 2024-12-16 12:57:49 +0000