]> git.sur5r.net Git - u-boot/log
u-boot
10 years agoARM: IXP: Remove actux1 board
Marek Vasut [Mon, 27 Jan 2014 23:04:58 +0000 (00:04 +0100)]
ARM: IXP: Remove actux1 board

The board is unmaintained, just like the rest of the IXP.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Michael Schwingen <michael@schwingen.org>
Cc: Tom Rini <trini@ti.com>
10 years agoMerge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 29 Jan 2014 13:07:50 +0000 (14:07 +0100)]
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

10 years agoMerge branch 'u-boot-arm/next' into 'u-boot-arm/master'
Albert ARIBAUD [Tue, 28 Jan 2014 10:25:28 +0000 (11:25 +0100)]
Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'

10 years agoboards.cfg: Keep the entries sorted
Fabio Estevam [Sat, 25 Jan 2014 20:42:39 +0000 (18:42 -0200)]
boards.cfg: Keep the entries sorted

Run "tools/reformat.py -i -d '-' -s 8 <boards.cfg >boards0.cfg && mv boards0.cfg boards.cfg"
in order to keep the entries sorted.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agoboard_r - fixup functions table after relocation
Alexey Brodkin [Mon, 20 Jan 2014 10:30:39 +0000 (14:30 +0400)]
board_r - fixup functions table after relocation

This is only required for "PIC" relocation and doesn't apply to modern
"PIE" relocation which does data relocation as well as code.

"init_sequence_r" is just an array that consists of compile-time
adresses of init functions. Since this is basically an array of integers
(pointers to "void" to be more precise) it won't be modified during
relocation - it will be just copied to new location as it is.

As a consequence on execution after relocation "initcall_run_list" will
be jumping to pre-relocation addresses. As long as we don't overwrite
pre-relocation memory area init calls are executed correctly. But still
it is dangerous because after relocation we don't expect initially used
memory to stay untouched.

Cc: Tom Rini <trini@ti.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Doug Anderson <dianders@chromium.org>
Cc: Thomas Langer <thomas.langer@lantiq.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
10 years agoarm: am43xx: Add USB spl boot support
Dan Murphy [Thu, 16 Jan 2014 17:23:31 +0000 (11:23 -0600)]
arm: am43xx: Add USB spl boot support

Add the USB host boot support for the am43xx evm
Add the macros to boot from a usb drive in uBoot

Signed-off-by: Dan Murphy <dmurphy@ti.com>
10 years agospl: common: Support for USB MSD FAT image loading
Dan Murphy [Thu, 16 Jan 2014 17:23:30 +0000 (11:23 -0600)]
spl: common: Support for USB MSD FAT image loading

Add SPL support to be able to detect a USB Mass Storage device
connected to a USB host.  Once a USB Mass storage device is detected
the SPL will load the u-boot.img from a FAT partition to target address.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
10 years agospl: common: Move FAT funcs to a common file
Dan Murphy [Thu, 16 Jan 2014 17:23:29 +0000 (11:23 -0600)]
spl: common: Move FAT funcs to a common file

Move the FAT functions to a common location for reuse.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
10 years agopowerpc: mpc5xxx: remove redundant CONFIG_MPC5xxx definition
Masahiro Yamada [Thu, 16 Jan 2014 02:03:07 +0000 (11:03 +0900)]
powerpc: mpc5xxx: remove redundant CONFIG_MPC5xxx definition

We do not have to define CONFIG_MPC5xxx in board config headers
(and start.S) because it is defined in arch/powerpc/cpu/mpc5xxx/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoboard: delete meaningless serial.h
Masahiro Yamada [Wed, 15 Jan 2014 09:00:25 +0000 (18:00 +0900)]
board: delete meaningless serial.h

Delete some serial.h files, whole code in which is surrounded by
  #if 0 ... #endif

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
10 years agosandbox: fix the return type of os_free() function
Masahiro Yamada [Wed, 15 Jan 2014 04:06:41 +0000 (13:06 +0900)]
sandbox: fix the return type of os_free() function

The function os_free() returns nothing.
Its return type should be "void" rather than "void *".

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoARM: merge commonly-defined PLATFORM_RELFLAGS
Masahiro Yamada [Wed, 15 Jan 2014 02:00:45 +0000 (11:00 +0900)]
ARM: merge commonly-defined PLATFORM_RELFLAGS

Before this commit, all arch/arm/cpu/${CPU}/config.mk except ARMv8
had the same option:
$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))

This commit moves it into arch/arm/config.mk.

If the compiler does not support the option,
it is ignored by $(call cc-option,...).
So this commit gives no harm to ARMv8.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc86xx: move CONFIG_MPC86xx definition to CPU config.mk
Masahiro Yamada [Wed, 15 Jan 2014 01:14:21 +0000 (10:14 +0900)]
powerpc: mpc86xx: move CONFIG_MPC86xx definition to CPU config.mk

