summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2012-09-29Merge remote-tracking branch 'u-boot-imx/master'Albert ARIBAUD
2012-09-27Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini
2012-09-27ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORKTom Rini
- Convert the non-relocation part of board_init_f to spl_board_init, turn on CONFIG_SPL_BOARD_INIT in the configs. - Remove duplicated code. - Add spl_boot_device() that returns the statically chosen boot device. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to common/splTom Rini
We move the spl_nand_load_image function to common/spl. This will allow for easier integration of SPL-boots-Linux code on other arches. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27SPL: Create arch/arm/lib/spl.c for board_init_f and jump_to_image_linuxTom Rini
In SPL (CONFIG_SPL_FRAMEWORK) board_init_f must setup the stack pointer, clear the BSS and call board_init_r. We mark this as weak as some platforms may need to perform additional initalization at this point. We provide a gd that we know will be in a usable location, once the BSS has been cleared to help with this as well. Finally, we no longer call relocate_code so remove that from the armv7 version. Next, both board_init_f and jump_to_image_linux are going to be inherently arch-specific, so move these versions to arch/arm/lib/spl.c Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27SPL: Move the omap SPL framework to common/splTom Rini
Add a new flag, CONFIG_SPL_FRAMEWORK to opt into the common/spl SPL framework, enable on all of the previously using boards. We move the spl_ymodem.c portion to common/ and spl_mmc.c to drivers/mmc/. We leave the NAND one in-place as we plan to replace it later in this series. We use common/spl to avoid linker problems with respect to merging constant strings in objects. Otherwise all strings in common/ will be linked in and kept which grows SPL in size too much. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Move gpmc_init() to spl_board_init()Tom Rini
This is an OMAP/related-specific function, move calling it to spl_board_init() and turn on CONFIG_SPL_BOARD_INIT on the boards that enabled NAND and didn't enable this already. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Start hooking in the current SPI SPL supportTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Clean up spl.c / spl_nand.c slightlyTom Rini
- Remove includes we don't need - Switch some printf statements to puts - Convert some printf statements to debug, introduce new puts statements - In most cases saying just "No mkimage signature, assuming u-boot.bin" or similar is sufficient. This also means the non-DEBUG case doesn't need printf, in the core of SPL. - The other case here is that PLAIN_VERSION provided what we wanted already, so just use it. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Make spl_mmc.c more genericTom Rini
Move the default omap/related-centric board_mmc_init to arch/arm/cpu/armv7/omap-common/boot-common.c and move the type defines to <asm/spl.h>. Also use mmc->read_bl_len rather than MMCSD_SECTOR_SIZE Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h>Tom Rini
Move the SPL prototypes from <asm/omap_common.h> into <asm/spl.h> and add <asm/arch/spl.h> for arch specific portions of CONFIG_SPL_FRAMEWORK. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Only call mem_malloc_init if configuredTom Rini
We can only attempt to setup a malloc pool if CONFIG_SYS_SPL_MALLOC_START is defined, and not all boards require it. Make the call depend on the define. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.cTom Rini
This detection code doesn't (and can't) do anything currently, so remove. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Rename omap_boot_mode to spl_boot_mode()Tom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27ARM: SPL: Rename omap_boot_device to spl_boot_deviceTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27omap-common: SPL: Fix whitespace in omap-common/u-boot-spl.lds.Pavel Machek
Signed-off-by: Pavel Machek <pavel@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27omap-common: Fix typo in save_boot_params() in lowlevel_init.STom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print()Tom Rini
Only omap4/5 currently have a meaningful set of display text and overo had been adding a function to display nothing. Change how this works to be opt-in and only turned on for omap4/5 now. Signed-off-by: Tom Rini <trini@ti.com>
2012-09-27spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORTTom Rini
Signed-off-by: Tom Rini <trini@ti.com>
2012-09-26malloc: remove extern declarations of malloc_bin_reloc() in board.c filesDaniel Schwierzeck
Declare malloc_bin_reloc() in malloc.h and remove all extern declarations in various board.c files to get rid of one checkpatch.pl warning. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> Cc: Wolfgang Denk <wd@denx.de> Cc: Andreas Bießmann <andreas.devel@gmail.com> Cc: Jason Jin <Jason.jin@freescale.com> Cc: Macpaul Lin <macpaul@andestech.com> Cc: Daniel Hellstrom <daniel@gaisler.com> Acked-by: Andreas Bießmann <andreas.devel@gmail.com>
2012-09-25ARM: arm1176: Define arch_cpu_init() at the SoC levelStephen Warren
Commit 86c6326 "ARM: arm1176: enable instruction cache in arch_cpu_init()" defined arch_cpu_init() in a file that is shared across all arm1176 SoCs. tnetv107x already implemented this function, which caused linking to break. Move the new conflicting arch_cpu_init() into arm1176/bcm2835/init.c so that it doesn't conflict; grep indicates this function is usually defined at the SoC-level, not the CPU-level, at least for ARM. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Acked-by: Marek Vasut <marex@denx.de>
2012-09-25Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini
2012-09-25MCI: add MCI1 pin muxingNicolas Ferre
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2012-09-25MCI: modify pin muxing for MCI0Nicolas Ferre
- remove internal pull-ups on data and CMD: they are not needed as pull-ups are add on board. - add MCI power switch on PIO Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2012-09-25gmac: modify pin muxing to comply with RGMIINicolas Ferre
RGMII is unsed on CM board: some PIO are not needed and are used for other things. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2012-09-25GMAC: correct the error when configure gmacBo Shen
2012-09-25PIO3: add definitions for SAM9x5Josh Wu
2012-09-25PIO: align the micro name with mainline u-bootBo Shen
Signed-off-by: Bo Shen <voice.shen@atmel.com> [fix Conflicts] Signed-off-by: Josh Wu <josh.wu@atmel.com>
2012-09-25PMECC: enable SAMA5 PMECC supportBo Shen
Signed-off-by: Bo Shen <voice.shen@atmel.com> [merge with mainline pmecc] Signed-off-by: Josh Wu <josh.wu@atmel.com>
2012-09-25SAMA5: add function definition to avoid compiling warningBo Shen
2012-09-25SMC: Add timings configuration for NANDBo Shen
2012-09-25PMC: correct the error of the peripheral clock enable functionBo Shen
2012-09-25Clock: clear the clock.c fileBo Shen
2012-09-25USART: correct the pin of US0 and US2Bo Shen
2012-09-25LCD: move lcd pin configuration to devices c fileBo Shen
2012-09-25PMC: rework the peripheral clock enable methodBo Shen
2012-09-25MMC: enable MMC support in u-bootBo Shen
2012-09-25SAMA5: Add function to distinguish CPU typeBo Shen
LCDC: using has_lcdc() function to avoid error register NET: using has_emac() and has_gmac to avoid error register
2012-09-25SPI Flash: Enable serial flashBo Shen
2012-09-25SAMA5: add mach type id (for temporary)Josh Wu
Use the same ID as SAM9X5. Do not propagate upstream.
2012-09-25SAMA5: Add SAMA5 supportBo Shen
Signed-off-by: Bo Shen <voice.shen@atmel.com> [fix conflicts, not use 9X5's mach type code.] Signed-off-by: Josh Wu <josh.wu@atmel.com>
2012-09-24dm: net: Move IXP NPE to drivers/net/Marek Vasut
Signed-off-by: Marek Vasut <marex@denx.de> Cc: Bryan Hundven <bryanhundven@gmail.com> Cc: Michael Schwingen <rincewind@discworld.dascon.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: U-Boot DM <u-boot-dm@lists.denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com>
2012-09-24i.MX: shut down video before launch of O/SEric Nelson
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
2012-09-23mx51evk: Add CONFIG_REVISION_TAGBenoît Thébaudeau
FSL 2.6.35 kernel assumes that the bootloader passes the CONFIG_REVISION_TAG information. If this data is not present, the kernel misconfigures the TZIC, which results in the timer interrupt handler never being called, so the kernel deadlocks while calibrating its delay. Suggested-by: Greg Topmiller <Greg.Topmiller@jdsu.com> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <festevam@gmail.com> Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
2012-09-21Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini
2012-09-21Merge remote-tracking branch 'u-boot-imx/master'Albert ARIBAUD
2012-09-20Flex bus definition update for Coldfire 5253.Jason Jin
originally work by Jate Sujjavanich <jsujjavanich@syntech-fuelmaster.com> ---- The defines in arch/m68k/include/coldfire/flexbus.h are not compatible with the 5235 processor. The registers in struct fbcs are different sizes from those in the 5235. Also, the defines are a little different. This is what I have so far. Comments? ---- Reformat the patch manually by Jason Jin Signed-off-by: Jate Sujjavanich <jsujjavanich@syntech-fuelmaster.com> Signed-off-by: Jason Jin <Jason.jin@freescale.com>
2012-09-20ColdFire: Queued SPI driverRichard Retanubun
This patch adds a driver for Freescale Colfire Queued SPI bus. Coded to work with 8 bits per transfer to use with SPI flash. CPOL, CPHA, and CS_ACTIVE_HIGH can be configured. Tested with MCF5270 which have 4 chip selects. Activate by #define CONFIG_CF_QSPI in board config. Signed-off-by: Richard Retanubun <richardretanubun@ruggedcom.com>
2012-09-20ColdFire: Clean up checkpatch warnings for MCF54451 and MCF54455Alison Wang
Signed-off-by: Alison Wang <b18965@freescale.com>
2012-09-20ColdFire: Clean up checkpatch warnings for MCF547x and MCF548xAlison Wang
Signed-off-by: Alison Wang <b18965@freescale.com>
generated by cgit v1.2.3 (git 2.0.4) at 2024-07-01 05:01:34 +0000