]> git.sur5r.net Git - u-boot/log
u-boot
14 years agoBlackfin: re-architect initcode
Mike Frysinger [Tue, 10 Nov 2009 00:44:04 +0000 (19:44 -0500)]
Blackfin: re-architect initcode

The single initcode function was growing unwieldy, so split it up the
distinct steps into their own function.  This should making digesting the
result much easier on people.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: global_data.h: make pull in needed headers
Mike Frysinger [Mon, 9 Nov 2009 23:08:09 +0000 (18:08 -0500)]
Blackfin: global_data.h: make pull in needed headers

We need the definition of bd_t in this header, so pull in asm/u-boot.h.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: kill off useless initdram() usage
Mike Frysinger [Tue, 3 Nov 2009 11:28:22 +0000 (06:28 -0500)]
Blackfin: kill off useless initdram() usage

While the initdram() function makes sense on some arches, it doesn't for
Blackfin systems as it's always implemented the same way.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: move section length calculation to linker script
Mike Frysinger [Tue, 3 Nov 2009 11:11:31 +0000 (06:11 -0500)]
Blackfin: move section length calculation to linker script

The length of the sections is fixed at link time, so let the linker do the
calculation rather than doing it ourselves at runtime.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf561-acvilon: new board port
Valentin Yakovenkov [Mon, 26 Oct 2009 22:43:04 +0000 (18:43 -0400)]
Blackfin: bf561-acvilon: new board port

Signed-off-by: Valentin Yakovenkov <yakovenkov@niistt.ru>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: ADI settings: enable silent console support
Mike Frysinger [Thu, 15 Oct 2009 18:59:46 +0000 (14:59 -0400)]
Blackfin: ADI settings: enable silent console support

Very little additional code overhead, and only works when the user sets an
env var ahead of time, so default to on makes sense.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: bf537-stamp: rename SPI/MMC define
Mike Frysinger [Thu, 15 Oct 2009 18:55:21 +0000 (14:55 -0400)]
Blackfin: bf537-stamp: rename SPI/MMC define

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: update tiny board settings (voltage/default env)
Harald Krapfenbauer [Wed, 14 Oct 2009 12:37:32 +0000 (08:37 -0400)]
Blackfin: update tiny board settings (voltage/default env)

The tinyboards like to run at a little lower voltage than the default, and
they prefer to boot over the network.  For the latter, extend the common
code a little to make this easier.

Also fix the cm-bf527 env sector size while we're in here to reflect the
flash that is actually in use.

Signed-off-by: Harald Krapfenbauer <Harald.Krapfenbauer@bluetechnix.at>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoBlackfin: tweak embedded LDR env config option
Mike Frysinger [Wed, 22 Jul 2009 02:17:36 +0000 (22:17 -0400)]
Blackfin: tweak embedded LDR env config option

