kernel/u-boot.git
12 years agommc: omap: follow TRM procedure to power on cards
Grazvydas Ignotas [Mon, 19 Mar 2012 03:50:53 +0000 (03:50 +0000)]
mmc: omap: follow TRM procedure to power on cards

According to OMAP3 TRM, PBIASLITEPWRDNZ bits must be cleared while MMC
power supply is being enabled and is ramping up (those bits might be
left set by the previous bootloader). It doesn't say what happens if
this procedure is violated, but better not to risk here and do things
as required.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Tom Rini <trini@ti.com>
12 years agommc:fix: Set mmc width according to MMC host capabilities
Łukasz Majewski [Mon, 12 Mar 2012 22:07:18 +0000 (22:07 +0000)]
mmc:fix: Set mmc width according to MMC host capabilities

This patch sets the MMC width according to the MMC host capabilities.
It turned out, that there are some targets (e.g. GONI), which are able
to read data from SPI only at 4 bit mode.
This patch restricts the width number according to the MMC host.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Andy Fleming <afleming@gmail.com>
12 years agoMerge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Mon, 30 Apr 2012 16:19:28 +0000 (18:19 +0200)]
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  lin_gadget: use common linux/compat.h
  linux/compat.h: rename from linux/mtd/compat.h
  lin_gadget: use common mdelay
  gunzip: rename z{alloc, free} to gz{alloc, free}
  fs/fat: align disk buffers on cache line to enable DMA and cache
  part_dos: align disk buffers on cache line to enable DMA and cache