Define CONFIG_MPC86xx in arch/powerpc/cpu/mpc86xx/config.mk
because all target boards with mpc86xx cpu define it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc85xx: move CONFIG_MPC85xx definition to CPU config.mk
Masahiro Yamada [Wed, 15 Jan 2014 01:14:07 +0000 (10:14 +0900)]
powerpc: mpc85xx: move CONFIG_MPC85xx definition to CPU config.mk

Define CONFIG_MPC85xx in arch/powerpc/cpu/mpc85xx/config.mk
because all target boards with mpc85xx cpu define it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc824x: remove redundant CONFIG_MPC824X definition
Masahiro Yamada [Wed, 15 Jan 2014 01:13:49 +0000 (10:13 +0900)]
powerpc: mpc824x: remove redundant CONFIG_MPC824X definition

We do not have to define CONFIG_MPC824X in board config headers
because it is defined in arch/powerpc/cpu/mpc824x/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc5xx: remove redundant CONFIG_5xx definition
Masahiro Yamada [Wed, 15 Jan 2014 01:13:00 +0000 (10:13 +0900)]
powerpc: mpc5xx: remove redundant CONFIG_5xx definition

We do not have to define CONFIG_5xx in a source file
because it is defined in arch/powerpc/cpu/mpc5xx/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc512x: remove redundant CONFIG_MPC512X definition
Masahiro Yamada [Wed, 15 Jan 2014 01:11:28 +0000 (10:11 +0900)]
powerpc: mpc512x: remove redundant CONFIG_MPC512X definition

We do not have to define CONFIG_MPC512X in board config headers
because it is defined in arch/powerpc/cpu/mpc512x/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc8xx: remove redundant CONFIG_8xx definition
Masahiro Yamada [Tue, 14 Jan 2014 08:26:43 +0000 (17:26 +0900)]
powerpc: mpc8xx: remove redundant CONFIG_8xx definition

We do not have to define CONFIG_8xx in source files
because it is defined in arch/powerpc/cpu/mpc8xx/config.mk

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: mpc83xx: remove redundant CONFIG_MPC83xx definition
Masahiro Yamada [Tue, 14 Jan 2014 08:26:17 +0000 (17:26 +0900)]
powerpc: mpc83xx: remove redundant CONFIG_MPC83xx definition

We do not have to define CONFIG_MPC83xx in board config headers
because it is defined in arch/powerpc/cpu/mpc83xx/config.mk.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agopowerpc: ppc4xx: remove redundant CONFIG_4xx definition
Masahiro Yamada [Tue, 14 Jan 2014 08:24:35 +0000 (17:24 +0900)]
powerpc: ppc4xx: remove redundant CONFIG_4xx definition

We do not have to define CONFIG_4xx in board config headers
because it is defined in arch/powerpc/cpu/ppc4xx/config.mk.

include/configs/JSE.h defines "CONFIG_4x", not "CONFIG_4xx".
I believe it is a typo because "CONFIG_4x" is not used at all
in other files.
So, I also deleted "CONFIG_4x" in include/configs/JSE.h.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoboard: tec-ng: Do not make directories in a board Makefile
Masahiro Yamada [Tue, 14 Jan 2014 01:55:02 +0000 (10:55 +0900)]
board: tec-ng: Do not make directories in a board Makefile

Commit e5c5301f refactored the build system not to make
directories in board makefiles.
But commit 8f380381 create directories again in
board/avionic-design/tec-ng/Makefile.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Alban Bedel <alban.bedel@avionic-design.de>
10 years agodrivers: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:11:48 +0000 (20:11 +0900)]
drivers: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoinclude: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:11:27 +0000 (20:11 +0900)]
include: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoboard: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:11:02 +0000 (20:11 +0900)]
board: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
10 years agox86: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:10:46 +0000 (20:10 +0900)]
x86: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
10 years agopowerpc: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:10:33 +0000 (20:10 +0900)]
powerpc: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoblackfin: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:10:15 +0000 (20:10 +0900)]
blackfin: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoavr32: delete unused header files
Masahiro Yamada [Wed, 8 Jan 2014 11:09:13 +0000 (20:09 +0900)]
avr32: delete unused header files

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoavr32: move CONFIG_AVR32 definition to arch/avr32/config.mk
Masahiro Yamada [Mon, 6 Jan 2014 06:45:09 +0000 (15:45 +0900)]
avr32: move CONFIG_AVR32 definition to arch/avr32/config.mk

Like other architectures, CONFIG_AVR32 can be defined
in arch/avr32/config.mk rather than board header files.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
10 years agoRemove obsolete _LINUX_CONFIG_H macro
Masahiro Yamada [Mon, 6 Jan 2014 06:39:48 +0000 (15:39 +0900)]
Remove obsolete _LINUX_CONFIG_H macro

Commit 643aae1406c93ddc64fcf8c136b47cdffd9c8ccd
deleted include/linux/config.h but missed to
delete _LINUX_CONFIG_H macro.
It is no longer used at all.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agotools: move kermit files to tools/kermit directory
Masahiro Yamada [Tue, 24 Dec 2013 06:30:39 +0000 (15:30 +0900)]
tools: move kermit files to tools/kermit directory

The script files, define2mk.sed and make-asm-offsets
are used to create autoconf.mk and asm-offsets.h
while build.