Use the common config option for extracting the environment for embedding
into LDR files and clarify the LDR-specific option.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-arm
Wolfgang Denk [Tue, 12 Jan 2010 22:47:03 +0000 (23:47 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-arm

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-nand-flash
Wolfgang Denk [Tue, 12 Jan 2010 22:42:32 +0000 (23:42 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Tue, 12 Jan 2010 22:39:08 +0000 (23:39 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

14 years agoMerge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Wolfgang Denk [Tue, 12 Jan 2010 22:30:40 +0000 (23:30 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

14 years agousb: musb: add virtual root hub control support
Bryan Wu [Sat, 9 Jan 2010 21:53:54 +0000 (16:53 -0500)]
usb: musb: add virtual root hub control support

For MUSB devices that do not support multipoint (hubs), we have to emulate
a root hub so that we can support core operations like resetting ports.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14 years agoAdds EHCI definitions to sequoia board configuration file.
Chris Zhang [Wed, 6 Jan 2010 21:34:06 +0000 (13:34 -0800)]
Adds EHCI definitions to sequoia board configuration file.

Adds required definitions for EHCI support in sequoia configuration file.
But still keeps the OHCI as default driver.

Signed-off-by: Chris Zhang <chris@seamicro.com>
14 years agoAdd ppc440epx USB ehci support.
Chris Zhang [Wed, 6 Jan 2010 21:34:05 +0000 (13:34 -0800)]
Add ppc440epx USB ehci support.

Currently ppc440epx uses OHCI for USB full-speed support. This change adds
support for EHCI.

Signed-off-by: Chris Zhang <chris@seamicro.com>
14 years agoFix EHCI port reset.
Chris Zhang [Wed, 6 Jan 2010 21:34:04 +0000 (13:34 -0800)]
Fix EHCI port reset.

In USB ehci driver, the port reset is not terminated. EHCI spec says "A host
 controller must terminate the reset and stabilize the state of the port within
 2 milliseconds". Without termination, a port stays at reset state. This is
 observed on ppc4xx(sequoia) boards.

Signed-off-by: Chris Zhang <chris@seamicro.com>
14 years agoomap3: fix compile warning
Sanjeev Premi [Thu, 24 Dec 2009 08:50:41 +0000 (14:20 +0530)]
omap3: fix compile warning

This patch fixes this warning during compile:

omap3.c: In function 'musb_platform_init':
omap3.c:126: warning: label 'end' defined but not used

Problem reported by: Dirk Behme[dirk.behme@googlemail.com]

Signed-off-by: Sanjeev Premi <premi@ti.com>
14 years agousb: musb: add support for Blackfin MUSB
Bryan Wu [Thu, 17 Dec 2009 03:04:02 +0000 (22:04 -0500)]
usb: musb: add support for Blackfin MUSB

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: change rxcsr register from write to read/modify/write
Bryan Wu [Thu, 17 Dec 2009 03:04:01 +0000 (22:04 -0500)]
usb: musb: change rxcsr register from write to read/modify/write

The RX Control/Status register has bits that we want to preserve, so don't
just write out a single bit.  Preserve the others bits in the process.

The original code posted to the u-boot list had this behavior, but looks
like it was lost somewhere along the way to merging.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: make multipoint optional
Bryan Wu [Thu, 17 Dec 2009 03:04:00 +0000 (22:04 -0500)]
usb: musb: make multipoint optional

The multipoint handling under MUSB is optional, and some parts (like the
Blackfin processor) do not implement support for it.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: make fifo support configurable
Bryan Wu [Thu, 17 Dec 2009 03:03:59 +0000 (22:03 -0500)]
usb: musb: make fifo support configurable

The dynamic FIFO handling under MUSB is optional, and some parts (like
the Blackfin processor) do not implement support for it.

Due to this, the FIFO reading/writing steps need special handling, so
mark the common versions weak so drivers can override.

Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agousb: musb: make sure the register layout is packed
Mike Frysinger [Thu, 17 Dec 2009 03:03:58 +0000 (22:03 -0500)]
usb: musb: make sure the register layout is packed

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Remy Bohmer <linux@bohmer.net>
14 years agoDA830: Add usb config
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:14 +0000 (10:56 +0530)]
DA830: Add usb config

Adding USB configuration. Default is set for USB MSC host.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agoDA8xx: Add MUSB host support
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:13 +0000 (10:56 +0530)]
DA8xx: Add MUSB host support

Tested USB host functionality on DA830 EVM.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agoDA8xx: Add GPIO register definitions
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:12 +0000 (10:56 +0530)]
DA8xx: Add GPIO register definitions

Added DA8xx GPIO base addresses in gpio_defs.h and pointers
to different BANKs which can be used to program GPIOs.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agoDA830: Add pinmux for USB0_DRVVBUS
Ajay Kumar Gupta [Tue, 22 Dec 2009 05:26:11 +0000 (10:56 +0530)]
DA830: Add pinmux for USB0_DRVVBUS

USB0_DRVVBUS pinmux configuration is required for USB functinality
in uboot.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
14 years agompc83xx: add support configure bus parking
Heiko Schocher [Thu, 7 Jan 2010 07:56:00 +0000 (08:56 +0100)]
mpc83xx: add support configure bus parking

Add support to configure bus parking mode and master in bus arbitration
configuration (ACR). Add this for the kmeter1 port:

Configure bus arbiter with recommended values from Freescale
to improve bus latency/throughput for application with
intensive QuiccEngine activity.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: vme8349: Fix power up reset sequence for tsi148
Reinhard Arlt [Tue, 8 Dec 2009 08:21:41 +0000 (09:21 +0100)]
mpc83xx: vme8349: Fix power up reset sequence for tsi148

Remove PCI reset, if there is a monarch PMC module.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
convert clrbits_be32 + setbits_be32 to clrsetbits_be32, use out_be32 to set gcr.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Add support for MPC8349 esd caddy2
Reinhard Arlt [Tue, 8 Dec 2009 08:13:08 +0000 (09:13 +0100)]
mpc83xx: Add support for MPC8349 esd caddy2

The caddy2 is a variant of the already supported vme8349. So we just
add the differences to this board port. To better support those two
boards we switched from fixed SDRAM configuration to usage of
spd_sdram(). This is done by providing a board specific SPD EEPROM
routine with different values for both boards.

Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Signed-off-by: Stefan Roese <sr@denx.de>
changed to use mkconfig -t option instead, plus misc codingstyle fixes.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: spd_sdram.c: Disable memory controller before initializing
Stefan Roese [Tue, 8 Dec 2009 08:10:04 +0000 (09:10 +0100)]
mpc83xx: spd_sdram.c: Disable memory controller before initializing

The memory controller could already be enabled, when spd_sdram() is
called. This could be the case for example, when the SDRAM is initialized
by the JTAG debugger.

The "sync" after the register access via the accessor function is
still needed, because the macro uses the sync before the real write
is done. So until not all accesses are converted to using accessor
functions, this sync still needs to be made "manually" here.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Reinhard Arlt <reinhard.arlt@esd.eu>
Acked-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agompc83xx: Add NAND boot support for MPC8315E-RDB boards
Anton Vorontsov [Tue, 24 Nov 2009 17:12:12 +0000 (20:12 +0300)]
mpc83xx: Add NAND boot support for MPC8315E-RDB boards

The core support for NAND booting is there already, so this patch
is pretty straightforward.

There is one trick though: top level Makefile expects nand_spl to
be in nand_spl/board/$(BOARDDIR), but we can fully reuse the code
from mpc8313erdb boards, and so to not duplicate the code we just
symlink nand_spl/board/freescale/mpc8315erdb to mpc8313erdb.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
o silence make during ln echo
o update documentation
o and avoid:

$ ./MAKEALL MPC8315ERDB_NAND
Configuring for MPC8315ERDB board...
sdram.o: In function `fixed_sdram':
/home/r1aaha/git/u-boot/nand_spl/board/freescale/mpc8313erdb/sdram.c:72: undefined reference to `udelay'

by renaming udelay -> __udelay in the spirit of commit
3eb90bad651fab39cffba750ec4421a9c01d60e7 "Generic udelay() with watchdog
support".

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
14 years agoonenand: Fix compile errors due to FlexOneNAND
Sanjeev Premi [Fri, 18 Dec 2009 09:25:24 +0000 (14:55 +0530)]
onenand: Fix compile errors due to FlexOneNAND

This patch fixes the compile error while trying to
compile for omap3evm.

env_onenand.c: In function 'env_relocate_spec':
env_onenand.c:70: error: 'CONFIG_ENV_ADDR_FLEX' undeclared
 (first use in this function)
env_onenand.c:70: error: (Each undeclared identifier is re
ported only once
env_onenand.c:70: error: for each function it appears in.)
env_onenand.c: In function 'saveenv':
env_onenand.c:106: error: 'CONFIG_ENV_ADDR_FLEX' undeclare
d (first use in this function)
env_onenand.c:107: error: 'CONFIG_ENV_SIZE_FLEX' undeclare
d (first use in this function)

Signed-off-by: Sanjeev Premi <premi@ti.com>
Acked-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoDavinci: davinci_nand.c performance enhancments
Nick Thompson [Wed, 16 Dec 2009 11:15:58 +0000 (11:15 +0000)]
Davinci: davinci_nand.c performance enhancments

Introduces various optimisations that approximately triple the
read data rate from NAND when run on da830evm.

Most of these optimisations depend on the endianess of the machine
and most of them are very similar to optimisations already present
in the Linux Kernel.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
14 years agoARM Update mach-types
Tom Rix [Wed, 6 Jan 2010 15:36:24 +0000 (09:36 -0600)]
ARM Update mach-types

Fetched from http://www.arm.linux.org.uk/developer/machines/download.php
And built with

repo http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
commit c9f937e4a3f4ebf9924ec21d80632e5eb61d949c

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoppc/p4080: Add Corenet Platform Cache (CPC) registers
Becky Bruce [Wed, 18 Nov 2009 03:10:21 +0000 (21:10 -0600)]
ppc/p4080: Add Corenet Platform Cache (CPC) registers

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: setup ODT_RD_CFG & ODT_WR_CFG when we interleave
Dave Liu [Wed, 16 Dec 2009 16:24:39 +0000 (10:24 -0600)]
fsl-ddr: setup ODT_RD_CFG & ODT_WR_CFG when we interleave

In chip-select interleaving case, we also need set the ODT_RD_CFG
and ODT_WR_CFG in cs1_config register.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: add override for the Rtt_Wr
Dave Liu [Wed, 16 Dec 2009 16:24:38 +0000 (10:24 -0600)]
fsl-ddr: add override for the Rtt_Wr

Different boards may require different settings of Dynamic ODT (Rtt_Wr).
We provide a means to allow the board specific code to provide its own
value of Rtt_Wr.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: add the override for write leveling
Dave Liu [Wed, 16 Dec 2009 16:24:37 +0000 (10:24 -0600)]
fsl-ddr: add the override for write leveling

add the override for write leveling sampling and
start time according to specific board.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl-ddr: Fix power-down timing settings
Dave Liu [Wed, 16 Dec 2009 16:24:36 +0000 (10:24 -0600)]
fsl-ddr: Fix power-down timing settings

1. TIMING_CFG_0[ACT_PD_EXIT] was set to 6 clocks, but
   It should be set to tXP parameter, tXP=max(3CK, 7.5ns)
2. TIMING_CFG_0[PRE_PD_EXIT] was set to 6 clocks, but
   It should be set to tXP (if MR0[A12]=1) else to tXPDLL parameter
   We are setting the mode register MR0[A12]='1'

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agompc85xx: Add 4-bits eSDHC support for MPC8569E-MDS boards
Anton Vorontsov [Tue, 15 Dec 2009 22:14:31 +0000 (01:14 +0300)]
mpc85xx: Add 4-bits eSDHC support for MPC8569E-MDS boards

Thanks to "Errata to MPC8569E PowerQUICC III Integrated Host Processor
Family Reference Manual, Rev. 0" document, which describes all eSDHC
pins, we can add 4-bits eSDHC support for MPC8569E-MDS boards.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Fix reporting of PME & FM clock frequencies
Kumar Gala [Wed, 9 Dec 2009 23:28:17 +0000 (17:28 -0600)]
ppc/p4080: Fix reporting of PME & FM clock frequencies

We incorrectly had the sense of PME_CLK_SEL, FM1_CLK_SEL, FM2_CLK_SEL
backwards so we report the wrong frequency.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agofsl_law: add SRIO2 target id and law_size_bits() macro
Li Yang [Wed, 9 Dec 2009 06:26:08 +0000 (14:26 +0800)]
fsl_law: add SRIO2 target id and law_size_bits() macro

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Map boot page guarded for MP boot
Kumar Gala [Wed, 18 Nov 2009 02:21:20 +0000 (20:21 -0600)]
ppc/85xx: Map boot page guarded for MP boot

We already map the page cache-inhibited.  There is no reason we
shouldn't also be marking it guarded to prevent speculative accesses.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc: Added macro to test for specific SVR revision
Kumar Gala [Wed, 18 Nov 2009 04:44:52 +0000 (22:44 -0600)]
ppc: Added macro to test for specific SVR revision

Various SoC errata are specific to a given revision of silicon. This
patch gives us a simple macro to use when doing such tests.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agop4080: add readback to bootpage translation window
Dave Liu [Wed, 18 Nov 2009 02:01:24 +0000 (20:01 -0600)]
p4080: add readback to bootpage translation window

We need to add the readback to bootpage translation LAW
to make it effect.

Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Make flash TLB entry determined at runtime on FSL boards
Kumar Gala [Fri, 13 Nov 2009 15:25:07 +0000 (09:25 -0600)]
ppc/85xx: Make flash TLB entry determined at runtime on FSL boards

Rather than hard coding which TLB entry the FLASH is mapped with we can
use find_tlb_idx to determine the entry.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Remove CONFIG_SYS_DDR_TLB_START
Kumar Gala [Fri, 13 Nov 2009 15:09:10 +0000 (09:09 -0600)]
ppc/85xx: Remove CONFIG_SYS_DDR_TLB_START

Now that we dynamically determine TLB CAM entries to use we dont need
CONFIG_SYS_DDR_TLB_START anymore.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Make SPD DDR TLB setup code use dynamic entry allocation
Kumar Gala [Fri, 13 Nov 2009 15:04:19 +0000 (09:04 -0600)]
ppc/85xx: Make SPD DDR TLB setup code use dynamic entry allocation

Now that we track which TLB CAM entries are used we can allocate
entries on the fly.  Change the SPD DDR TLB setup code to assume
we use at most 8 TLBs (or the number free, which ever is fewer).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Add tracking of TLB CAM usage
Kumar Gala [Thu, 12 Nov 2009 16:26:16 +0000 (10:26 -0600)]
ppc/85xx: Add tracking of TLB CAM usage

We need to track which TLB CAM entries are used to allow us to
"dynamically" allocate entries later in the code.  For example the SPD
DDR code today hard codes which TLB entries it uses.  We can now make
that pick entries that are free.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/8xxx: Remove is_fsl_pci_agent
Kumar Gala [Wed, 4 Nov 2009 19:00:55 +0000 (13:00 -0600)]
ppc/8xxx: Remove is_fsl_pci_agent

All users of is_fsl_pci_agent have been converted to fsl_is_pci_agent
that uses the standard PCI programming model to determine host vs
agent/end-point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Move to using fsl_setup_hose on TQM 85xx
Kumar Gala [Wed, 4 Nov 2009 17:39:55 +0000 (11:39 -0600)]
ppc/85xx: Move to using fsl_setup_hose on TQM 85xx

We can use fsl_setup_hose to determine if we are a agent/end-point or
a host.  Rather than using some SoC specific register we can just look
at the PCI cfg space of the host controller to determine this.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Move to using fsl_setup_hose on P2020 DS
Kumar Gala [Wed, 4 Nov 2009 19:01:51 +0000 (13:01 -0600)]
ppc/85xx: Move to using fsl_setup_hose on P2020 DS

We can use fsl_setup_hose to determine if we are a agent/end-point or
a host.  Rather than using some SoC specific register we can just look
at the PCI cfg space of the host controller to determine this.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Move to using fsl_setup_hose on P1/P2 RDB
Kumar Gala [Wed, 4 Nov 2009 19:01:38 +0000 (13:01 -0600)]
ppc/85xx: Move to using fsl_setup_hose on P1/P2 RDB

We can use fsl_setup_hose to determine if we are a agent/end-point or
a host.  Rather than using some SoC specific register we can just look
at the PCI cfg space of the host controller to determine this.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Move to using fsl_setup_hose on MPC8572 DS
Kumar Gala [Wed, 4 Nov 2009 19:01:17 +0000 (13:01 -0600)]
ppc/85xx: Move to using fsl_setup_hose on MPC8572 DS

We can use fsl_setup_hose to determine if we are a agent/end-point or
a host.  Rather than using some SoC specific register we can just look
at the PCI cfg space of the host controller to determine this.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/86xx: Clean up MPC8610 HPCD PCI setup code
Kumar Gala [Wed, 4 Nov 2009 18:51:10 +0000 (12:51 -0600)]
ppc/86xx: Clean up MPC8610 HPCD PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Clean up MPC8548 CDS PCI setup code
Kumar Gala [Wed, 4 Nov 2009 17:15:29 +0000 (11:15 -0600)]
ppc/85xx: Clean up MPC8548 CDS PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Clean up ATUM8548 PCI setup code
Kumar Gala [Wed, 4 Nov 2009 17:05:02 +0000 (11:05 -0600)]
ppc/85xx: Clean up ATUM8548 PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Clean up MPC8568 MDS PCI setup code
Kumar Gala [Wed, 4 Nov 2009 16:31:53 +0000 (10:31 -0600)]
ppc/85xx: Clean up MPC8568 MDS PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Clean up MPC8569 MDS PCI setup code
Kumar Gala [Wed, 4 Nov 2009 16:26:30 +0000 (10:26 -0600)]
ppc/85xx: Clean up MPC8569 MDS PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Clean up MPC8544 DS PCI setup code
Kumar Gala [Wed, 4 Nov 2009 16:22:26 +0000 (10:22 -0600)]
ppc/85xx: Clean up MPC8544 DS PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/85xx: Clean up MPC8536 DS PCI setup code
Mingkai Hu [Wed, 28 Oct 2009 02:49:31 +0000 (10:49 +0800)]
ppc/85xx: Clean up MPC8536 DS PCI setup code

Use new fsl_pci_init_port() that reduces amount of duplicated code in the
board ports, use IO accessors and clean up printing of status info.

Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoNET: Base support for etsec2.0
Kumar Gala [Sat, 31 Oct 2009 16:23:41 +0000 (11:23 -0500)]
NET: Base support for etsec2.0

1. Modified the tsec_mdio structure to include the new regs
2. Modified the MDIO_BASE_ADDR so that it will handle both
older version and new version of etsec.

Signed-off-by: Sandeep Gopalpet <sandeep.kumar@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoNET: Move MDIO regs out of TSEC Space
Sandeep Gopalpet [Fri, 30 Oct 2009 19:05:04 +0000 (00:35 +0530)]
NET: Move MDIO regs out of TSEC Space

Moved the mdio regs out of the tsec structure,and
provided different offsets for tsec base and mdio
base so that provision for etsec2.0 can be provided.

This patch helps in providing the support for etsec2.0
In etsec2.0, the MDIO register space and the etsec reg
space are different.

Also, moved the TSEC_BASE_ADDR and MDIO_BASE_ADDR definitons into
platform specific files.

Signed-off-by: Sandeep Gopalpet <sandeep.kumar@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Add support to set DPAA (data path) devices clock frequencies
Kumar Gala [Thu, 19 Mar 2009 07:46:28 +0000 (02:46 -0500)]
85xx: Add support to set DPAA (data path) devices clock frequencies

Set clock-frequency for Frame Manager 0/1 and Patter Match Engine on p4080.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/8xxx: Don't use pci_cfg on FSL_CORENET platforms
Kumar Gala [Thu, 17 Sep 2009 05:01:14 +0000 (00:01 -0500)]
ppc/8xxx: Don't use pci_cfg on FSL_CORENET platforms

The FSL_CORENET platforms use a completely different means to determine
which PCIe port is enabled as well as if its a host or agent/end-point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoppc/p4080: Added p4080 SERDES registers & USB offset
Kumar Gala [Fri, 16 Oct 2009 04:22:10 +0000 (23:22 -0500)]
ppc/p4080: Added p4080 SERDES registers & USB offset

Added immap definition for SERDES registers on p4080, the USB offset
(since it was missing) and a GPL header.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years ago85xx: Add support for e500mc cache stashing
Kumar Gala [Thu, 19 Mar 2009 07:53:01 +0000 (02:53 -0500)]
85xx: Add support for e500mc cache stashing

The e500mc core supports the ability to stash into the L1 or L2 cache,
however we need to uniquely identify the caches with an id.

We use the following equation to set the various stash-ids:

32 + coreID*2 + 0(L1) or 1(L2)

The 0 (for L1) or 1 (for L2) matches the CT field used be various cache
control instructions.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoDavinci: NAND enable ECC even when not in NAND boot mode
Nick Thompson [Sat, 12 Dec 2009 17:13:10 +0000 (12:13 -0500)]
Davinci: NAND enable ECC even when not in NAND boot mode

Davinci: NAND enable ECC even when not in NAND boot mode

On Davinci platforms, the default NAND device is enabled (for ECC)
in low level boot code when NAND boot mode is used. If booting in
another mode, NAND ECC is not enabled. The driver should make
sure ECC is enabled regardless of boot mode if NAND is configured
in U-Boot.

Signed-off-by: Nick Thompson <nick.thompson@ge.com>
14 years agoDavinci: Configurable NAND chip selects
Nick Thompson [Sat, 12 Dec 2009 17:12:26 +0000 (12:12 -0500)]
Davinci: Configurable NAND chip selects

Davinci: Configurable NAND chip selects

Add a CONFIG_SYS_NAND_CS setting to all davinci configs and
use it to setup the NAND controller in the davinci_nand
mtd driver.

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 years agoDavinci: Table driven pinmux configuration
Nick Thompson [Sat, 12 Dec 2009 17:10:51 +0000 (12:10 -0500)]
Davinci: Table driven pinmux configuration

Davinci: Table driven pinmux configuration

Add code to allow pinmux_config tables to be grouped and configured
as a single resource. This removes multiple calls to the pinmux
configuration code from board_init and allows pinmuxes to be
individually configured and added by data manipulation only.

All related #ifdefs can the be removed from board_init code and
since the compiler optimises away statics, #ifdefs can be reduced in
the data definitions as well.

Signed-off-by: Nick Thompson <nick.thompson@gefanuc.com>
14 years agoRemove superfluous uses of V_PROMPT macro.
Robert P. J. Day [Sat, 12 Dec 2009 17:10:33 +0000 (12:10 -0500)]
Remove superfluous uses of V_PROMPT macro.

A number of config files define the V_PROMPT macro for the
command-line prompt, only to immediately use that macro to define
CONFIG_SYS_PROMPT, making V_PROMPT entirely superfluous.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
14 years agopandora: don't enable VAUX3, VDAC and VPLL2 regulators
Grazvydas Ignotas [Fri, 11 Dec 2009 13:07:30 +0000 (15:07 +0200)]
pandora: don't enable VAUX3, VDAC and VPLL2 regulators

These regulators are not needed to start the kernel and only
cause "incomplete constraints" warnings from kernel, so don't
turn them on to save power.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
14 years agoTWL4030: make LEDs selectable for twl4030_led_init()
Grazvydas Ignotas [Thu, 10 Dec 2009 15:10:21 +0000 (17:10 +0200)]
TWL4030: make LEDs selectable for twl4030_led_init()

Not all boards have both LEDs hooked, so enabling both on
boards with single LED will just waste power. Make it
possible to choose LEDs by adding argument to
twl4030_led_init().

Using this turn on only LEDB for pandora, leave both LEDs
on for all other boards, as it was before this patch.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Wolfgang Denk [Sun, 3 Jan 2010 20:07:04 +0000 (21:07 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

14 years agoppc4xx: alpr: Remove some not needed commands to make image fit again
Stefan Roese [Wed, 16 Dec 2009 08:27:31 +0000 (09:27 +0100)]
ppc4xx: alpr: Remove some not needed commands to make image fit again

The latest changes increased the size of the alpr image a bit more.
Now it doesn't fit into the 256k reserved for it. This patch now removes
the commands "ping" and "diag" which are not needed in the production
systems.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
14 years agoi2c, ppc4xx: fix compiling KAREF and METROBOX boards.
Heiko Schocher [Thu, 3 Dec 2009 10:23:17 +0000 (11:23 +0100)]
i2c, ppc4xx: fix compiling KAREF and METROBOX boards.

commit eb5eb2b0f744f0cba405160c5d01335c40f09acf

ppc4xx: Cleanup PPC4xx I2C infrastructure

This patch cleans up the PPC4xx I2C intrastructure:

- Use C struct to describe the I2C registers instead of defines
- Coding style cleanup (braces, whitespace, comments, line length)
- Extract common code from i2c_read() and i2c_write()
- Remove unneeded IIC defines from ppc405.h & ppc440.h

breaks comiling for the KAREF and METROBOX boards.

This patch fixes this issue.

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>
14 years agomove prototypes for gunzip() and zunzip() to common.h
Wolfgang Wegner [Wed, 9 Dec 2009 14:16:47 +0000 (15:16 +0100)]
move prototypes for gunzip() and zunzip() to common.h

Prototype for gunzip/zunzip was only in lib_generic/gunzip.c and thus
repeated in every file using it. This patch moves the prototypes to
common.h and removes all prototypes distributed anywhere else.

Signed-off-by: Wolfgang Wegner <w.wegner@astro-kom.de>
14 years agoMerge branch 'master' of git://git.denx.de/u-boot-usb
Wolfgang Denk [Mon, 21 Dec 2009 20:01:56 +0000 (21:01 +0100)]
Merge branch 'master' of git://git.denx.de/u-boot-usb

14 years agousb: write command for RAW partition.
Mahavir Jain [Tue, 3 Nov 2009 06:52:10 +0000 (12:22 +0530)]
usb: write command for RAW partition.

This patch implements write support to usb device with raw partition.
It will be useful for filesystem write support to usb device from
u-boot in future.

Tested with writing kernel image to raw usb disk & booting with usb
read command into ram.

[Note:  run usb part to get info about start sector & number of
sectors on a partition for usb write operation.]

Signed-off-by: Mahavir Jain <mjain@marvell.com>
14 years agoomap3evm: musb: add USB config
Ajay Kumar Gupta [Wed, 4 Nov 2009 21:58:23 +0000 (15:58 -0600)]
omap3evm: musb: add USB config

Added USB host and device config for host (MSC, Keyboard) and
device (ACM) functionalities.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
14 years agoOMAP3 USB Initialize twl4030 only if required
Tom Rix [Sat, 31 Oct 2009 17:37:46 +0000 (12:37 -0500)]
OMAP3 USB Initialize twl4030 only if required

OMAP3EVM uses ISP1504 phy and so twl4030 related init is not required.

Submitted-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoOMAP3 zoom2 Use usbtty if the debug board is not connected.
Tom Rix [Sat, 31 Oct 2009 17:37:45 +0000 (12:37 -0500)]
OMAP3 zoom2 Use usbtty if the debug board is not connected.

The preferred serial output comes from the debug board.
When the debug board is disconnected, fall back on using
usbtty from the usb connector on the Zoom2 board.

This shows up as /dev/ttyACM0 in a linux host.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoUSBTTY make some function declarations easier to use.
Tom Rix [Sat, 31 Oct 2009 17:37:44 +0000 (12:37 -0500)]
USBTTY make some function declarations easier to use.

Zoom2 needs to use these declarations and the include directory is a
better place from them than in the middle of the driver directory.
It did not make sense to create a new file for just a couple of
lines so they were appended to the serial.h

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoOMAP3 beagle Add usbtty configuration
Tom Rix [Sat, 31 Oct 2009 17:37:43 +0000 (12:37 -0500)]
OMAP3 beagle Add usbtty configuration

The primary console of beagle is the serial header.

A secondary console is to use the usbtty.  The user can set this
manually by doing

setenv stdout usbtty; setenv stdin usbtty; setenv stderr usbtty
saveenv

usbtty will be usable by accessing the /dev/ttyACM0 on a linux host.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoOMAP3 zoom1 Add usbtty configuration
Tom Rix [Sat, 31 Oct 2009 17:37:42 +0000 (12:37 -0500)]
OMAP3 zoom1 Add usbtty configuration

The primary console of zoom1 is the serial out from the jumpers
accessed by removing the back panel.

A secondary console is to use the usbtty.  The user can set this
manually by doing

setenv stdout usbtty; setenv stdin usbtty; setenv stderr usbtty
saveenv

usbtty will be usable by accessing the /dev/ttyACM0 on a linux host.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoOMAP3 Add usb device support
Tom Rix [Sat, 31 Oct 2009 17:37:41 +0000 (12:37 -0500)]
OMAP3 Add usb device support

This change adds the usb device support for musb.

Omap3 platform support added at the same level as davinci.

The interface for usbtty to use the musb device support was added.

Verified on omap3 beagle, zoom1 and zoom2.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoTWL4030 Add usb PHY support
Tom Rix [Sat, 31 Oct 2009 17:37:40 +0000 (12:37 -0500)]
TWL4030 Add usb PHY support

The twl4030 provides a PHY device for connecting a link device,
like musb, to physical connection.

This change adds the twl4030 usb registers and functions for
initializing the PHY as required by omap3.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoUSB add macros for debugging usb device setup.
Tom Rix [Sat, 31 Oct 2009 17:37:39 +0000 (12:37 -0500)]
USB add macros for debugging usb device setup.

When developing usb device features, it is useful to print out
common usb structures.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoUSB Consolidate descriptor definitions
Tom Rix [Sat, 31 Oct 2009 17:37:38 +0000 (12:37 -0500)]
USB Consolidate descriptor definitions

The header files usb.h and usbdescriptors.h have the same nameed
structure definitions for

usb_config_descriptor
usb_interface_descriptor
usb_endpoint_descriptor
usb_device_descriptor
usb_string_descriptor

These are out right duplicates in usb.h

usb_device_descriptor
usb_string_descriptor

This one has extra unused elements

usb_endpoint_descriptor

unsigned char bRefresh
unsigned char bSynchAddress;

These in usb.h have extra elements at the end of the usb 2.0
specified descriptor and are used.

usb_config_descriptor
usb_interface_descriptor

The change is to consolidate the definition of the descriptors
to usbdescriptors.h.  The dublicates in usb.h are removed.
The extra element structure will have their name shorted by
removing the '_descriptor' suffix.

So

usb_config_descriptor -> usb_config
usb_interface_descriptor -> usb_interface

For these, the common descriptor elements are accessed now
by an element 'desc'.

As an example

- if (iface->bInterfaceClass != USB_CLASS_HUB)
+ if (iface->desc.bInterfaceClass != USB_CLASS_HUB)

This has been compile tested on MAKEALL arm, ppc and mips.

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
14 years agoMerge branch 'next' of git://git.denx.de/u-boot-net
Wolfgang Denk [Thu, 17 Dec 2009 21:59:27 +0000 (22:59 +0100)]
Merge branch 'next' of git://git.denx.de/u-boot-net

14 years agoUpdate Makefile for tag generating
Li Yang [Wed, 9 Dec 2009 10:13:26 +0000 (18:13 +0800)]
Update Makefile for tag generating

Get tag directories from the $(__LIB) and also generate tag for .S files.

Signed-off-by: Li Yang <leoli@freescale.com>
14 years agodrivers/bios_emulator: Fix compile error in .depend not being generated
Kumar Gala [Wed, 16 Dec 2009 20:12:11 +0000 (14:12 -0600)]
drivers/bios_emulator: Fix compile error in .depend not being generated

make -C drivers/bios_emulator/
make[2]: Entering directory
`drivers/bios_emulator'
In file included from atibios.c:49:
biosemui.h:47:21: error: biosemu.h: No such file or directory
...
x86emu/decode.c:40:28: error: x86emu/x86emui.h: No such file or directory
...

Due to lack of proper CPPFLAGS being passed to .depend generation rule

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
14 years agoMerge branch 'next' of ../next
Wolfgang Denk [Tue, 15 Dec 2009 22:38:34 +0000 (23:38 +0100)]
Merge branch 'next' of ../next

14 years agoUpdate CHANGELOG; prepare Prepare v2009.11 v2009.11
Wolfgang Denk [Tue, 15 Dec 2009 22:20:54 +0000 (23:20 +0100)]
Update CHANGELOG; prepare Prepare v2009.11

Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years agompc85xx, mpc86xx: Fix gd->cpu pointer after relocation
Peter Tyser [Tue, 15 Dec 2009 18:10:47 +0000 (12:10 -0600)]
mpc85xx, mpc86xx: Fix gd->cpu pointer after relocation

The gd->cpu pointer is set to an address located in flash when the
probecpu() function is called while U-Boot is executing from flash.
This pointer needs to be updated to point to an address in RAM after
relocation has occurred otherwise Linux may not be able to boot due to
"fdt board" crashing if flash has been erased or changed.

This bug was introduced in commit
a0e2066f392782730f0398095e583c87812d97f2.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Reported-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Tested-by: Kumar Gala <galak@kernel.crashing.org>
Tested on MPC8527DS.
Tested by: Ed Swarthout <Ed.Swarthout@freescale.com>

14 years agoNet: Clean up LAN91C96 Support
Ben Warren [Tue, 15 Dec 2009 00:30:39 +0000 (16:30 -0800)]
Net: Clean up LAN91C96 Support

A previous Commit converted the LAN91C96 Ethernet driver to using the
CONFIG_NET_MULTI API, but did not include full board support.  This patch
finishes the job.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
14 years agoMVBLUE: Remove CONFIG_CMD_IRQ
Peter Tyser [Sun, 13 Dec 2009 23:58:34 +0000 (17:58 -0600)]
MVBLUE: Remove CONFIG_CMD_IRQ

Neither the MVBLUE nor its underlying architecture implement the
do_irqinfo() function which is required when CONFIG_CMD_IRQ is defined.
This change fixes the following MVBLUE compiler error:

-> ./MAKEALL MVBLUE
Configuring for MVBLUE board...
common/libcommon.a(cmd_irq.o):(.u_boot_cmd+0x24): undefined reference to `do_irqinfo'
make: *** [u-boot] Error 1

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
14 years agoimx27lite: Reenable MTD support on NOR flash.
Detlev Zundel [Mon, 14 Dec 2009 16:54:40 +0000 (17:54 +0100)]
imx27lite: Reenable MTD support on NOR flash.

The support for this was silently dropped by a configuration
split during the merge of the imx27lite board support in commit
864aa034f3a0e10ce710e8bbda171df3cab59414 (cmd_mtdparts: Move to common
handling of FLASH devices via MTD layer).

Signed-off-by: Detlev Zundel <dzu@denx.de>
14 years agonet: dm9000x: fix debug output
Thomas Weber [Wed, 9 Dec 2009 08:38:04 +0000 (09:38 +0100)]
net: dm9000x: fix debug output

commit 60f61e6d7655400bb785a2ef637581679941f6d1 breaks compile with gcc by introducing __func__
instead of constant string "func" in the macro call but missed to change the macro.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>