kernel/u-boot.git
10 years agocosmetic: UDM-net: clean up the remainders of dead driver
Masahiro Yamada [Tue, 24 Sep 2013 01:32:06 +0000 (10:32 +0900)]
cosmetic: UDM-net: clean up the remainders of dead driver

This commit omits non-existing drivers/net/netarm_eth.c from the list.
This driver is deleted by commit b411eb30f.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agocosmetic: UDM-serial: clean up the remainders of dead driver
Masahiro Yamada [Tue, 24 Sep 2013 01:32:05 +0000 (10:32 +0900)]
cosmetic: UDM-serial: clean up the remainders of dead driver

The following serial drivers do not exist any more.

 - ns9750_serial.c: deleted by commit 4cfc611b4
 - s3c4510b_uart.c: deleted by commit afad40299
 - serial_clps7111.c: deleted by commit f2e080156
 - serial_netarm.c: deleted by commit b411eb30f

This commit cleans up UDM-serial.txt.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agocosmetic: doc: driver-model: Do not number driver lists
Masahiro Yamada [Tue, 24 Sep 2013 01:32:04 +0000 (10:32 +0900)]
cosmetic: doc: driver-model: Do not number driver lists

Everytime a dead driver is removed from the list,
we must re-number. This is a painful task.

Try
  git show e53232250 -- doc/driver-model/UDM-serial.txt
  git show 6f62f4207 -- doc/driver-model/UDM-serial.txt
  git show b9f4bc34a -- doc/driver-model/UDM-serial.txt
to see what I mean.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoREADME: remove wrong config name
Igor Grinberg [Wed, 6 Nov 2013 15:24:02 +0000 (17:24 +0200)]
README: remove wrong config name

There is no CONFIG_PCA953X_INFO symbol.
U-Boot uses CONFIG_CMD_PCA953X_INFO instead, which is described in
"Monitor Functions" section and thus no need to be repeated in the
"GPIO Support" section.
Remove the whole line.

Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
10 years agocosmetic: remove empty lines at the top of file
Masahiro Yamada [Tue, 5 Nov 2013 02:28:48 +0000 (11:28 +0900)]
cosmetic: remove empty lines at the top of file

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agocommon/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() functions
Miao Yan [Mon, 4 Nov 2013 03:18:14 +0000 (11:18 +0800)]
common/cmd_bootm.c: fix subcommand processing in OS specific do_bootm_xxx() functions

In commit "5c427e4: use BOOTM_STATE_OS_CMDLINE flag for plain bootm"
and "3d187b3: Only pass BOOTM_STATE_OS_CMDLINE on PowerPC/MIPS",
BOOTM_STATE_OS_CMDLINE was added to do_bootm for PowerPC and MIPS. This
breaks other OSes (vxworks, netbsd, plan9,...) that don't support
subcommand processing, e.g. they all contain the following code in their
do_bootm_xxx():

    if (flag & BOOTM_STATE_OS_PREP)
            return 0;
    if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
            return 1;

which will result a "subcommand not supported" error.
This patch changes the above logic to:

    /* if not go command, pretend everything to be OK */
    if (flag != BOOTM_STATE_OS_GO)
         return 0;

Signed-off-by: Miao Yan <miao.yan@windriver.com>
10 years agoMakefile: do not create a symbolic link to arch/${ARCH}/include/asm
Masahiro Yamada [Fri, 1 Nov 2013 01:28:45 +0000 (10:28 +0900)]
Makefile: do not create a symbolic link to arch/${ARCH}/include/asm

In-tree build:
  - Do not create a symbolic link
      from include/asm to arch/${ARCH}/include/asm
  - Add ${SRCTREE}/arch/arm/include into the header search path

Out-of-tree build:
  - Do not create a directory ${OBJTREE}/include2
  - Do not create a symbolic link
      from ${OBJTREE}/include2/asm to ${SRCTREE}/arch/${ARCH}/include/asm
  - Add ${SRCTREE}/arch/arm/include into the header search path

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agoAdd support for SX151x SPI GPIO Expanders
Viktar Palstsiuk [Thu, 31 Oct 2013 08:16:59 +0000 (11:16 +0300)]
Add support for SX151x SPI GPIO Expanders