Whereas README, dot.kermrc, flash_param, send_cmd, send_image
are files useful for kermit.

We should not put files which have the totally different purpose
into the same directory.

This commit creates a new directory, tools/kermit,
and move kermit files into it.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
10 years agocosmetic: tools/scripts/README: insert only one space between words
Masahiro Yamada [Tue, 24 Dec 2013 05:59:19 +0000 (14:59 +0900)]
cosmetic: tools/scripts/README: insert only one space between words

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agolib: fix return codes when CONFIG_SYS_VSNPRINTF is enabled
Darwin Rambo [Thu, 19 Dec 2013 23:14:19 +0000 (15:14 -0800)]
lib: fix return codes when CONFIG_SYS_VSNPRINTF is enabled

When CONFIG_SYS_VSNPRINTF is enabled, it protects print operations
such as sprintf, snprintf, vsnprintf, etc., from buffer overflows.
But vsnprintf_internal includes the terminating NULL character in
the calculation of number of characters written. This affects sprintf
and snprintf return values. Fix this issue by setting pointer 'str'
back to the location of the '\0'.

Signed-off-by: Darwin Rambo <drambo@broadcom.com>
Reviewed-by: Steve Rae <srae@broadcom.com>
10 years agolib: time: add weak timer_init() function
Darwin Rambo [Thu, 19 Dec 2013 23:06:12 +0000 (15:06 -0800)]
lib: time: add weak timer_init() function

If timer_init() is made a weak stub function, then it allows us to
remove several empty timer_init functions for those boards that
already have a timer initialized when u-boot starts. Architectures
that use the timer framework may also remove the need for timer.c.

Signed-off-by: Darwin Rambo <drambo@broadcom.com>
Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
10 years agoam43xx_evm.h: Correct SPL max size
Tom Rini [Mon, 20 Jan 2014 13:40:07 +0000 (08:40 -0500)]
am43xx_evm.h: Correct SPL max size

Upon further inspection of relevant parts of the architecture, the
maximum SPL binary size is 220KiB.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoDRA7: add ABB setup for MPU voltage domain
Nishanth Menon [Tue, 14 Jan 2014 18:27:29 +0000 (12:27 -0600)]
DRA7: add ABB setup for MPU voltage domain

Patch adds modification to shared omap5 abb_setup() function, and
proper registers definitions needed for ABB setup sequence. ABB is
initialized for MPU voltage domain at OPP_NOM.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoDRA7: Add support for ES1.1 silicon ID code
Nishanth Menon [Tue, 14 Jan 2014 16:54:42 +0000 (10:54 -0600)]
DRA7: Add support for ES1.1 silicon ID code

ES1.1 silicon is a very minor variant of ES1.0. Add priliminary support
for ES1.1 IDCODE change.

Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
10 years agoARM: AM335x: Enable DDR dynamic IO power down
Satyanarayana, Sandhya [Thu, 19 Dec 2013 04:30:29 +0000 (10:00 +0530)]
ARM: AM335x: Enable DDR dynamic IO power down

This patch enables dynamically powering down the
IO receiver when not performing a read on boards using DDR3.
This optimizes both active and standby power consumption.
This bit is not set on EVM SK and EVM 1.5 and later boards.
Setting the same.

This has been tested on PG2.0 EVM1.5, EVM1.2, EVM-SK, BBB.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Satyanarayana, Sandhya <sandhya.satyanarayana@ti.com>
10 years agoARM: AM43xx: Enable DDR dynamic IO power down for DDR3
Lokesh Vutla [Thu, 19 Dec 2013 04:30:28 +0000 (10:00 +0530)]
ARM: AM43xx: Enable DDR dynamic IO power down for DDR3

This patch enables dynamically powering down the
IO receiver when not performing a read on DDR3 board.
This optimizes both active and standby power consumption.
This is derived from a patch that is done on AM335x[1]

[1] http://arago-project.org/git/projects/?p=u-boot-am33x.git;a=commit;h=6a9ee4bc72ece53fabf01825605fba3d71d5feb2

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
10 years agoOMAP3: igep00x0: Convert to ti_omap3_common.h.
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:24 +0000 (21:30 +0100)]
OMAP3: igep00x0: Convert to ti_omap3_common.h.

To reduce code duplication update omap3_igep00x0.h to use ti_omap3_common.h.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
10 years agoTI: OMAP3: Create common config files for TI OMAP3 platforms.
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:23 +0000 (21:30 +0100)]
TI: OMAP3: Create common config files for TI OMAP3 platforms.

Create a new file, include/configs/ti_omap3_common.h, for everything
common to the OMAP3 SoC leaving just the board specific part to board
configuration file.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
10 years agoARM: OMAP3: Rename OMAP3_PUBLIC_SRAM_* to NON_SECURE_SRAM_*
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:22 +0000 (21:30 +0100)]
ARM: OMAP3: Rename OMAP3_PUBLIC_SRAM_* to NON_SECURE_SRAM_*

Other TI processors like am33xx, omap4 and omap5 have called these variables
as NON_SECURE_SRAM_*, shouldn't be a big problem rename these variables to
be coherent.