12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 30 Apr 2012 14:55:37 +0000 (16:55 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  powerpc/ppc4xx: Remove typedefs for gdsys FPGA
  powerpc/ppc4xx: Fix typo in gdsys_fpga.h
  powerpc/ppc4xx: Update gdsys board configurations
  powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
  powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
  powerpc/ppc4xx: Make gdsys 405ep boards reset more generic
  powerpc/ppc4xx: Adjust environment size on neo

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Mon, 30 Apr 2012 14:55:25 +0000 (16:55 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  powerpc/ppc4xx: Remove typedefs for gdsys FPGA
  powerpc/ppc4xx: Fix typo in gdsys_fpga.h
  powerpc/ppc4xx: Update gdsys board configurations
  powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
  powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
  powerpc/ppc4xx: Make gdsys 405ep boards reset more generic
  powerpc/ppc4xx: Adjust environment size on neo

12 years agolin_gadget: use common linux/compat.h
Mike Frysinger [Thu, 26 Apr 2012 02:34:44 +0000 (02:34 +0000)]
lin_gadget: use common linux/compat.h

Merge our duplicate definitions with the common header.

Also fix drivers/usb/gadget/s3c_udc_otg_xfer_dma.c to
use min() instead of min_t() since we remove the latter
from compat.h.

Additionally use memalign() directly as the lin_gadget
specific kmalloc() macro is removed from lin_gadget_compat.h
by this patch.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
12 years agolinux/compat.h: rename from linux/mtd/compat.h
Mike Frysinger [Mon, 9 Apr 2012 13:39:55 +0000 (13:39 +0000)]
linux/compat.h: rename from linux/mtd/compat.h

This lets us use it in more places than just mtd code.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agolin_gadget: use common mdelay
Mike Frysinger [Mon, 9 Apr 2012 13:39:54 +0000 (13:39 +0000)]
lin_gadget: use common mdelay

No need to provide our own mdelay() macro when we have a func for it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agogunzip: rename z{alloc, free} to gz{alloc, free}
Mike Frysinger [Mon, 9 Apr 2012 13:39:53 +0000 (13:39 +0000)]
gunzip: rename z{alloc, free} to gz{alloc, free}

This allows us to add a proper zalloc() func (one that does a zeroing
alloc), and removes duplicate prototypes.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agofs/fat: align disk buffers on cache line to enable DMA and cache
Eric Nelson [Wed, 11 Apr 2012 04:08:53 +0000 (04:08 +0000)]
fs/fat: align disk buffers on cache line to enable DMA and cache

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agopart_dos: align disk buffers on cache line to enable DMA and cache
Eric Nelson [Sat, 3 Mar 2012 12:02:20 +0000 (12:02 +0000)]
part_dos: align disk buffers on cache line to enable DMA and cache

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoAllow for parallel builds and saved output
Andy Fleming [Tue, 24 Apr 2012 19:33:51 +0000 (19:33 +0000)]
Allow for parallel builds and saved output

The MAKEALL script cleverly runs make with the appropriate options
to use all of the cores on the system, but your average U-Boot build
can't make much use of more than a few cores.  If you happen to have
a many-core server, your builds will leave most of the system idle.

In order to make full use of such a system, we need to build multiple
targets in parallel, and this requires directing make output into
multiple directories. We add a BUILD_NBUILDS variable, which allows
users to specify how many builds to run in parallel.
When BUILD_NBUILDS is set greater than 1, we redefine BUILD_DIR for
each build to be ${BUILD_DIR}/${target}. Also, we make "./build" the
default BUILD_DIR when BUILD_NBUILDS is greater than 1.

MAKEALL now tracks which builds are still running, and when one
finishes, it starts a new build.

Once each build finishes, we run "make tidy" on its directory, to reduce
the footprint.

As a result, we are left with a build directory with all of the built
targets still there for use, which means anyone who wanted to use
MAKEALL as part of a test harness can now do so.

Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 30 Apr 2012 14:45:59 +0000 (16:45 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  powerpc/85xx: don't touch MAS7 on e500v1 when relocating CCSR
  powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot
  cmd_bdinfo: display the address map size (32-bit vs. 36-bit)
  PowerPC: correct the SATA for p1/p2 rdb-pc platform
  powerpc/corenet_ds: Slave core in holdoff when boot from SRIO
  powerpc/corenet_ds: Slave reads ENV from master when boot from SRIO
  powerpc/corenet_ds: Slave uploads ucode when boot from SRIO
  powerpc/corenet_ds: Slave module for boot from SRIO
  powerpc/corenet_ds: Master module for boot from SRIO
  powerpc/corenet_ds: Document for the boot from SRIO
  powerpc/corenet_ds: Correct the compilation errors about ENV
  powerpc/srio: Rewrite the struct ccsr_rio
  powerpc/85xx:Fix lds for nand boot debug info
  powerpc/p2041rdb: add env in NAND support
  powerpc/p2041rdb: add NAND and NAND boot support
  powerpc/mpc8xxx: Fix CONFIG_DDR_RAW_TIMING for two boards
  powerpc/85xx:Avoid vector table compilation for nand_spl
  powerpc/85xx:Fix IVORs addr after vector table relocation
  powerpc/85xx:Avoid hardcoded vector address for IVORs
  powerpc/p1023rds: Disable nor flash node and enable nand flash node

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Wolfgang Denk [Mon, 30 Apr 2012 14:45:56 +0000 (16:45 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/85xx: don't touch MAS7 on e500v1 when relocating CCSR
  powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot
  cmd_bdinfo: display the address map size (32-bit vs. 36-bit)
  PowerPC: correct the SATA for p1/p2 rdb-pc platform
  powerpc/corenet_ds: Slave core in holdoff when boot from SRIO
  powerpc/corenet_ds: Slave reads ENV from master when boot from SRIO
  powerpc/corenet_ds: Slave uploads ucode when boot from SRIO
  powerpc/corenet_ds: Slave module for boot from SRIO
  powerpc/corenet_ds: Master module for boot from SRIO
  powerpc/corenet_ds: Document for the boot from SRIO
  powerpc/corenet_ds: Correct the compilation errors about ENV
  powerpc/srio: Rewrite the struct ccsr_rio
  powerpc/85xx:Fix lds for nand boot debug info
  powerpc/p2041rdb: add env in NAND support
  powerpc/p2041rdb: add NAND and NAND boot support
  powerpc/mpc8xxx: Fix CONFIG_DDR_RAW_TIMING for two boards
  powerpc/85xx:Avoid vector table compilation for nand_spl
  powerpc/85xx:Fix IVORs addr after vector table relocation
  powerpc/85xx:Avoid hardcoded vector address for IVORs
  powerpc/p1023rds: Disable nor flash node and enable nand flash node

12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 30 Apr 2012 14:43:52 +0000 (16:43 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  i2c:designware Turn off the ctrl when setting the speed
  i2c: Add support for designware i2c controller
  sh: i2c: Add support I2C controller of SH7734

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-i2c
Wolfgang Denk [Mon, 30 Apr 2012 14:43:49 +0000 (16:43 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-i2c

* 'master' of git://git.denx.de/u-boot-i2c:
  i2c:designware Turn off the ctrl when setting the speed
  i2c: Add support for designware i2c controller
  sh: i2c: Add support I2C controller of SH7734

12 years agoMerge branch 'master' of /home/wd/git/u-boot/custodians
Wolfgang Denk [Mon, 30 Apr 2012 14:41:25 +0000 (16:41 +0200)]
Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  Blackfin: bfin_sdh: drop dos part hardcode
  Blackfin: move gd/bd to bss by default
  Blackfin: gd_t: relocate volatile markings

12 years agoMerge branch 'master' of git://git.denx.de/u-boot-blackfin
Wolfgang Denk [Mon, 30 Apr 2012 14:41:23 +0000 (16:41 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

* 'master' of git://git.denx.de/u-boot-blackfin:
  Blackfin: bfin_sdh: drop dos part hardcode
  Blackfin: move gd/bd to bss by default
  Blackfin: gd_t: relocate volatile markings

12 years agoimage/fit: drop inline markings on parser code
Mike Frysinger [Sun, 22 Apr 2012 06:59:06 +0000 (06:59 +0000)]
image/fit: drop inline markings on parser code

Putting "inline" on extern funcs makes no sense, so drop them.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-nds32
Wolfgang Denk [Mon, 30 Apr 2012 14:29:16 +0000 (16:29 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-nds32

* 'master' of git://git.denx.de/u-boot-nds32:
  board/adp-ag102: add configuration of adp-ag102
  board/adp-ag102: add board specific files
  nds32/ag102: add ag102 soc support
  nds32/ag102: add header support of ag102 soc

12 years agopowerpc/ppc4xx: Remove typedefs for gdsys FPGA
Dirk Eibach [Fri, 27 Apr 2012 08:33:46 +0000 (10:33 +0200)]
powerpc/ppc4xx: Remove typedefs for gdsys FPGA

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopowerpc/ppc4xx: Fix typo in gdsys_fpga.h
Dirk Eibach [Thu, 26 Apr 2012 03:54:26 +0000 (03:54 +0000)]
powerpc/ppc4xx: Fix typo in gdsys_fpga.h

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopowerpc/ppc4xx: Update gdsys board configurations
Dirk Eibach [Thu, 26 Apr 2012 03:54:25 +0000 (03:54 +0000)]
powerpc/ppc4xx: Update gdsys board configurations

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopowerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20
Dirk Eibach [Thu, 26 Apr 2012 03:54:24 +0000 (03:54 +0000)]
powerpc/ppc4xx: Support gdsys dlvision-10g hardware 1.20

In hardware revision 1.20 one more fan controller is added to dlvision-10g.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopowerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes
Dirk Eibach [Thu, 26 Apr 2012 03:54:23 +0000 (03:54 +0000)]
powerpc/ppc4xx: Adapt gdsys 405ep boards to platform changes

Print fpga info at last_stage_init on gdsys 405ep boards.
Use dtt_init() to startup fans.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopowerpc/ppc4xx: Make gdsys 405ep boards reset more generic
Dirk Eibach [Thu, 26 Apr 2012 03:54:22 +0000 (03:54 +0000)]
powerpc/ppc4xx: Make gdsys 405ep boards reset more generic

In order to add boards that have different hardware for fpga reset,
any 405ep gdsys board now provides these functions:

void gd405ep_init(void);
void gd405ep_set_fpga_reset(unsigned state);
void gd405ep_setup_hw(void);
int gd405ep_get_fpga_done(unsigned fpga);

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopowerpc/ppc4xx: Adjust environment size on neo
Dirk Eibach [Thu, 26 Apr 2012 03:54:21 +0000 (03:54 +0000)]
powerpc/ppc4xx: Adjust environment size on neo

Environment size on neo has to be 0x20000 for compatibilty reasons.

Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
12 years agopatman: Change the location of patman path
Vikram Narayanan [Fri, 27 Apr 2012 06:39:31 +0000 (06:39 +0000)]
patman: Change the location of patman path

Fix the location of patman path in README

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
12 years agopatman: Fix a typo error
Vikram Narayanan [Wed, 25 Apr 2012 05:45:05 +0000 (05:45 +0000)]
patman: Fix a typo error

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoGCC47: Fix warning in md5.c
Marek Vasut [Sat, 28 Apr 2012 22:28:40 +0000 (00:28 +0200)]
GCC47: Fix warning in md5.c

md5.c: In function ‘MD5Final’:
md5.c:156:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
md5.c:157:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoGCC47: Fix warning in cmd_nand.c
Marek Vasut [Sat, 28 Apr 2012 22:28:39 +0000 (00:28 +0200)]
GCC47: Fix warning in cmd_nand.c

cmd_nand.c: In function ‘arg_off_size’:
cmd_nand.c:216:5: warning: ‘maxsize’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging
Wolfgang Denk [Fri, 27 Apr 2012 11:03:26 +0000 (13:03 +0200)]
Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging

* 'marex@denx.de' of git://git.denx.de/u-boot-staging:
  CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic
  CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE
  CMD: Fix typo CMD_FSL -> CMD_MFSL in readme
  HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM
  CMD: Remove CMD_LOG, it's unused
  CMD: Fix typo KGBD -> KGDB on debris board
  CMD: Drop CONFIG_CMD_EMMC, it's not used
  CMD: Drop CONFIG_CMD_DFL, it's not used
  CMD: Drop CMD_DCR, it's not used
  CMD: Drop CMD_CAN, it's not used
  CMD: Remove CMD_AUTOSCRIPT, it's not used
  AT91: Drop AT91_SPIMUX command from cmd_all

12 years agoPrepare v2012.04.01 v2012.04.01
Wolfgang Denk [Wed, 25 Apr 2012 13:22:50 +0000 (15:22 +0200)]
Prepare v2012.04.01

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agopowerpc/85xx: don't touch MAS7 on e500v1 when relocating CCSR
Timur Tabi [Mon, 26 Mar 2012 09:49:08 +0000 (09:49 +0000)]
powerpc/85xx: don't touch MAS7 on e500v1 when relocating CCSR

The CCSR relocation code in start.S writes to MAS7 on all e500 parts, but
that register does not exist on e500v1.

Signed-off-by: Timur Tabi <timur@freescale.com>
12 years agopowerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot
Timur Tabi [Thu, 15 Mar 2012 11:42:27 +0000 (11:42 +0000)]
powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot

Most 85xx boards can be built as a 32-bit or a 36-bit.  Current code sometimes
displays which of these is actually built, but it's inconsistent.  This is
especially problematic since the "default" build for a given 85xx board can
be either one, so if you don't see a message, you can't always know which
size is being used.  Not only that, but each board includes code that displays
the message, so there is duplication.

The 'bdinfo' command has been updated to display this information, so
we don't need to display it at boot time.  The board-specific code is
deleted.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agocmd_bdinfo: display the address map size (32-bit vs. 36-bit)
Timur Tabi [Thu, 15 Mar 2012 11:42:26 +0000 (11:42 +0000)]
cmd_bdinfo: display the address map size (32-bit vs. 36-bit)

Some Freescale SOCs support 32-bit and 36-bit physical addressing, and
U-Boot must be built to enable one or the other.  Add this information
to the bdinfo command.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agoPowerPC: correct the SATA for p1/p2 rdb-pc platform
Jerry Huang [Sun, 11 Mar 2012 16:15:04 +0000 (16:15 +0000)]
PowerPC: correct the SATA for p1/p2 rdb-pc platform

For p1/p2 rdb-pc platform, use the PCIe-SATA Silicon Image SATA controller.
Therefore, the SATA driver will use sata_sil, instead sata_sil3114.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
CC: Andy Fleming <afleming@gmail.com>
12 years agopowerpc/corenet_ds: Slave core in holdoff when boot from SRIO
Liu Gang [Thu, 8 Mar 2012 00:33:21 +0000 (00:33 +0000)]
powerpc/corenet_ds: Slave core in holdoff when boot from SRIO

When boot from SRIO, slave's core can be in holdoff after powered on for
some specific requirements. Master can release the slave's core at the
right time by SRIO interface.

Master needs to:
1. Set outbound SRIO windows in order to configure slave's registers
   for the core's releasing.
2. Check the SRIO port status when release slave core, if no errors,
   will implement the process of the slave core's releasing.
Slave needs to:
1. Set all the cores in holdoff by RCW.
2. Be powered on before master's boot.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
12 years agopowerpc/corenet_ds: Slave reads ENV from master when boot from SRIO
Liu Gang [Thu, 8 Mar 2012 00:33:20 +0000 (00:33 +0000)]
powerpc/corenet_ds: Slave reads ENV from master when boot from SRIO

When boot from SRIO, slave's ENV can be stored in master's memory space,
then slave can fetch the ENV through SRIO interface.

NOTE: Because the slave can not erase, write master's NOR flash by SRIO
  interface, so it can not modify the ENV parameters stored in
  master's NOR flash using "saveenv" or other commands.

Master needs to:
1. Put the slave's ENV into it's own memory space.
2. Set an inbound SRIO window covered slave's ENV stored in master's
   memory space.
Slave needs to:
1. Set a specific TLB entry in order to fetch ucode and ENV from master.
2. Set a LAW entry with the TargetID SRIO1 or SRIO2 for ucode and ENV.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
12 years agopowerpc/corenet_ds: Slave uploads ucode when boot from SRIO
Liu Gang [Thu, 8 Mar 2012 00:33:19 +0000 (00:33 +0000)]
powerpc/corenet_ds: Slave uploads ucode when boot from SRIO

When boot from SRIO, slave's ucode can be stored in master's memory space,
then slave can fetch the ucode image through SRIO interface. For the
corenet platform, ucode is for Fman.

Master needs to:
1. Put the slave's ucode image into it's own memory space.
2. Set an inbound SRIO window covered slave's ucode stored in master's
   memory space.
Slave needs to:
1. Set a specific TLB entry in order to fetch ucode from master.
2. Set a LAW entry with the TargetID SRIO1 or SRIO2 for ucode.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
12 years agopowerpc/corenet_ds: Slave module for boot from SRIO
Liu Gang [Thu, 8 Mar 2012 00:33:18 +0000 (00:33 +0000)]
powerpc/corenet_ds: Slave module for boot from SRIO

For the powerpc processors with SRIO interface, boot location can be configured
from SRIO1 or SRIO2 by RCW. The processor booting from SRIO can do without flash
for u-boot image. The image can be fetched from another processor's memory
space by SRIO link connected between them.

The processor boots from SRIO is slave, the processor boots from normal flash
memory space and can help slave to boot from its memory space is master.
They are different environments and requirements:

master:
1. NOR flash for its own u-boot image, ucode and ENV space.
2. Slave's u-boot image in master NOR flash.
3. Normally boot from local NOR flash.
4. Configure SRIO switch system if needed.
slave:
1. Just has EEPROM for RCW. No flash for u-boot image, ucode and ENV.
2. Boot location should be set to SRIO1 or SRIO2 by RCW.
3. RCW should configure the SerDes, SRIO interfaces correctly.
4. Slave must be powered on after master's boot.
5. Must define CONFIG_SYS_QE_FMAN_FW_IN_REMOTE because of no ucode
   locally.

For the slave module, need to finish these processes:
1. Set the boot location to SRIO1 or SRIO2 by RCW.
    2. Set a specific TLB entry for the boot process.
3. Set a LAW entry with the TargetID SRIO1 or SRIO2 for the boot.
4. Slave's u-boot image should be generated specifically by
   make xxxx_SRIOBOOT_SLAVE_config.
   This will set SYS_TEXT_BASE=0xFFF80000 and other configurations.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
12 years agopowerpc/corenet_ds: Master module for boot from SRIO
Liu Gang [Thu, 8 Mar 2012 00:33:17 +0000 (00:33 +0000)]
powerpc/corenet_ds: Master module for boot from SRIO

For the powerpc processors with SRIO interface, boot location can be configured
from SRIO1 or SRIO2 by RCW. The processor booting from SRIO can do without flash
for u-boot image. The image can be fetched from another processor's memory
space by SRIO link connected between them.

The processor boots from SRIO is slave, the processor boots from normal flash
memory space and can help slave to boot from its memory space is master.
They are different environments and requirements:

master:
1. NOR flash for its own u-boot image, ucode and ENV space.
2. Slave's u-boot image in master NOR flash.
3. Normally boot from local NOR flash.
4. Configure SRIO switch system if needed.
slave:
1. Just has EEPROM for RCW. No flash for u-boot image, ucode and ENV.
2. Boot location should be set to SRIO1 or SRIO2 by RCW.
3. RCW should configure the SerDes, SRIO interfaces correctly.
4. Slave must be powered on after master's boot.

For the master module, need to finish these processes:
1. Initialize the SRIO port and address space.
2. Set inbound SRIO windows covered slave's u-boot image stored in
   master's NOR flash.
3. Master's u-boot image should be generated specifically by
   make xxxx_SRIOBOOT_MASTER_config
4. Master must boot first, and then slave can be powered on.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
12 years agopowerpc/corenet_ds: Document for the boot from SRIO
Liu Gang [Thu, 8 Mar 2012 00:33:16 +0000 (00:33 +0000)]
powerpc/corenet_ds: Document for the boot from SRIO

This document describes the implementation of the boot from SRIO,
includes the introduction of envionment, an example based on P4080DS
platform, an example of the slave's RCW, and the description about
how to use this feature.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
12 years agopowerpc/corenet_ds: Correct the compilation errors about ENV
Liu Gang [Thu, 8 Mar 2012 00:33:15 +0000 (00:33 +0000)]
powerpc/corenet_ds: Correct the compilation errors about ENV

When defined CONFIG_ENV_IS_NOWHERE, there will be some
compilation errors:

./common/env_nowhere.o: In function `env_relocate_spec':
./common/env_nowhere.c:38: multiple definition of `env_relocate_spec'
./common/env_flash.o: ./common/env_flash.c:326: first defined here
./common/env_nowhere.o: In function `env_get_char_spec':
./common/env_nowhere.c:42: multiple definition of `env_get_char_spec'
./common/env_flash.o:./common/env_flash.c:78: first defined here
./common/env_nowhere.o: In function `env_init':
./common/env_nowhere.c:51: multiple definition of `env_init'
./common/env_flash.o:./common/env_flash.c:237: first defined here
make[1]: *** [./common/libcommon.o] Error 1
make[1]: Leaving directory `./common'
make: *** [./common/libcommon.o] Error 2

Remove the CONFIG_ENV_IS_IN_FLASH if defined CONFIG_ENV_IS_NOWHERE.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
12 years agopowerpc/srio: Rewrite the struct ccsr_rio
Liu Gang [Thu, 8 Mar 2012 00:33:14 +0000 (00:33 +0000)]
powerpc/srio: Rewrite the struct ccsr_rio

Rewrite this struct for the support of two ports and two message
units registers.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
12 years agopowerpc/85xx:Fix lds for nand boot debug info
Prabhakar Kushwaha [Wed, 29 Feb 2012 18:00:23 +0000 (18:00 +0000)]
powerpc/85xx:Fix lds for nand boot debug info

Currently "u-boot", the elf file generated via u-boot-nand.lds does not
contain required debug information i.e. .debug_{line, info, abbrev, aranges,
ranges} into their respective _global_ sections.

The original ld script line arch/powerpc/cpu/mpc85xx/start.o
KEEP(*(.bootpg)) is not entirely correct because the start.o file is already
processed by the linker,therefore the file wildcard in "KEEP(*(.bootpg))" will
not process start.o again for bootpg.

So Fix u-boot-nand.lds to generate these debug information.

Signed-off-by: Anmol Paralkar <b07584@freescale.com>
Signed-off-by: John Russo <John.Russo@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/p2041rdb: add env in NAND support
Shaohui Xie [Tue, 28 Feb 2012 23:28:40 +0000 (23:28 +0000)]
powerpc/p2041rdb: add env in NAND support

Add env in NAND support when boot from NAND.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/p2041rdb: add NAND and NAND boot support
Shaohui Xie [Tue, 28 Feb 2012 23:28:07 +0000 (23:28 +0000)]
powerpc/p2041rdb: add NAND and NAND boot support

New P2041RDB board will add a NAND chip, so add support for NAND and
NAND boot.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/mpc8xxx: Fix CONFIG_DDR_RAW_TIMING for two boards
York Sun [Wed, 29 Feb 2012 12:36:51 +0000 (12:36 +0000)]
powerpc/mpc8xxx: Fix CONFIG_DDR_RAW_TIMING for two boards

P1010RDB and p1_pc_rdb_pc has incorrect configuration for
CONFIG_DDR_RAW_TIMING. It should be CONFIG_SYS_DDR_RAW_TIMING.
Incorrect setting causes DDR failure in case of SPD absent.

Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/85xx:Avoid vector table compilation for nand_spl
Prabhakar Kushwaha [Tue, 14 Feb 2012 22:50:02 +0000 (22:50 +0000)]
powerpc/85xx:Avoid vector table compilation for nand_spl

NAND SPL code never compile the vector table.
So no need to setup interrupt vector table for NAND SPL.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/85xx:Fix IVORs addr after vector table relocation
Prabhakar Kushwaha [Tue, 14 Feb 2012 22:49:49 +0000 (22:49 +0000)]
powerpc/85xx:Fix IVORs addr after vector table relocation

After relocation of vector table in SDRAM's lower address, IVORs value should
be updated with new handler addresses.

As vector tables are relocated to 0x100,0x200... 0xf00 address in DDR.IVORs
are updated with 0x100, 0x200,....f00  hard-coded values.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/85xx:Avoid hardcoded vector address for IVORs
Prabhakar Kushwaha [Tue, 14 Feb 2012 22:49:29 +0000 (22:49 +0000)]
powerpc/85xx:Avoid hardcoded vector address for IVORs

For e500 and e500v2 architecturees processor IVPR address should be alinged on
64K boundary.

in start.S, CONFIG_SYS_MONITOR_BASE is stored blindly in IVPR assuming it to be
64K aligned. It may not be true always. If it is not aligned, IVPR + IVORs may
not point to an exception handler.

Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agopowerpc/p1023rds: Disable nor flash node and enable nand flash node
Chunhe Lan [Wed, 18 Apr 2012 20:58:56 +0000 (15:58 -0500)]
powerpc/p1023rds: Disable nor flash node and enable nand flash node

In the p1023rds, when system boots from nor flash, kernel only accesses nor
flash and can not access nand flash with BR0/OR0; when system boots from
nand flash, kernel only accesses nand flash and can not access nor flash
with BR0/OR0.

Default device tree nor and nand node should have the following structure:

Example:

nor_flash: nor@0,0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "cfi-flash";
reg = <0x0 0x0 0x02000000>;
bank-width = <2>;
device-width = <1>;
status = "okay";

partition@0 {
label = "ramdisk";
reg = <0x00000000 0x01c00000>;
};
}

nand_flash: nand@1,0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "fsl,p1023-fcm-nand",
     "fsl,elbc-fcm-nand";
reg = <0x2 0x0 0x00040000>;
status = "disabled";

u-boot-nand@0 {
/* This location must not be altered  */
/* 1MB for u-boot Bootloader Image */
reg = <0x0 0x00100000>;
read-only;
};
}

When booting from nor flash, the status of nor node is enabled and the
status of nand node is disabled in the default dts file, so do not do
anything.

But, when booting from nand flash, need to do some operations:

o Disable the NOR node by setting status = "disabled";
o Enable the NAND node by setting status = "okay";

Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
12 years agoi2c:designware Turn off the ctrl when setting the speed
Armando Visconti [Thu, 29 Mar 2012 20:10:17 +0000 (20:10 +0000)]
i2c:designware Turn off the ctrl when setting the speed

The designware i2c controller must be turned off before
setting the speed in IC_CON register, as stated in the
section 6.3.1 of the dw_apb_i2c_db.pdf.

Signed-off-by: Michel Sanches <michel.sanches@st.com>
Signed-off-by: Armando Visconti <armando.visconti@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agoi2c: Add support for designware i2c controller
Vipin KUMAR [Sun, 26 Feb 2012 23:13:29 +0000 (23:13 +0000)]
i2c: Add support for designware i2c controller

Earlier, a driver exists in the u-boot source for designware i2c interface. That
driver was specific to spear platforms. This patch implements the i2c controller
as a generic driver which can be used by multiple platforms

The driver files are now renamed to designware_i2c.c and designware_i2c.h and
these are moved into drivers/i2c folder for reusability by other
platforms

Signed-off-by: Vipin Kumar <vipin.kumar@st.com>
Signed-off-by: Amit Virdi <amit.virdi@st.com>
12 years agosh: i2c: Add support I2C controller of SH7734
Nobuhiro Iwamatsu [Thu, 1 Mar 2012 17:56:35 +0000 (17:56 +0000)]
sh: i2c: Add support I2C controller of SH7734

Renesas SH7734 has two I2C interfaceis.
This supports these I2C.

V5: - include i2c.h.
    - Add check of icsr bit polling logic.
- Implement i2c_probe.
V4: - Remove sh_i2c_dump_reg function.
    - Use puts() when there's no format.
    - Chnage check for I2C bus number.
    - Remove space before the semi-colon.
V3: - Fix error for whitespace.
V2: - Changed bit control to use the clr|set|clrsetbits_* functions.
    - Fix wrong comment style.
    - Add new line before for loop in i2c_read.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agosandbox: Use the new run_command()
Simon Glass [Fri, 30 Mar 2012 21:30:57 +0000 (21:30 +0000)]
sandbox: Use the new run_command()

Now that run_command() handles both parsers, clean up sandbox to use it.
This fixes a build error.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoarm: restore fdt_fixup_ethernet call to do_bootm_linux
Stephen Warren [Thu, 19 Apr 2012 11:09:49 +0000 (11:09 +0000)]
arm: restore fdt_fixup_ethernet call to do_bootm_linux

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux for ARM. During the re-organization, the call to
fdt_fixup_ethernet() was removed. I assume this was useful, so add it
back.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
12 years agoarm: fix bootm with device tree
Stephen Warren [Thu, 19 Apr 2012 11:34:00 +0000 (11:34 +0000)]
arm: fix bootm with device tree

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux() for ARM. During the re-organization, the code to pass
the device tree to the kernel was removed. Add it back. This restores
the ability to boot a kernel using device tree.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
Acked-by: Allen Martin <amartin@nvidia.com>
Tested-by: Allen Martin <amartin@nvidia.com>
12 years agoFix the behaviour of the 'run' command
Timo Ketola [Sun, 22 Apr 2012 23:57:27 +0000 (23:57 +0000)]
Fix the behaviour of the 'run' command

If one command fails, 'run' command should terminate and not execute
any remaining variables.

Signed-off-by: Timo Ketola <timo@exertus.fi>
Tested-by: Wolfgang Denk <wd@denx.de>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoBlackfin: bfin_sdh: drop dos part hardcode
Mike Frysinger [Sun, 26 Feb 2012 18:50:45 +0000 (13:50 -0500)]
Blackfin: bfin_sdh: drop dos part hardcode

No other driver sets up the part type to DOS in their init, and it
doesn't seem to be needed as `mmcinfo` and `mmc part` stll work, so
drop it.

Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: move gd/bd to bss by default
Mike Frysinger [Thu, 1 Mar 2012 03:48:10 +0000 (22:48 -0500)]
Blackfin: move gd/bd to bss by default

We don't need these setup manually, so let the bss do the rest.  On
Blackfin systems, we clear the bss before executing any C code that
would use these, so this should be fine.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoBlackfin: gd_t: relocate volatile markings
Mike Frysinger [Thu, 16 Feb 2012 06:10:43 +0000 (01:10 -0500)]
Blackfin: gd_t: relocate volatile markings

This makes Blackfin behave the same as other ports, and fixes many gcc
warnings that show up with 4.5+:
board.c:40:1: warning: optimization may eliminate reads and/or
writes to register variables

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
12 years agoboard/adp-ag102: add configuration of adp-ag102
Macpaul Lin [Fri, 23 Sep 2011 08:49:59 +0000 (16:49 +0800)]
board/adp-ag102: add configuration of adp-ag102

board:
Add config file of board adp-ag102
Add adp-ag102 into boards.cfg
Add adp-ag102 into MAINTAINERS

doc:
add README of ag102

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agoboard/adp-ag102: add board specific files
Macpaul Lin [Fri, 23 Sep 2011 08:48:16 +0000 (16:48 +0800)]
board/adp-ag102: add board specific files

Add board specific files.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32/ag102: add ag102 soc support
Macpaul Lin [Fri, 23 Sep 2011 09:03:19 +0000 (17:03 +0800)]
nds32/ag102: add ag102 soc support

Add lowlevel ag102 soc support.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agonds32/ag102: add header support of ag102 soc
Macpaul Lin [Fri, 23 Sep 2011 09:31:27 +0000 (17:31 +0800)]
nds32/ag102: add header support of ag102 soc

Add device address offsets header of ag102 soc.
Add ag102 into mach-types.h.
Add asm-offsets.c for helping convert C headers into asm.

Signed-off-by: Macpaul Lin <macpaul@andestech.com>
12 years agoPrepare v2012.04 v2012.04
Wolfgang Denk [Sat, 21 Apr 2012 16:55:26 +0000 (18:55 +0200)]
Prepare v2012.04

Also tiny style cleanup to tools/patman/README

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agonet: ll_temac: drop obsolete "NAMESIZE" define
Stephan Linz [Tue, 10 Apr 2012 06:20:57 +0000 (06:20 +0000)]
net: ll_temac: drop obsolete "NAMESIZE" define

... after commit "net/miiphy/serial: drop duplicate NAMESIZE
define" (sha1:f6add13) was applied. The building of the new
LL TEMAC network driver fails with error below:

xilinx_ll_temac.c: In function 'xilinx_ll_temac_initialize':
xilinx_ll_temac.c:301: error: 'NAMESIZE' undeclared (first use in this function)
xilinx_ll_temac.c:301: error: (Each undeclared identifier is reported only once
xilinx_ll_temac.c:301: error: for each function it appears in.)

Signed-off-by: Stephan Linz <linz@li-pro.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
12 years agoAdd 'patman' patch generation, checking and submission script
Simon Glass [Sat, 14 Jan 2012 15:12:45 +0000 (15:12 +0000)]
Add 'patman' patch generation, checking and submission script

What is this?

=============

This tool is a Python script which:
- Creates patch directly from your branch
- Cleans them up by removing unwanted tags
- Inserts a cover letter with change lists
- Runs the patches through checkpatch.pl and its own checks
- Optionally emails them out to selected people

It is intended to automate patch creation and make it a less
error-prone process. It is useful for U-Boot and Linux work so far,
since it uses the checkpatch.pl script.

It is configured almost entirely by tags it finds in your commits.
This means that you can work on a number of different branches at
once, and keep the settings with each branch rather than having to
git format-patch, git send-email, etc. with the correct parameters
each time. So for example if you put:

in one of your commits, the series will be sent there.

See the README file for full details.
END

Signed-off-by: Simon Glass <sjg@chromium.org>
12 years agoeb_cpux9k2: add USB host support to board
Jens Scharsig [Mon, 11 Jul 2011 09:25:42 +0000 (09:25 +0000)]
eb_cpux9k2: add USB host support to board

Signed-off-by: Jens Scharsig <js_at_ng@scharsoft.de>
12 years agommc: Fix warning if CONFIG_MMC_TRACE is enabled
Dirk Behme [Thu, 8 Mar 2012 02:35:34 +0000 (02:35 +0000)]
mmc: Fix warning if CONFIG_MMC_TRACE is enabled

Fix the warning

mmc.c: In function 'mmc_send_cmd':
mmc.c:87: warning: assignment from incompatible pointer type

in case CONFIG_MMC_TRACE is enabled.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Andy Fleming <afleming@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Marek Vasut <marex@denx.de>
12 years agoehci-omap: fix for enabling the correct usb port
Jeroen Hofstee [Thu, 19 Apr 2012 11:25:18 +0000 (11:25 +0000)]
ehci-omap: fix for enabling the correct usb port

This is just a patch for the problem reported here:
http://lists.denx.de/pipermail/u-boot/2012-February/117580.html originally reported by Igor.

"Looks like this is copy paste error from my side,(for port2/3 it should have been bypass
 for port2/3 rather its port1 set in bypass mode)"

I only submit the patch since it is missing in 2012.04-rc3 while the twister board
depends on it. Maybe it is already somewhere in the reposistory, but I cannot find it.

note: the twister boards still needs an additional `usb reset`, don't know why.

U-Boot 2012.04-rc3-dirty (Apr 19 2012 - 21:38:38)

AM35XX-GP ES1.0, CPU-OPP2, L3-165MHz, Max CPU Clock 600 Mhz
TAM3517 TWISTER Board + LPDDR/NAND
I2C:   ready
DRAM:  256 MiB
NAND:  512 MiB
MMC:   OMAP SD/MMC: 0
In:    serial
Out:   serial
Err:   serial
Die ID #746c0000000000000155dc1405011024
Net:   DaVinci-EMAC, smc911x-0
Hit any key to stop autoboot:  0
twister => usb start
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found
twister => usb reset
(Re)start USB...
USB:   Register 1313 NbrPorts 3
USB EHCI 1.00
scanning bus for devices... 1 USB Device(s) found
       scanning bus for storage devices... 0 Storage Device(s) found

Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Acked-by: Govindraj.R <govindraj.raja <at> ti.com>
Acked-by: Tom Rini <trini@ti.com>
12 years agofdt: avoid bad MAKEALL status
Wolfgang Denk [Thu, 19 Apr 2012 02:36:44 +0000 (02:36 +0000)]
fdt: avoid bad MAKEALL status

Current versions of  dtc  always print a message like

DTC: dts->dtb  on file "dt.dtb.tmp"

which cannot even be suppressed with "-qqq".  To avoid incorrect
MAKEALL status, we manually filter out this message.  This is a bit
complicated, as we have to make sure to set a correct return code.

Also, get rid of the temp file: dtc accepts "-" for stdin.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agofdt: fix out of tree builds with DT support
Wolfgang Denk [Thu, 19 Apr 2012 02:36:07 +0000 (02:36 +0000)]
fdt: fix out of tree builds with DT support

Fix: FATAL ERROR: Couldn't open "../arch/arm/dts/tegra20.dtsi": No
such file or directory

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
12 years agoGCC4.6: Squash warnings in onenand_base.c
Wolfgang Denk [Thu, 19 Apr 2012 01:14:17 +0000 (01:14 +0000)]
GCC4.6: Squash warnings in onenand_base.c

Fix gcc 4.6 build warnings:
onenand_base.c: In function 'onenand_probe':
onenand_base.c:2577:6: warning: variable 'maf_id' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
12 years agoCMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic
Marek Vasut [Sat, 31 Mar 2012 07:47:18 +0000 (07:47 +0000)]
CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE
Marek Vasut [Sat, 31 Mar 2012 07:47:17 +0000 (07:47 +0000)]
CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: scottwood@freescale.com
12 years agoCMD: Fix typo CMD_FSL -> CMD_MFSL in readme
Marek Vasut [Sat, 31 Mar 2012 07:47:16 +0000 (07:47 +0000)]
CMD: Fix typo CMD_FSL -> CMD_MFSL in readme

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: vapier@gentoo.org
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoHWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM
Marek Vasut [Sat, 31 Mar 2012 07:47:14 +0000 (07:47 +0000)]
HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM

Fix typo

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Kyle.D.Moffett@boeing.com
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Remove CMD_LOG, it's unused
Marek Vasut [Sat, 31 Mar 2012 07:47:13 +0000 (07:47 +0000)]
CMD: Remove CMD_LOG, it's unused

$ git grep CMD_LOG
include/configs/kilauea.h:#define CONFIG_CMD_LOG
include/configs/lwmon5.h:#define CONFIG_CMD_LOG
include/configs/makalu.h:#define CONFIG_CMD_LOG
include/configs/quad100hd.h:#undef CONFIG_CMD_LOG
include/configs/zeus.h:#define CONFIG_CMD_LOG

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Fix typo KGBD -> KGDB on debris board
Marek Vasut [Sat, 31 Mar 2012 07:47:12 +0000 (07:47 +0000)]
CMD: Fix typo KGBD -> KGDB on debris board

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: dogoil@etinsys.com
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Drop CONFIG_CMD_EMMC, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:11 +0000 (07:47 +0000)]
CMD: Drop CONFIG_CMD_EMMC, it's not used

$ git grep CMD_EMMC
include/configs/u8500_href.h:#define CONFIG_CMD_EMMC

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: dirk.behme@googlemail.com
Cc: helmut.raiger@hale.at
Cc: john.rigby@linaro.org
Cc: vapier@gentoo.org
12 years agoCMD: Drop CONFIG_CMD_DFL, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:10 +0000 (07:47 +0000)]
CMD: Drop CONFIG_CMD_DFL, it's not used

$ git grep CMD_DFL
board/atc/ti113x.c:#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
board/atc/ti113x.c:     pci_writew (s, PCI_COMMAND, CMD_DFLT);
board/cpc45/pd67290.c:#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
board/cpc45/pd67290.c:  pci_writew (s, PCI_COMMAND, CMD_DFLT);
drivers/pcmcia/i82365.c:#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
drivers/pcmcia/i82365.c:        pci_writew (s, PCI_COMMAND, CMD_DFLT);
include/configs/MBX.h:#define CONFIG_CMD_DFL
include/configs/MigoR.h:#define CONFIG_CMD_DFL
include/configs/digsy_mtc.h:#define CONFIG_CMD_DFL
include/configs/ms7722se.h:#define CONFIG_CMD_DFL
include/configs/ms7750se.h:#define CONFIG_CMD_DFL
include/configs/r2dplus.h:#define CONFIG_CMD_DFL
include/configs/sh7757lcr.h:#define CONFIG_CMD_DFL
include/configs/sh7785lcr.h:#define CONFIG_CMD_DFL

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Pfister_Werner@intercontrol.de
Cc: iwamatsu@nigauri.org
Cc: nobuhiro.iwamatsu.yj@renesas.com
Cc: vapier@gentoo.org
Cc: wd@denx.de
Cc: yoshihiro.shimoda.uh@renesas.com
Acked-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agoCMD: Drop CMD_DCR, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:09 +0000 (07:47 +0000)]
CMD: Drop CMD_DCR, it's not used

$ git grep CMD_DCR
include/configs/ep8260.h:#undef CONFIG_CMD_DCR

Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoCMD: Drop CMD_CAN, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:08 +0000 (07:47 +0000)]
CMD: Drop CMD_CAN, it's not used

$ git grep CMD_CAN
include/configs/jadecpu.h:#define CONFIG_CMD_CAN

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Matthias Weisser <weisserm@arcor.de>
12 years agoCMD: Remove CMD_AUTOSCRIPT, it's not used
Marek Vasut [Sat, 31 Mar 2012 07:47:07 +0000 (07:47 +0000)]
CMD: Remove CMD_AUTOSCRIPT, it's not used

$ git grep AUTOSCRIPT
include/configs/at91sam9m10g45ek.h:#undef CONFIG_CMD_AUTOSCRIPT
include/configs/gplugd.h:#define CONFIG_CMD_AUTOSCRIPT

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoAT91: Drop AT91_SPIMUX command from cmd_all
Marek Vasut [Sat, 31 Mar 2012 07:47:06 +0000 (07:47 +0000)]
AT91: Drop AT91_SPIMUX command from cmd_all

$ git grep AT91_SPIMUX
include/config_cmd_all.h:#define CONFIG_CMD_AT91_SPIMUX /* AT91 MMC/SPI Mux Support     */

It isn't used anywhere it seems.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Anatolij Gustschin <agust@denx.de>
12 years agoPrepare v2012.04-rc3 v2012.04-rc3
Wolfgang Denk [Wed, 18 Apr 2012 20:52:34 +0000 (22:52 +0200)]
Prepare v2012.04-rc3

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-sh
Wolfgang Denk [Wed, 18 Apr 2012 20:41:06 +0000 (22:41 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-sh

* 'master' of git://git.denx.de/u-boot-sh:
  sh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT
  sh: Fix rsk7264 pin setup for on-board ethernet

12 years agosh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT
Nobuhiro Iwamatsu [Wed, 18 Apr 2012 02:05:20 +0000 (11:05 +0900)]
sh: ecovec: Change macro from BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT

When calling board_late_init, we need to define CONFIG_BOARD_LATE_INIT.
The latest ecovec config defines BOARD_LATE_INIT, board_late_init is not called.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agosh: Fix rsk7264 pin setup for on-board ethernet
Phil Edworthy [Tue, 10 Apr 2012 00:47:56 +0000 (00:47 +0000)]
sh: Fix rsk7264 pin setup for on-board ethernet

This sets up the external ethernet IRQ pin.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
12 years agoi.MX6: arm2: Add AXI cache and Qos setting
Dirk Behme [Thu, 12 Apr 2012 20:46:14 +0000 (20:46 +0000)]
i.MX6: arm2: Add AXI cache and Qos setting

Do the same AXI cache and Qos settings done already in the
SabreLite imximage.cfg for the ARM2 board, too.

It fixes a display flash issue caused by low priority of
the display IDMA channel.

Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
CC: Jason Chen <b02280@freescale.com>
CC: Jason Liu <r64343@freescale.com>
CC: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <festevam@gmail.com>
Acked-by: Jason Liu <r64343@freescale.com>
12 years agoPrepare v2012.04-rc2; minor Coding Style cleanup v2012.04-rc2
Wolfgang Denk [Mon, 16 Apr 2012 21:13:51 +0000 (23:13 +0200)]
Prepare v2012.04-rc2; minor Coding Style cleanup

Signed-off-by: Wolfgang Denk <wd@denx.de>
12 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Mon, 16 Apr 2012 21:01:12 +0000 (23:01 +0200)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  ARM926EJS: Fix cache.c to comply with checkpatch.pl
  ARM926EJS: Make asm routines volatile in cache ops
  MX35: mx35pdk: wrong board revision
  ARM1136: MX35: Make asm routines volatile in cache ops
  ARM: add u-boot.imx as target for i.MX SOCs
  M28: Pull out CONFIG_APBH_DMA so it's always enabled
  DMA: Split the APBH DMA init into block and channel init
  imx: Return gpio_set_value in gpio_direction_output
  imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)
  imx: Add GPIO_TO_PORT macro in the mxc_gpio driver
  imx: Remove unneeded/repititive definitions from imx headers
  i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC
  MX31: mx31pdk: drop enable_caches from board file
  i.MX28: Fix initial stack pointer position
  mx35: mx35pdk: fix when cache functions are linked
  mx35: flea3: fix when cache functions are linked
  ARM: 926ejs: use debug() for misaligned addresses
  ARM1136: add cache flush and invalidate operations
  mx6qsabrelite: Fix the serial console port
  mx6qsabrelite: Add boot switch setting information into the README
  i.MX6: mx6qsabrelite: add cache commands if cache is enabled
  i.MX6: implement enable_caches()
  i.MX6: define CACHELINE_SIZE
  MX53: DDR: Fix ZQHWCTRL field TZQ_CS
  mx28evk: Add a README file
  mx28: Split the README into a common part and a m28 specific part
  tricorder: Load kernel from ubifs
  tricorder: Add UBIFS
  cm-t35: fix Ethernet reset timing
  hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT
  BeagleBoard: Remove userbutton command and use gpio command instead
  OMAP: Move omap1510inn to Unmaintained / Orphaned

12 years agoARM926EJS: Fix cache.c to comply with checkpatch.pl
Marek Vasut [Fri, 6 Apr 2012 03:25:07 +0000 (03:25 +0000)]
ARM926EJS: Fix cache.c to comply with checkpatch.pl

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
12 years agoARM926EJS: Make asm routines volatile in cache ops
Marek Vasut [Fri, 6 Apr 2012 03:25:06 +0000 (03:25 +0000)]
ARM926EJS: Make asm routines volatile in cache ops

We certainly don't want the compiler to reorganise the code for dcache flushing.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Stefano Babic <sbabic@denx.de>
12 years agoMX35: mx35pdk: wrong board revision
Stefano Babic [Mon, 9 Apr 2012 11:29:06 +0000 (13:29 +0200)]
MX35: mx35pdk: wrong board revision

The board revision is detected accessing to the pmic,
that is not available before relocation (I2C).
This generates the following error:

CPU:   Freescale i.MX35 rev 2.0 at 532 MHz.
Reset cause: WDOG
<reg num> = 7 is invalid. Should be less than 0
Board: MX35 PDK 1.0

The revision number is wrong, as a default value is printed
(tested on a mx35pdk Rev. 2.0).

Move the output in the board_late_init(), when
pmic can be accessed.

Signed-off-by: Stefano Babic <sbabic@denx.de>
12 years agoARM1136: MX35: Make asm routines volatile in cache ops
Stefano Babic [Mon, 9 Apr 2012 11:33:04 +0000 (13:33 +0200)]
ARM1136: MX35: Make asm routines volatile in cache ops

As well as pushed for ARM926EJS, we certainly don't want
the compiler to reorganise the code for dcache flushing
Fix checkpatch warnings as well.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Marek Vasut <marex@denx.de>
CC: Albert Aribaud <albert.u.boot@aribaud.net>
12 years agoARM: add u-boot.imx as target for i.MX SOCs
Stefano Babic [Tue, 3 Apr 2012 04:32:56 +0000 (04:32 +0000)]
ARM: add u-boot.imx as target for i.MX SOCs

Freescale SOCs require an header to u-boot.bin

The patch adds u-boot.imx to the default targets
if the imx file is set (IMX_CONFIG).

Signed-off-by: Stefano Babic <sbabic@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
CC: Loïc Minier <loic.minier@linaro.org>
CC: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
Tested-by: Dirk Behme <dirk.behme@googlemail.com>