Signed-off-by: Viktar Palstsiuk <viktar.palstsiuk@promwad.com>
10 years agoboards.cfg: remove git leftovers
Luka Perkov [Thu, 31 Oct 2013 02:59:46 +0000 (03:59 +0100)]
boards.cfg: remove git leftovers

Remove 'HEAD' line which is most likely left there while rebasing. It was
introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0.

Signed-off-by: Luka Perkov <luka@openwrt.org>
10 years agoboards.cfg: remove trailing whitespace
Paul Burton [Wed, 23 Oct 2013 10:17:14 +0000 (11:17 +0100)]
boards.cfg: remove trailing whitespace

Commit 93e14596 "Coding Style cleanup: replace leading SPACEs by TABs"
added trailing whitespace to a single line of boards.cfg. I presume this
was unintentional, and it causes the file to change after running it
through the reformat.py script. Remove the offending character.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
10 years agocmd_nvedit.c: Add env exists command
Andrew Ruder [Wed, 23 Oct 2013 00:07:34 +0000 (19:07 -0500)]
cmd_nvedit.c: Add env exists command

env exists is a way to test (in hush) if an environment variable
exists.  A workaround existed using printenv but this new command
doesn't require all the stdout/stderr redirection to prevent
printing information to the screen.

Example:
$ set testexists 1
$ env exists testexists && echo "yes"
yes
$ env exists testexists || echo "no"
$ set testexists
$ env exists testexists && echo "yes"
$ env exists testexists || echo "no"
no
$

Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
10 years agoMAKEALL: rename boards_by_* functions to targets_by_*
Masahiro Yamada [Mon, 21 Oct 2013 02:11:28 +0000 (11:11 +0900)]
MAKEALL: rename boards_by_* functions to targets_by_*

We expect boards_by_* function to return the 7th filed, 'Target',
not the 6th field, 'Board name'.

So the function names, boards_by_* are a little misleading,
and should be renamed to targets_by_*.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
10 years agoMAKEALL: fix boards_by_field function
Masahiro Yamada [Mon, 21 Oct 2013 02:11:27 +0000 (11:11 +0900)]
MAKEALL: fix boards_by_field function

Commit 27af930e changed the boards.cfg format
and it changed boards_by_field() function incorrectly.
For tegra cpus it returned Board Name field,
not Target field.

This commit restores the behavior prior to 27af930e in the right way.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
10 years agoMAKEALL: fix a bug to use CROSS_COMPILE_<ARCH>
Masahiro Yamada [Mon, 21 Oct 2013 02:11:26 +0000 (11:11 +0900)]
MAKEALL: fix a bug to use CROSS_COMPILE_<ARCH>

Commit 27af930e changed the boards.cfg format but
missed to change get_target_arch() fuction.
This commit adjusts it for CROSS_COMPILE_<ARCH>
to work correctly.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
10 years agoMAKEALL: fix awk warning message
Masahiro Yamada [Mon, 21 Oct 2013 02:11:25 +0000 (11:11 +0900)]
MAKEALL: fix awk warning message

If you do `./MAKEALL -M ` or `./MAKEALL -m`
GNU awk would display warnings like follows:

    awk: warning: escape sequence `\ ' treated as plain ` '

In the first place, we do not explicitly set the field separator.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
10 years agosparc: include config.h to start.S
Masahiro Yamada [Mon, 21 Oct 2013 01:19:38 +0000 (10:19 +0900)]
sparc: include config.h to start.S

arch/sparc/cpu/leon3/start.S requires CONFIG_SYS_SPARC_NWINDOES
to be defined:

  #ifndef CONFIG_SYS_SPARC_NWINDOWS
  #error Must define number of SPARC register windows, default is 8
  #endif

But it missed to include <config.h>, which always ended up in compile error.

This commit fixes this problem.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
10 years agoEP88x: remove remainders of dead board
Masahiro Yamada [Mon, 21 Oct 2013 01:10:32 +0000 (10:10 +0900)]
EP88x: remove remainders of dead board

Commit 1b0757e deleted the EP88x entry from boards.cfg file.
But it missed to remove include/configs/EP88x.h and board/ep88x/.