One reason more to rename these variables is to have the possibility of any
OMAP3 board to use the ti_armv7_common.h include as the NON_SECURE_SRAM_END
is used to define the CONFIG_SYS_INIT_SP_ADDR variable.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
10 years agoTI: armv7: Do not define the number DRAM banks if is already defined.
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:21 +0000 (21:30 +0100)]
TI: armv7: Do not define the number DRAM banks if is already defined.

If CONFIG_NR_DRAM_BANKS is not defined, we say (for simplicity) that we have
1 bank, but for some boards should be interesting that we can define
CONFIG_NR_DRAM_BANKS. To handle this possibility just define the number of
DRAM banks if is not already defined. This is useful for some OMAP3 boards
where the DRAM initialitzation is only at u-boot level.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
10 years agoTI: armv7: Move ELM support to SoC configuration file.
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:20 +0000 (21:30 +0100)]
TI: armv7: Move ELM support to SoC configuration file.

The ELM hardware engine wihich is used for ECC error detections is not present
on OMAP3 SoC, so move the CONFIG_SPL_NAND_AM33XX_BCH from ti_armv7_common.h to
SoC configuration file.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
10 years agoARM: OMAP5: Rename to ti_omap5_common.h
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:19 +0000 (21:30 +0100)]
ARM: OMAP5: Rename to ti_omap5_common.h

Follow the pattern ti_<processor family>_common.h used by other TI processors
to be coherent. So just rename omap5_common.h to ti_omap5_common.h.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
10 years agoARM: OMAP4: Rename to ti_omap4_common.h
Enric Balletbò i Serra [Fri, 6 Dec 2013 20:30:18 +0000 (21:30 +0100)]
ARM: OMAP4: Rename to ti_omap4_common.h

Follow the pattern ti_<processor family>_common.h used by other TI processors
to be coherent. So just rename omap4_common.h to ti_omap4_common.h.

Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
10 years agofeature-removal-schedule.txt: Drop CONFIG_SYS_ENABLE_PADS_ALL/CLOCKS_ENABLE_ALL
Tom Rini [Fri, 24 Jan 2014 16:01:56 +0000 (11:01 -0500)]
feature-removal-schedule.txt: Drop  CONFIG_SYS_ENABLE_PADS_ALL/CLOCKS_ENABLE_ALL

Signed-off-by: Tom Rini <trini@ti.com>
10 years agoARM: OMAP4/5: Remove dead code against CONFIG_SYS_ENABLE_PADS_ALL
Jassi Brar [Tue, 7 Aug 2012 09:29:52 +0000 (14:59 +0530)]
ARM: OMAP4/5: Remove dead code against CONFIG_SYS_ENABLE_PADS_ALL

The commit
f3f98bb0 : "ARM: OMAP4/5: Do not configure non essential pads, clocks, dplls"
removed the config option aimed towards moving that stuff into kernel, which
renders some code unreachable. Remove that code.

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
10 years agoARM: OMAP4/5: Remove dead code against CONFIG_SYS_CLOCKS_ENABLE_ALL
Jassi Brar [Tue, 7 Aug 2012 09:29:18 +0000 (14:59 +0530)]
ARM: OMAP4/5: Remove dead code against CONFIG_SYS_CLOCKS_ENABLE_ALL

The commit
 f3f98bb0 : "ARM: OMAP4/5: Do not configure non essential pads, clocks, dplls"
removed the config option aimed towards moving that stuff into kernel, which
renders some code unreachable. Remove that code.

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
10 years agoeSDHC: Calculate envaddr accroding to the address format
Haijun.Zhang [Fri, 10 Jan 2014 05:52:19 +0000 (13:52 +0800)]
eSDHC: Calculate envaddr accroding to the address format

On BSC9131, BSC9132, P1010 : For High Capacity SD Cards (> 2 GBytes), the
32-bit source address specifies the memory address in block address
format. Block length is fixed to 512 bytes as per the SD High Capacity
specification. So we need to convert the block address format
to byte address format to calculate the envaddr.

If there is no enough space for environment variables or envaddr
is larger than 4GiB, we relocate the envaddr to 0x400. The address
relocated is in the front of the first partition that is assigned
for sdboot only.

Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoesdhc: Detecting 8 bit width before mmc initialization
Haijun.Zhang [Fri, 10 Jan 2014 05:52:18 +0000 (13:52 +0800)]
esdhc: Detecting 8 bit width before mmc initialization

The upper 4 data signals of esdhc are shared with spi flash.
So detect if the upper 4 pins are assigned to esdhc before
enable sdhc 8 bit width.

Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoesdhc: Workaround for card can't be detected on T4240QDS
Haijun.Zhang [Fri, 10 Jan 2014 05:52:17 +0000 (13:52 +0800)]
esdhc: Workaround for card can't be detected on T4240QDS

Card detection pin is ineffective on T4240QDS Rev1.0.
There are two cards can be connected to board.
1. eMMC card is built-in board, can not be removed. so
   For eMMC card it is always there.
2. Card detecting pin is functional for SDHC card in Rev2.0.