This commit removes them and adds EP88x to README.scrapyard.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
10 years agoREADME.scrapyard: fix broken format
Masahiro Yamada [Mon, 21 Oct 2013 01:10:31 +0000 (10:10 +0900)]
README.scrapyard: fix broken format

Some tabs have been replaced with spaces
because doc/README.scrapyard is consistently using spaces.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agokup: Delete an unused Makefile
Masahiro Yamada [Mon, 21 Oct 2013 01:01:24 +0000 (10:01 +0900)]
kup: Delete an unused Makefile

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Klaus Heydeck <heydeck@kieback-peter.de>
10 years agoMerge branch 'master' of git://www.denx.de/git/u-boot-coldfire
Tom Rini [Wed, 6 Nov 2013 21:18:25 +0000 (16:18 -0500)]
Merge branch 'master' of git://denx.de/git/u-boot-coldfire

10 years agoMerge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
Tom Rini [Wed, 6 Nov 2013 21:11:34 +0000 (16:11 -0500)]
Merge branch 'fpga' of git://denx.de/git/u-boot-microblaze

10 years agoColdFire: fix some typoes for CF platform
jason [Wed, 6 Nov 2013 14:59:08 +0000 (22:59 +0800)]
ColdFire: fix some typoes for CF platform

Signed-off-by: Jason Jin <Jason.Jin@freescale.com>
10 years agocoldfire: cpu5282: increase malloc space to fix crash on start u-boot
Jens Scharsig (BuS Elektronik) [Mon, 23 Sep 2013 06:26:41 +0000 (08:26 +0200)]
coldfire: cpu5282: increase malloc space to fix crash on start u-boot

The malloc space is to small to boot, the current uboot 2013.10-rcX,
This will fix the startup problems by increasing the mallog space to 4MiB.

Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
10 years agoMakfile: fix a rule to build u-boot.sb
Masahiro Yamada [Tue, 5 Nov 2013 08:09:02 +0000 (17:09 +0900)]
Makfile: fix a rule to build u-boot.sb

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
10 years agofreescale: p1_p2_rdb_pc: rename COBJS-y to obj-y
Masahiro Yamada [Tue, 5 Nov 2013 08:03:22 +0000 (17:03 +0900)]
freescale: p1_p2_rdb_pc: rename COBJS-y to obj-y

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agofpga: Add support for gzip images with bitstreams
Michal Simek [Fri, 4 Oct 2013 08:51:01 +0000 (10:51 +0200)]
fpga: Add support for gzip images with bitstreams

Here is the set of command which has been performed
to proof this feature.

gzip < fpga.bin > fpga.bin.gz
mkimage -A arm -O u-boot -T firmware -C gzip \
-a 20000000 -n "zc702_fpga_bin" -d fpga.bin.gz fpga.bin.gz.ub

tftp 100000 fpga.bin.gz.ub
fpga loadmk 0 100000

This flow should speedup loading bitstream data
from external memory and save image footprint in non volatile
memory.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agofpga: zynqpl: Do not place bitstream below 1MB
Michal Simek [Fri, 4 Oct 2013 08:48:59 +0000 (10:48 +0200)]
fpga: zynqpl: Do not place bitstream below 1MB

DMA doesn't work when src is placed below 1MB limit.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
11 years agofpga: zynqpl: Add dcache flush support
Jagannadha Sutradharudu Teki [Fri, 20 Sep 2013 13:09:47 +0000 (18:39 +0530)]
fpga: zynqpl: Add dcache flush support

Buffers must be cache and dma aligned.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
11 years agopxe: fix handling of absolute paths
Rob Herring [Fri, 18 Oct 2013 18:04:42 +0000 (13:04 -0500)]
pxe: fix handling of absolute paths

pxelinux and syslinux differ in their handling of absolute paths in menu
files. A pxelinux path is aways prepended with the bootfile path while
syslinux allows for absolute paths. u-boot was always treating a leading
/ as an absolute path breaking some pxelinux setups. Fix this by adding
a flag to distinguish pxelinux vs. syslinux behavior.

Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: versatile: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:48 +0000 (10:22 -0500)]
ARM: versatile: convert to common timer code

Convert versatile to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: tegra: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:47 +0000 (10:22 -0500)]
ARM: tegra: convert to common timer code

Convert tegra to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: socfpga: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:46 +0000 (10:22 -0500)]
ARM: socfpga: convert to common timer code

Convert socfpga to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: vexpress: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:45 +0000 (10:22 -0500)]
ARM: vexpress: convert to common timer code

Convert vexpress to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: mx25: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:44 +0000 (10:22 -0500)]
ARM: mx25: convert to common timer code

Convert mx25 to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoARM: highbank: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:43 +0000 (10:22 -0500)]
ARM: highbank: convert to common timer code

Convert highbank to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agosh: convert to common timer code
Rob Herring [Fri, 4 Oct 2013 15:22:42 +0000 (10:22 -0500)]
sh: convert to common timer code

Convert sh to use the commmon timer code. Remove reset_timer and
set_timer as they are unused on sh.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoIntroduce common timer functions
Rob Herring [Fri, 4 Oct 2013 15:22:41 +0000 (10:22 -0500)]
Introduce common timer functions

Many platforms duplicate pretty much the same timer code yet they all have
a 32-bit freerunning counter register. Create a common implementation that
minimally requires 2 or 3 defines to add timer support:

CONFIG_SYS_TIMER_RATE - Clock rate of the timer counter
CONFIG_SYS_TIMER_COUNTER - Address of 32-bit counter
CONFIG_SYS_TIMER_COUNTS_DOWN - Define if counter counts down

All functions are weak or ifdef'ed so they can still be overriden by any
platform.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoexamples: enable gc-sections option
Rob Herring [Fri, 4 Oct 2013 15:22:40 +0000 (10:22 -0500)]
examples: enable gc-sections option

This fixes building time.c when unreferenced functions are added.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoconfig: remove platform CONFIG_SYS_HZ definition part 2/2
Rob Herring [Fri, 4 Oct 2013 13:40:05 +0000 (08:40 -0500)]
config: remove platform CONFIG_SYS_HZ definition part 2/2

Remove platform CONFIG_SYS_HZ definition for configs a-z*.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoconfig: remove platform CONFIG_SYS_HZ definition part 1/2
Rob Herring [Fri, 4 Oct 2013 13:40:04 +0000 (08:40 -0500)]
config: remove platform CONFIG_SYS_HZ definition part 1/2

Remove platform CONFIG_SYS_HZ definition for configs A-Z*.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoconfig: consolidate CONFIG_SYS_HZ definition
Rob Herring [Fri, 4 Oct 2013 13:40:03 +0000 (08:40 -0500)]
config: consolidate CONFIG_SYS_HZ definition

According to the README, CONFIG_SYS_HZ must be 1000 and most platforms
follow that. In preparation to remove CONFIG_SYS_HZ from all these
platforms, provide a common definition. The platforms which use a value
other than 1000 will get build warning now. These configs are:

include/configs/M5271EVB.h:#define CONFIG_SYS_HZ                        1000000
include/configs/balloon3.h:#define      CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
include/configs/idmr.h:#define CONFIG_SYS_HZ                    (50000000 / 64)
include/configs/mini2440.h:#define CONFIG_SYS_HZ                        1562500
include/configs/mx1ads.h:#define CONFIG_SYS_HZ                  3686400
include/configs/omap3_zoom2.h:#define CONFIG_SYS_HZ                     ((V_SCLK) / (2 << CONFIG_SYS_PTV))
include/configs/omap730p2.h:#define CONFIG_SYS_HZ                       ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
include/configs/palmld.h:#define        CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
include/configs/palmtc.h:#define        CONFIG_SYS_HZ                   3686400         /* Timer @ 3686400 Hz */
include/configs/rsk7203.h:#define CONFIG_SYS_HZ                 (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/rsk7264.h:#define CONFIG_SYS_HZ         (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/rsk7269.h:#define CONFIG_SYS_HZ         (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
include/configs/scb9328.h:#define CONFIG_SYS_HZ                 3686400      /* incrementer freq: 3.6864 MHz */
include/configs/versatile.h:#define CONFIG_SYS_HZ                       (1000000 / 256)
include/configs/zipitz2.h:#define       CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
11 years agoconfig: Add a default CONFIG_SYS_PROMPT
Rob Herring [Mon, 30 Sep 2013 22:11:48 +0000 (17:11 -0500)]
config: Add a default CONFIG_SYS_PROMPT