This workaround force sdhc driver scan and initialize the card
regardless of whether the card is inserted or not in case Rev1.0.

Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/mpc85xx:Increase binary size for P, B & T series boards.
Prabhakar Kushwaha [Tue, 14 Jan 2014 06:04:26 +0000 (11:34 +0530)]
powerpc/mpc85xx:Increase binary size for P, B & T series boards.

u-boot binary size for Freescale mpc85xx platforms is 512KB.
This has been reached to upper limit for some of the platforms causig
linker error.

So, Increase the u-boot binary size to 768KB.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
10 years agonet/fm: revert commit 732dfe090d50af53bb682d0c8971784f8de1f90f
Shengzhou Liu [Mon, 13 Jan 2014 07:32:24 +0000 (15:32 +0800)]
net/fm: revert commit 732dfe090d50af53bb682d0c8971784f8de1f90f

This patch reverts patch 'add ft_fixup_xgec to support 3rd and 4th 10GEC'.
When dual-role MAC acts as 10G,it still uses fsl,fman-port-1g-rx/tx as before.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Acked-by: York Sun <yorksun@freescale.com>
10 years agopowerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI
Prabhakar Kushwaha [Mon, 13 Jan 2014 05:58:04 +0000 (11:28 +0530)]
powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

Rename CONFIG_PBLRCW_CONFIG and CONFIG_PBLRCW_CONFIG.

Also add their details in README.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agot2080qds/ddr: update ddr parameters
Shengzhou Liu [Mon, 13 Jan 2014 05:01:06 +0000 (13:01 +0800)]
t2080qds/ddr: update ddr parameters

- Optimize UDIMM parameters for whole range from 1500MT/s to 2140MT/s.
- Remove unused patameters: 'cpo', 'wrdata delay', '2T', which are
  unrelated to DDR3/3L.

Tested with UDIMM 9JSF25672AZ-2G1K1 and verified speed 1200/1866/2133MT/s.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/c29xpcie: 8k page size NAND boot support base on TPL/SPL
Po Liu [Fri, 10 Jan 2014 02:10:59 +0000 (10:10 +0800)]
powerpc/c29xpcie: 8k page size NAND boot support base on TPL/SPL

Using the TPL/SPL method to booting from 8k page NAND flash.
- Add 256kB size SRAM tlb for second step booting;
- Add spl.c for TPL image boot;
- Add spl_minimal.c for minimal SPL image;
- Add C29XPCIE_NAND configure;
- Modify C29XPCIE.h for nand config and enviroment;

Signed-off-by: Po Liu <Po.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc:mpc85xx: Add ifc nand boot support for TPL/SPL
Po Liu [Fri, 10 Jan 2014 02:10:58 +0000 (10:10 +0800)]
powerpc:mpc85xx: Add ifc nand boot support for TPL/SPL

Using the TPL method for nand boot by sram was already
supported. Here add some code for mpc85xx ifc nand boot.

- For ifc, elbc, esdhc, espi, all need the SPL without
section .resetvec.
- Use a clear function name for nand spl boot.
- Add CONFIG_SPL_DRIVERS_MISC_SUPPORT to compile the fsl_ifc.c
in spl/Makefile;

Signed-off-by: Po Liu <Po.Liu@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/mpc85xx: Revise workaround for DDR-A003
York Sun [Wed, 8 Jan 2014 21:00:42 +0000 (13:00 -0800)]
powerpc/mpc85xx: Revise workaround for DDR-A003

Existing workaround only handles one RDIMM on reference design. In case
of two RDIMMs being used, the workaround requires two separate writes to
DDR_SDRAM_MD_CNTL register.

This patch also restores two debug registers changed by the workaround.

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Ben Collins <ben.c@servergy.com>
CC: James Yang <James.Yang@freescale.com>
10 years agopowerpc/mpc85xx: Fix a typo in workaround message for DDR erratum A003474
York Sun [Mon, 6 Jan 2014 20:12:33 +0000 (12:12 -0800)]
powerpc/mpc85xx: Fix a typo in workaround message for DDR erratum A003474

Unfortunately a typo presents "DDR-A003473" instead of "DDR-A003474".

Signed-off-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/85xx: update erratum a006379
Shengzhou Liu [Mon, 6 Jan 2014 05:23:21 +0000 (13:23 +0800)]
powerpc/85xx: update erratum a006379

Enable Erratum A006379 for T2080, T2081, T4160, B4420.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t2080qds: some update for t2080qds
Shengzhou Liu [Fri, 3 Jan 2014 06:48:44 +0000 (14:48 +0800)]
powerpc/t2080qds: some update for t2080qds

- add more serdes protocols support.
- fix some serdes lanes route.
- fix SGMII doesn't work and incorrect mdio display for XFI when serdes 0x6d.
- correct boot location info for SD/SPI boot.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/83xx: Add support for get_svr() for 83xx devices
Ramneek Mehresh [Fri, 3 Jan 2014 06:41:55 +0000 (12:11 +0530)]
powerpc/83xx: Add support for get_svr() for 83xx devices