The definitions for CONFIG_SYS_PROMPT are varied with little reason other
than to display the board name. Over half the definitions are "==> ", so
make this the default. The rest of the boards remain unchanged to avoid
breaking any external scripts expecting a certain prompt.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Tom Rini [Mon, 4 Nov 2013 14:28:08 +0000 (09:28 -0500)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

Easy to resolve conflict on the GPIO change.

Conflicts:
arch/blackfin/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoblackfin: Move machine specific gpio_port_t structure back to blackfin arch folder.
Steven Miao [Wed, 23 Oct 2013 06:44:09 +0000 (14:44 +0800)]
blackfin: Move machine specific gpio_port_t structure back to blackfin arch folder.

The gpio register mappings are different among blackfin processors.

Signed-off-by: Steven Miao <realmz6@gmail.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
11 years agoblackfin: fix a warning in arch/blackfin/cpu/cpu.c
Masahiro Yamada [Mon, 21 Oct 2013 01:14:05 +0000 (10:14 +0900)]
blackfin: fix a warning in arch/blackfin/cpu/cpu.c

This commit fixes:
    cpu.c:107: warning: ‘noreturn’ function does return

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
11 years agoboard/keymile/kmp204x/Makefile: Convert to SPDX tag
Tom Rini [Fri, 1 Nov 2013 14:27:12 +0000 (10:27 -0400)]
board/keymile/kmp204x/Makefile: Convert to SPDX tag

Signed-off-by: Tom Rini <trini@ti.com>
11 years agoboard: powerpc: convert more makefiles to Kbuild style
Tom Rini [Fri, 1 Nov 2013 14:24:19 +0000 (10:24 -0400)]
board: powerpc: convert more makefiles to Kbuild style

Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agoMakefile: convert makefiles to Kbuild style and delete grep switch
Masahiro Yamada [Mon, 21 Oct 2013 02:53:41 +0000 (11:53 +0900)]
Makefile: convert makefiles to Kbuild style and delete grep switch

We have converted all makefiles needed to build $(LIBS).

Until this commit we used to grep switch so that U-Boot style
and Kbuild style makefiles coexist.
But we do not need any more.

Goint forward, use always Kbuild style Makefile when adding
a new Makefile

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agodts, api, test: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:40 +0000 (11:53 +0900)]
dts, api, test: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agopost: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:39 +0000 (11:53 +0900)]
post: convert makefiles to Kbuild style

This commit also deletes post/rules.mk,
which in not necessary any more.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoboard: powerpc: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:38 +0000 (11:53 +0900)]
board: powerpc: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Stefan Roese <sr@denx.de>
11 years agoboard: arm: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:37 +0000 (11:53 +0900)]
board: arm: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Vipin Kumar <vipin.kumar@st.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Tom Rini <trini@ti.com>
11 years agoblackfin: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:36 +0000 (11:53 +0900)]
blackfin: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
11 years agom68k: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:35 +0000 (11:53 +0900)]
m68k: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Jason Jin <Jason.jin@freescale.com>
11 years agox86: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:34 +0000 (11:53 +0900)]
x86: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
11 years agonios2: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:33 +0000 (11:53 +0900)]
nios2: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
11 years agonds32: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:32 +0000 (11:53 +0900)]
nds32: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Macpaul Lin <macpaul@gmail.com>
11 years agomips: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:31 +0000 (11:53 +0900)]
mips: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
11 years agomicroblaze: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:30 +0000 (11:53 +0900)]
microblaze: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Michal Simek <michal.simek@xilinx.com>
11 years agoopenrisc: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:29 +0000 (11:53 +0900)]
openrisc: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
11 years agoavr32: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:28 +0000 (11:53 +0900)]
avr32: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
11 years agosh: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:27 +0000 (11:53 +0900)]
sh: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosparc: convert makefiles to Kbuild style
Masahiro Yamada [Mon, 21 Oct 2013 02:53:26 +0000 (11:53 +0900)]
sparc: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
11 years agosh: Do not include start.o in lib$(CPU).o
Masahiro Yamada [Mon, 21 Oct 2013 02:53:25 +0000 (11:53 +0900)]
sh: Do not include start.o in lib$(CPU).o

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
11 years agosparc: fix a link error
Masahiro Yamada [Mon, 21 Oct 2013 02:53:24 +0000 (11:53 +0900)]
sparc: fix a link error

Before this commit, arch/sparc/lib/Makefile used
both COBJS and COBJS-y.
And it missed to add COBJS-y into OBJS.
This means bootm.o was never compiled even if
CONFIG_CMD_BOOTM=y

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Daniel Hellstrom <daniel@gaisler.com>
11 years agoARM: s5pc, exynos: move Samsung ARM SoC specific code under arch/arm/
Masahiro Yamada [Thu, 17 Oct 2013 11:38:56 +0000 (20:38 +0900)]
ARM: s5pc, exynos: move Samsung ARM SoC specific code under arch/arm/

This patch moves S5PC, EXYNOS specific directory entries
from the toplevel Makefile to arch/arm/cpu/armv7/Makefile
using Kbuild descending feature.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
11 years agoARM: omap: move OMAP specific code under arch/arm/
Masahiro Yamada [Thu, 17 Oct 2013 11:38:55 +0000 (20:38 +0900)]
ARM: omap: move OMAP specific code under arch/arm/

This patch moves OMAP specific directory entries
from the toplevel Makefile and spl/Makefile
to arch/arm/cpu/armv7/Makefile using Kbuild descending feature.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
11 years agoARM: tegra: move Tegra specific code under arch/arm/
Masahiro Yamada [Thu, 17 Oct 2013 11:38:54 +0000 (20:38 +0900)]
ARM: tegra: move Tegra specific code under arch/arm/