Defines get_svr() for 83xx devices

Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agopowerpc/t1040qds: Update DDR initialization related settings
Priyanka Jain [Fri, 3 Jan 2014 05:54:55 +0000 (11:24 +0530)]
powerpc/t1040qds: Update DDR initialization related settings

Update following DDR related settings for T1040QDS
-Correct number of chip selects to two as t1040qds supports
 two Chip selects.
-Update board_specific_parameters udimm structure with settings
 derived via calibration.
-Reduced I2C speed to 50KHz as DDR-SPD does not get reliably
 read at 400KHz.

Verified the updated settings to be working fine with dual-ranked
Micron, MT18KSF51272AZ-1G6 DIMM at data rate 833MT/s, 1333MT/s and
1600MT/s.

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
10 years agoPrepare v2014.01 v2014.01
Tom Rini [Mon, 20 Jan 2014 22:52:59 +0000 (17:52 -0500)]
Prepare v2014.01

Signed-off-by: Tom Rini <trini@ti.com>
10 years agofdt_support.c: Correct linux,initrd-start/end setting
Tom Rini [Mon, 20 Jan 2014 22:45:33 +0000 (17:45 -0500)]
fdt_support.c: Correct linux,initrd-start/end setting

The change to add 64bit initrd support broke 32bit initrd support as it
always set 64bits worth of data into the properties, even on 32bit
systems.  The fix is to use addr_cell_len (which already says how much
data is in 'tmp') to set the property, rather than always setting 8.
Thanks to Stephen Warren for pointing out the fix here.

Reported-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Tom Rini <trini@ti.com>
10 years agoARM: bcm2835: fix mailbox timeout
Stephen Warren [Tue, 14 Jan 2014 02:50:12 +0000 (19:50 -0700)]
ARM: bcm2835: fix mailbox timeout

My original intention was to have a 100ms timeout. However, the timer
operations used return values in ms not us, so we ended up with a 100s
timeout instead. Fixing this exposes that some operations need longer
to operate than 100ms, so bump the timeout up to a whole second.

Reported-by: Andre Heider <a.heider@gmail.com>
Reviewed-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
10 years agoARM: rpi_b: power on SDHCI and USB HW modules
Stephen Warren [Tue, 14 Jan 2014 02:50:11 +0000 (19:50 -0700)]
ARM: rpi_b: power on SDHCI and USB HW modules

Send RPC commands to the VideoCore to turn on the SDHCI and USB modules.
For SDHCI this isn't needed in practice, since the firmware already
turned on the power in order to load U-Boot. However, it's best to be
explicit. For USB, this is necessary, since the module isn't powered
otherwise. This will allow the kernel USB driver to work.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
10 years agospl: common: Properly ignore spl/Makefile in .gitignore
Dan Murphy [Thu, 16 Jan 2014 17:23:28 +0000 (11:23 -0600)]
spl: common: Properly ignore spl/Makefile in .gitignore

The spl directory is ignored by git as these objects are created
during spl creation.  The only file not created is the Makefile.

This file can be modified and checked in via git.

Due to the order of rule precedence having the whole directory
ignored first then indicating not to ignore the Makefile is not correct
the message to force adding the Makefile is still shown.

So reorder the .gitignore for the Makefile and indicate that the Makefile
does not need to be ignored first and then indicate everything else in spl
should be ignored after wards.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
10 years ago.gitignore: ignore u-boot.elf and tools/relocate-rela
Masahiro Yamada [Tue, 14 Jan 2014 01:39:34 +0000 (10:39 +0900)]
.gitignore: ignore u-boot.elf and tools/relocate-rela

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoyaffs2: Remove block number check from summary verification
Charles Manning [Mon, 20 Jan 2014 02:51:59 +0000 (15:51 +1300)]
yaffs2: Remove block number check from summary verification

The summary already has other verification. This one is not needed.

The check caused summaries to be ignored if they were not on the
numbered block. This caused problems when a summary was embedded in an
image and the image is written to a flash with bad blocks.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
10 years agoext4fs: fix "invalid extent block" error
Ionut Nicu [Mon, 13 Jan 2014 11:00:08 +0000 (12:00 +0100)]
ext4fs: fix "invalid extent block" error

For files where we actually have extent indexes following
an extent header (ext_block->eh_depth != 0), the do/while
loop from ext4fs_get_extent_block() does not select the
proper extent index structure.

For example, if we have:

ext_block->eh_depth = 1
ext_block->eh_entries = 1
fileblock = 0
index[0].ei_block = 0

the do/while loop will exit with i set to 0 and the
ext4fs_get_extent_block() function will return 0, even if
there was a valid extent index structure following the
header.

Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com>
Signed-off-by: Mathias Rulf <mathias.rulf@nsn.com>
10 years agoext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz
Ionut Nicu [Mon, 13 Jan 2014 10:59:24 +0000 (11:59 +0100)]
ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz

Using fs->blksz in ext4fs_get_extent_block() is not
correct since fs->blksz is not initialized on the
read path. Use EXT2_BLOCK_SIZE() instead which will
produce the desired output.

Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com>
Signed-off-by: Mathias Rulf <mathias.rulf@nsn.com>
10 years agoboard:universal: fix i2c adapter
Piotr Wilczek [Tue, 14 Jan 2014 07:15:07 +0000 (08:15 +0100)]
board:universal: fix i2c adapter

Universal uses only one adapter I2C_0.

Signed-off-by: Piotr Wilczek <p.wilczek@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
10 years agofs/ext4: fix calling put_ext4 with truncated offset
Ma Haijun [Wed, 8 Jan 2014 00:15:33 +0000 (08:15 +0800)]
fs/ext4: fix calling put_ext4 with truncated offset

Curently, we are using 32 bit multiplication to calculate the offset,
so the result will always be 32 bit.
This can silently cause file system corruption when performing a write
operation on partition larger than 4 GiB.

This patch address the issue by simply promoting the terms to 64 bit,
and let compilers decide how to do the multiplication efficiently.

Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
10 years agofs/ext4: fix partition size get truncated in calculation
Ma Haijun [Tue, 7 Jan 2014 22:49:43 +0000 (06:49 +0800)]
fs/ext4: fix partition size get truncated in calculation