This patch moves Tegra specific directory entries
from the toplevel Makefile and spl/Makefile
to arch/arm/cpu/*/Makefile using Kbuild descending feature.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Warren <TWarren@nvidia.com>
11 years agofs: move some file system to fs/Makefile
Masahiro Yamada [Thu, 17 Oct 2013 11:38:53 +0000 (20:38 +0900)]
fs: move some file system to fs/Makefile

This commit moves some subdirectories of fs
from the toplevel Makefile to fs/Makefile
using Kbuild descending feature.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agodrivers: move some drivers to drivers/Makefile
Masahiro Yamada [Thu, 17 Oct 2013 11:38:52 +0000 (20:38 +0900)]
drivers: move some drivers to drivers/Makefile

This commit moves some drivers subdirectory entry
from the toplevel Makefile to drivers/Makefile
using Kbuild descending feature.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoMakefile: support descending down to subdirectories
Masahiro Yamada [Thu, 17 Oct 2013 11:38:51 +0000 (20:38 +0900)]
Makefile: support descending down to subdirectories

This patch tweaks scripts/Makefile.build to allow
the build system to descend into subdirectories like Kbuild.

To use this feature, use "obj-y += foo/" syntax.

Example:
    obj-$(CONFIG_FOO) += foo/

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
11 years agoboard: ti: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:35:05 +0000 (17:35 +0900)]
board: ti: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
11 years agopowerpc: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:35:04 +0000 (17:35 +0900)]
powerpc: convert makefiles to Kbuild style

Note:
arch/powerpc/cpu/mpc8260/Makefile is originally like follows:

    ---<snip>---
    START   = start.o kgdb.o
    COBJS   = traps.o serial_smc.o serial_scc.o cpu.o cpu_init.o speed.o \
    ---<snip>---
    COBJS-$(CONFIG_ETHER_ON_SCC) = ether_scc.o
    ---<snip>---
    $(LIB): $(OBJS)
            $(call cmd_link_o_target, $(OBJS) $(obj)kgdb.o)

The link rule `$(call cmd_link_o_target, $(OBJS) $(obj)kgdb.o)'
is weird.
kbdg.o is not included in $(OBJS) but linked into $(LIB)
and $(LIB) is not dependent on kgdb.o.
(Broken dependency tracking)

So,
    START   = start.o kgdb.o
shoud have been
    START   = start.o
    SOBJS   = kgdb.o

That is why this commit adds kgdb.o to obj-y, not to extra-y.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefan Roese <sr@denx.de>
11 years agosandbox: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:35:03 +0000 (17:35 +0900)]
sandbox: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
11 years agodisk: convert a makefile to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:35:02 +0000 (17:35 +0900)]
disk: convert a makefile to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agolib: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:35:01 +0000 (17:35 +0900)]
lib: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agonet: convert a makefile to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:35:00 +0000 (17:35 +0900)]
net: convert a makefile to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agocommon: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:59 +0000 (17:34 +0900)]
common: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agofs: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:58 +0000 (17:34 +0900)]
fs: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agodrivers: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:57 +0000 (17:34 +0900)]
drivers: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agodrivers: usb: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:56 +0000 (17:34 +0900)]
drivers: usb: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agodrivers: mtd: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:55 +0000 (17:34 +0900)]
drivers: mtd: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agodrivers: net: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:54 +0000 (17:34 +0900)]
drivers: net: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoARM: imx-common: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:53 +0000 (17:34 +0900)]
ARM: imx-common: convert makefiles to Kbuild style

Multiple targets are included in arch/arm/imx-common/Makefile
In order to refactor it,
we need to tweak Makefile and spl/Makefile.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoARM: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:52 +0000 (17:34 +0900)]
ARM: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoarm720t: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:51 +0000 (17:34 +0900)]
arm720t: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoarm920t: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:50 +0000 (17:34 +0900)]
arm920t: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoarm926ejs: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:49 +0000 (17:34 +0900)]
arm926ejs: convert makefiles to Kbuild style

Note1:
In arch/arm/cpu/arm926ejs/spear/Makefile
START := start.o
was changed
extra-$(CONFIG_SPL_BUILD) := start.o
because spear/start.o is only used for SPL.

Note2:
START := start.o
was missing from arch/arm/cpu/arm926ejs/mxs/Makefile.
This commit simply adds
extra-$(CONFIG_SPL_BUILD) := start.o

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoarmv7: convert makefiles to Kbuild style
Masahiro Yamada [Thu, 17 Oct 2013 08:34:48 +0000 (17:34 +0900)]
armv7: convert makefiles to Kbuild style

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
11 years agoMakefile: prepare for using Kbuild-style Makefile
Masahiro Yamada [Thu, 17 Oct 2013 08:34:47 +0000 (17:34 +0900)]
Makefile: prepare for using Kbuild-style Makefile

Every makefile in sub directories has common lines
at the top and the bottom.
This commit pushes the common parts into script/Makefile.build.

Going forward sub-makefiles only need to describe this part:

    COBJS := ...
    COBJS += ...
    SOBJS := ...

But using obj-y is preferable to prepare for switching to Kbuild.

The conventional (non-Kbuild) Makefile style is still supported.
This is achieved by greping the Makefile before entering into it.
U-Boot conventional sub makefiles always include some other makefiles.
So the build system searches a line beginning with "include" keyword
in the makefile in order to distinguish which style it is.
If the Makefile include a "include" line, we assume it is a conventional
U-Boot style. Otherwise, it is treated as a Kbuild-style makefile.

With this tweak, we can switch sub-makefiles
from U-Boot style to Kbuild style little by little.

obj-y := foo/
syntax (descending into the sub directory) is not supportd yet.
It will be implemented in the upcomming commit.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
11 years agonand_util.c: Correct licensing
Tom Rini [Thu, 31 Oct 2013 13:24:00 +0000 (09:24 -0400)]
nand_util.c: Correct licensing

Prior to SPDX licensing this file was GPL-2.0 with Freescale granting
rights for "or later" for their contributed code.  We incorrectly moved
this file to GPL-2.0+, so correct it to GPL-2.0.  In addition we cannot
easily denote in the file where or what code is "or later", so just set
that aside for now and the file as a whole is GPL-2.0 regardless.

Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Tom Rini <trini@ti.com>
11 years agopowerpc/esdhc: Add 3.3v voltage support in esdhc capacity register
Haijun.Zhang [Thu, 31 Oct 2013 01:38:19 +0000 (09:38 +0800)]
powerpc/esdhc: Add 3.3v voltage support in esdhc capacity register

T4240QDS eSDHC host capabilities reigster should have VS33 bit define.
Add quirk CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 to deal with capacity
missing

Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agoesdhc: memset mmc struct before putting into use
Haijun.Zhang [Thu, 31 Oct 2013 01:38:18 +0000 (09:38 +0800)]
esdhc: memset mmc struct before putting into use

struct mmc should be clear to all '0' after malloc to avoid
unexpect variable value.

Like mmc->has_init = xxx.
In this case mmcinfo will believe the card had been initialized before
and skip the initialization.

Test on P5040 and T4240,
Error Log:

=> mmcinfo
Device: FSL_SDHC
Manufacturer ID: 0
OEM: 0
Name: Tran Speed: 0
Rd Block Len: 0
MMC version 0.0
High Capacity: No
Capacity: 0 Bytes
Bus Width: 0-bit
=>

Signed-off-by: Haijun Zhang <Haijun.Zhang@freescale.com>
Signed-off-by: Xie Shaohui-B21989 <B21989@freescale.com>
Tested-by: Ryan Barnett <rjbarnet@rockwellcollins.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agoPowerpc/esdhc: Add simple description of esdhc register
Haijun.Zhang [Wed, 30 Oct 2013 03:37:55 +0000 (11:37 +0800)]
Powerpc/esdhc: Add simple description of esdhc register

Add some descriptions for esdhc register for easily using.

Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agopowerpc/esdhc: Map register for eSDHC Host Controller V3.0
Haijun.Zhang [Wed, 30 Oct 2013 03:37:54 +0000 (11:37 +0800)]
powerpc/esdhc: Map register for eSDHC Host Controller V3.0

eSDHC host controller has new register to support SD Spec 3.0.
And the according host controller version was Freescale eSDHC
Version 3.0.

Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agoDWMMC: SMDK5420: Disable SMU for eMMC
Rajeshwari Shinde [Tue, 29 Oct 2013 07:23:13 +0000 (12:53 +0530)]
DWMMC: SMDK5420: Disable SMU for eMMC

SMDK5420 has a new Security Management Unit added
for dwmmc driver, hence, configuring the control
registers to support booting via eMMC.

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agommc: sdhci: Avoid commands errors by simple timeout adaptation.
Przemyslaw Marczak [Tue, 8 Oct 2013 16:12:09 +0000 (18:12 +0200)]
mmc: sdhci: Avoid commands errors by simple timeout adaptation.

Old command timeout value was too small and it caused I/O errors which
led to uncompleted read/write/erase operations and filesystem errors.
Timeout adaptation fixes this issue.

Changes in sdhci_send_command() function:
- change timeout variable to static
- increase default command timeout to 100 ms
- add definition of max command timeout value,
  which can be redefined in each board config file
- wait for card ready state for max defined time
  if it doesn't exceed defined maximum or return COMM_ERR

Once successfully increased timeout value will be used in next function
call. This fix was tested on Goni, Trats, Trats2 boards by testing UMS
on MMC storage.

Changes v2:
- move global variable cmd_timeout into function sdhci_send_command()
- change condition "==" to ">=" when comparing time with timeout
- print information about timeout increasing and card busy timeout

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agommc: dw_mmc: change the callback function name.
Jaehoon Chung [Sun, 6 Oct 2013 09:59:31 +0000 (18:59 +0900)]
mmc: dw_mmc: change the callback function name.

To prevent the confusion, use the get_mmc_clk() instead of mmc_clk().
get_mmc_clk() is more exactly name.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agommc: Fix erase_grp_size for partitioned card
Oliver Metz [Tue, 1 Oct 2013 18:32:07 +0000 (20:32 +0200)]
mmc: Fix erase_grp_size for partitioned card

EXT_CSD_ERASE_GROUP_DEF is lost every time after a reset or
 power off. Set it if device has enhanced partitions.

Signed-off-by: Oliver Metz <oliver@freetz.org>
Acked-by: Pantelis Antoniou <panto@antoniou-consulting.com>
11 years agoMerge branch 'master' of git://git.denx.de/u-boot-video
Tom Rini [Wed, 30 Oct 2013 12:36:48 +0000 (08:36 -0400)]
Merge branch 'master' of git://git.denx.de/u-boot-video