It may cause file system corruption when do a write operation.
This issue only affects boards that use 32 bit lbaint_t.

Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Tom Rini [Mon, 20 Jan 2014 12:51:22 +0000 (07:51 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

10 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-imx
Tom Rini [Mon, 20 Jan 2014 12:33:42 +0000 (07:33 -0500)]
Merge branch 'master' of git://www.denx.de/git/u-boot-imx

10 years agoomap3_beagle: use omap3-beagle.dtb for the C4 revision
Robert Nelson [Fri, 17 Jan 2014 15:51:28 +0000 (09:51 -0600)]
omap3_beagle: use omap3-beagle.dtb for the C4 revision

findftd is currently setting fdtfile to undefined for the beagle c4, select omap3-beagle.dtb instead

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
10 years agonand, gpmc: fix reading after switching ecc
Jeroen Hofstee [Wed, 15 Jan 2014 16:58:54 +0000 (17:58 +0100)]
nand, gpmc: fix reading after switching ecc

The omap_gpmc allows switching ecc at runtime. Since
the NAND_SUBPAGE_READ flag is only set, it is kept when
switching to hw ecc, which is not correct. This leads to
calling chip->ecc.read_subpage which is not a valid
pointer. Therefore clear the flag when switching ecc so
reading in hw mode works again.

Cc: Scott Wood <scottwood@freescale.com>
Cc: Pekon Gupta <pekon@ti.com>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
10 years agocosmetic: uImage.FIT: fix documents
Masahiro Yamada [Thu, 16 Jan 2014 02:05:23 +0000 (11:05 +0900)]
cosmetic: uImage.FIT: fix documents

- Fix the path to source_file_format.txt
  - Fix a minor typo
  - Fix the type for FIT blob: it must be "flat_dt"

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agovexpress/armv8: Fix incorrect ethernet controller
Bhupesh Sharma [Thu, 16 Jan 2014 15:47:40 +0000 (09:47 -0600)]
vexpress/armv8: Fix incorrect ethernet controller

This patch enables ethernet support in ARMv8 foundation model. The ARMv8
foundation model supports a SMSC91C111 integrated MAC and PHY module
which is present at base address 0x01A000000.

The previous implementation had enabled SMSC9115 ethernet controller
which is not present on the ARMv8 foundation model.

Tested on ARMv8 foundation model v1 and v2 by running ping/tftp
between the foundation model and the host PC via a bridged network.

Signed-off-by: Bhupesh Sharma <bhupesh.sharma@freescale.com>
10 years agoARM: trats2: dfu: Enable default Poll Timeout for Trats2 board
Łukasz Majewski [Tue, 14 Jan 2014 07:02:25 +0000 (08:02 +0100)]
ARM: trats2: dfu: Enable default Poll Timeout for Trats2 board

Provide default Poll Timeout value for Trats2 board.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
10 years agoconfig: Update envs for trats and trats2 - Disable L2 cache
Łukasz Majewski [Tue, 14 Jan 2014 07:02:26 +0000 (08:02 +0100)]
config: Update envs for trats and trats2 - Disable L2 cache

Disable L2 caches for Trats and Trats2 devices.

It turns out that for data downloading with thordown command L2 cache
disablement brings a significant speed improvement.

rootfs - 400 MiB:
- L2 cache enabled: 2.69 MiB/s
- L2 cache disabled:  5.56 MiB/s

Such improvement is possible due to reduction of the need to invalidate
redundant data, which resides in L2 cache.

Since the sent USB request size at once is 512B (L1 - 32 KiB in total) -
one can be quite confident that it is already available in L1 and L2 can
be disabled.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
10 years agomx6: Revert "mx6: soc: Disable VDDPU regulator"
Fabio Estevam [Thu, 16 Jan 2014 12:57:29 +0000 (10:57 -0200)]
mx6: Revert "mx6: soc: Disable VDDPU regulator"

Commit 022298278 (mx6: soc: Disable VDDPU regulator) is causing kernel hang
for people using FSL kernel 3.0.35 and 3.10, so revert it for now.

Reported-by: Otavio Salvador <otavio@ossystems.com.br>
Reported-by: Pierre Aubert <p.aubert@staubli.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agoconfig: Update envs for trats and trats2 - new entries for new partitions
Łukasz Majewski [Tue, 14 Jan 2014 07:02:24 +0000 (08:02 +0100)]
config: Update envs for trats and trats2 - new entries for new partitions

This patch adds extra dfu_alt_info entries to support storing the whole BOOT
, DATA and UMS partitions.
This allows upgrade of uImage and device tree blob (dtb) files at once.

Now it is also possible to store ext4 rootfs prepared with well established
linux tools (like mkfs.ext4).

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Thu, 16 Jan 2014 18:50:16 +0000 (13:50 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

10 years agoarm: koelsch: Add support QSPI device and enable boot from SPI flash
Nobuhiro Iwamatsu [Wed, 8 Jan 2014 01:32:24 +0000 (10:32 +0900)]
arm: koelsch: Add support QSPI device and enable boot from SPI flash

This supports SH-QSPI device on koelsch board, and enable booting from
SPI flash.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: lager: Add support QSPI device and enable boot from SPI flash
Nobuhiro Iwamatsu [Wed, 8 Jan 2014 01:32:22 +0000 (10:32 +0900)]
arm: lager: Add support QSPI device and enable boot from SPI flash

This supports SH-QSPI device on lager board, and enable booting from
SPI flash.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agospi: sh_qspi: Add header file that defines the address of registers
Nobuhiro Iwamatsu [Wed, 8 Jan 2014 01:16:25 +0000 (10:16 +0900)]
spi: sh_qspi: Add header file that defines the address of registers

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: rmobile: Add SH QSPI base register address
Nobuhiro Iwamatsu [Wed, 8 Jan 2014 01:14:26 +0000 (10:14 +0900)]
arm: rmobile: Add SH QSPI base register address

This adds base register address of SH QSPI.
Currently, SH QSPI is used only from R8A7790 and R8A7791.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: lager: Disable TMU0 before OS boot
Nobuhiro Iwamatsu [Fri, 11 Oct 2013 06:00:37 +0000 (15:00 +0900)]
arm: lager: Disable TMU0 before OS boot

On U-boot uses TMU0 as timer, but TMU0 does not use on linux kernel
and other.
This disables TMU0 at the request of from kernel user.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoarm: koelsch: Disable TMU0 before OS boot
Nobuhiro Iwamatsu [Fri, 11 Oct 2013 05:49:04 +0000 (14:49 +0900)]
arm: koelsch: Disable TMU0 before OS boot

On U-boot uses TMU0 as timer, but TMU0 does not use on linux kernel
and other.
This disables TMU0 at the request of from kernel user.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
10 years agoMerge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Albert ARIBAUD [Wed, 15 Jan 2014 14:18:04 +0000 (15:18 +0100)]
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

10 years agomx6: Add initial support for the Hummingboard solo
Fabio Estevam [Fri, 3 Jan 2014 17:55:58 +0000 (15:55 -0200)]
mx6: Add initial support for the Hummingboard solo

SolidRun has designed the Hummingboard board based on mx6q/dl/solo.

Add the initial support for the mx6 solo variant.

More information about this hardware can be found at:
http://imx.solid-run.com/wiki/index.php?title=Carrier-One_Hardware

(Carrier-One was the previous name of Hummingboard).

Based on the work from Jon Nettleton <jon.nettleton@gmail.com>.

Signed-off-by: Jon Nettleton <jon.nettleton@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
10 years agomx6: clock: Pass the frequency as argument of enable_fec_anatop_clock()
Fabio Estevam [Fri, 3 Jan 2014 17:55:57 +0000 (15:55 -0200)]
mx6: clock: Pass the frequency as argument of enable_fec_anatop_clock()

Provide an argument to enable_fec_anatop_clock() to specify the clock frequency
that will be generated.

No changes are made to mx6slevk, which uses the default 50MHz fec clock.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
10 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Tom Rini [Tue, 14 Jan 2014 19:48:42 +0000 (14:48 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

10 years agoMerge branch 'master' of git://git.denx.de/u-boot-net
Tom Rini [Tue, 14 Jan 2014 19:39:53 +0000 (14:39 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-net

10 years agonet: phy: atheros: Fix the masks for AR8031/8035
Fabio Estevam [Fri, 3 Jan 2014 17:55:59 +0000 (15:55 -0200)]
net: phy: atheros: Fix the masks for AR8031/8035

Use the same masks as used in the kernel:
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/drivers/net/phy/at803x.c?id=refs/tags/v3.12.6

With such changes Ethernet is functional on hummingboard solo.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Marek Vasut <marex@denx.de>
Patch: 306640

10 years agommc: dwmmc: mode change to 0644
Minkyu Kang [Tue, 14 Jan 2014 09:00:51 +0000 (18:00 +0900)]
mmc: dwmmc: mode change to 0644

Don't know why but, file permission was changed

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>