]> git.ipfire.org Git - thirdparty/u-boot.git/log
thirdparty/u-boot.git
12 years agozynq_qspips:Break infinite loop after 1000 status read after trying to set qbit
Wendy Liang [Wed, 17 Apr 2013 03:59:18 +0000 (13:59 +1000)] 
zynq_qspips:Break infinite loop after 1000 status read after trying to set qbit

Currently, u-boot end up in infinite loop when the status reg of the SPI flash
is not 0 after it tries to set the quad bit. If quad bit setting fails, u-boot
hangs because of this infinite loop.

We introduce a counter. If the status register value is still not 0 after 1000
runs, it break the loop.

Signed-off-by: Wendy Liang <jliang@xilinx.com>
12 years agotemplate:/petalinux-auto-board.h: Remove 0x in front of ${filesize}
Jason Wu [Fri, 12 Apr 2013 00:54:45 +0000 (10:54 +1000)] 
template:/petalinux-auto-board.h: Remove 0x in front of ${filesize}

The 0x is not required tread as hex value. However, this is required
for Zynq sd_update_boot because the filesize return by fat load is
in hex size but with 0x prefix. This will cause sf error due to
the file size is 0x0xABCD not 0xABCD.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agonet:xilinx_axi_emac: Implement packet buffer
Jason Wu [Tue, 9 Apr 2013 06:16:32 +0000 (16:16 +1000)] 
net:xilinx_axi_emac: Implement packet buffer

Implement the ring buffer for xilinx_axi_emac driver and set the
length to 2.

This is required to workaround the issue reported by Peter:
Report from Peter:
The xilinx_axi_emac driver only define a length 1 ring buffer. The issue comes
from the fact that the next packet is transmitted before the receive is acked.
So this is what happens:

 - Uboot sends DHCP discover
 - Server responds with DHCP offer -> Length 1 RX buffer is full
 - Uboot traps the RX and TXs the DHCP request
 - Server responds with DHCP ack -> dropped and RX buffer is still full
 - Uboot returns RX buffer to hardware control

The last two are racing against each other. I dont know what the deal with DHCP
and dropped packets is supposed to be, I think you are supposed to start from
scratch. But in QEMU u-boot loses the race to the hardware every time, so DHCP
never acquires. This is probably because QEMU networking is unrealistically
fast. The real hardware would suffer the packet transmission time which would
generally be greater than the time it take the NetReceive path to return back to
to the rx_handler where the RX ring buffer is then refreshed.

Reported-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reported-by: Wendy Liang <jliang@xilinx.com>
Signed-off-by: Jason Wu <huanyu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoMerge branch 'xilinx/master-next' into petalinux/master-next
Michal Simek [Thu, 14 Mar 2013 14:49:40 +0000 (15:49 +0100)] 
Merge branch 'xilinx/master-next' into petalinux/master-next

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Move qspi MIO detection code into slcr
Jagannadha Sutradharudu Teki [Thu, 14 Mar 2013 12:29:13 +0000 (17:59 +0530)] 
spi: zynq: Move qspi MIO detection code into slcr

This patch provides a support for the qspi MIO runtime
detection code through slcr driver.

Now, slcr driver is capable to get the status of specific MIO
pins by taking an @periph name as an argument.

Currently added qspi0, qspi1_cs and qspi1 as @periph names.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Use u-boot coding style for declaring structure register set
Jagannadha Sutradharudu Teki [Tue, 12 Mar 2013 04:14:52 +0000 (09:44 +0530)] 
spi: zynq: Use u-boot coding style for declaring structure register set

Instead of defining register set as a macros, declare a structure
which consist of a register as per the offset values.

This is recommended coding style in u-boot.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Use standard readl/writel io routines
Jagannadha Sutradharudu Teki [Tue, 12 Mar 2013 04:14:51 +0000 (09:44 +0530)] 
spi: zynq: Use standard readl/writel io routines

Use the standard io routines writel and readl instead
of __raw_readl and __raw_writel respectively.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: driver code cleanups
Jagannadha Sutradharudu Teki [Tue, 12 Mar 2013 04:14:50 +0000 (09:44 +0530)] 
spi: zynq: driver code cleanups

- Moved the structures from zynq_qspips.h to zynq_qspips.c
- Removed typedef bool and zynq_qspips.h

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Update spi_cs_is_valid()
Jagannadha Sutradharudu Teki [Tue, 12 Mar 2013 04:14:49 +0000 (09:44 +0530)] 
spi: zynq: Update spi_cs_is_valid()

Updated the chipselect valid check to 1 bus and 2 chipselect's
as zynq qspi bus controller support maximum of 2 chipselects
in different bus topologies.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Add qspi dual stacked topology support
Jagannadha Sutradharudu Teki [Fri, 8 Mar 2013 18:43:48 +0000 (00:13 +0530)] 
spi: zynq: Add qspi dual stacked topology support

This patch provides a support for qspi dual stacked topology.

Compared to dual parallel, dual stacked is also a dual qspi with shared bus.
flahes memories can be accessed via CS's.

dual stacked access for lower memory:
zynq-uboot> sf probe 0 0 0
SF: Detected S25FL129P_64K with page size 64 KiB, total 16 MiB

dual stacked access for upper memory:
zynq-uboot> sf probe 1 0 0
SF: Detected S25FL129P_64K with page size 64 KiB, total 16 MiB

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Add enum qualifier for qspi connections topology
Jagannadha Sutradharudu Teki [Fri, 8 Mar 2013 18:43:47 +0000 (00:13 +0530)] 
spi: zynq: Add enum qualifier for qspi connections topology

QSPI connections topology single, dual parallel are defined
as enum qualifier to make use on respective area on the code.

Also added MIO count macros for single and dual qspi XQSPIPS_MIO_*

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Fix to check CS0 and CS1 MIO's
Jagannadha Sutradharudu Teki [Fri, 8 Mar 2013 18:43:46 +0000 (00:13 +0530)] 
spi: zynq: Fix to check CS0 and CS1 MIO's

Checking CS0 and CS1 MIO's for single and dual qspi which is
missing on the existing runtime qspi detection code.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agospi: zynq: Add static qualifiers
Jagannadha Sutradharudu Teki [Thu, 7 Mar 2013 13:59:09 +0000 (19:29 +0530)] 
spi: zynq: Add static qualifiers

Added few static qualifiers to missing symbols.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq_common: Option to load bitstream from SD/MMC/eMMC
Jagannadha Sutradharudu Teki [Thu, 7 Mar 2013 11:24:02 +0000 (16:54 +0530)] 
zynq_common: Option to load bitstream from SD/MMC/eMMC

This patch adds support to load bitstream from SD/MMC/eMMC cards
through $mmc_loadbit_fat env variable.

User should have a bitstream file named as 'system.bit.bin' on mmc
fat partition 0:0

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: Code cleanup on board.c
Jagannadha Sutradharudu Teki [Wed, 6 Mar 2013 17:42:25 +0000 (23:12 +0530)] 
zynq: Code cleanup on board.c

- Added tabs
- Fixed comment sytle

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: Use standard readl/writel io routines
Jagannadha Sutradharudu Teki [Wed, 6 Mar 2013 17:42:04 +0000 (23:12 +0530)] 
zynq: Use standard readl/writel io routines

Use the standard io routines writel and readl instead
of Xil_Out32 and Xil_In32 respectively.
Implemented zynq_slcr_get_boot_mode on slcr driver.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agoi2c: zynq: Driver code cleanup
Jagannadha Sutradharudu Teki [Wed, 6 Mar 2013 12:50:49 +0000 (18:20 +0530)] 
i2c: zynq: Driver code cleanup

- Add tabs
- Add spaces
- Fixed single line comments
- Replaced ETIMEDOUT to -ETIMEDOUT

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agoi2c: zynq: Use standard io routines from io.h
Jagannadha Sutradharudu Teki [Wed, 6 Mar 2013 12:50:48 +0000 (18:20 +0530)] 
i2c: zynq: Use standard io routines from io.h

Used standard io functions like readl, writel, clrbits_le32
and setbits_le32 instead Xin_le32, Xout_le32, Xclrbits_le32
and Xsetbits_le32 respectively.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add mem_regs and ecc_regs to one structure
Michal Simek [Wed, 6 Mar 2013 08:34:39 +0000 (09:34 +0100)] 
zynq: nand: Add mem_regs and ecc_regs to one structure

Created xnandps_smc_regs struct (xnandps_smc_mem_regs + xnand_smc_ecc_regs).

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq_common: Few code cleanups on board configs
Jagannadha Sutradharudu Teki [Wed, 6 Mar 2013 04:21:20 +0000 (09:51 +0530)] 
zynq_common: Few code cleanups on board configs

- Add tabs
- Rearrange the config macros
- Removed few unneeded configs
- Added missing && on nor autoboot

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agoZynq:aut-board.h.template: Update PS7 NOR flash parameter name
Jason Wu [Wed, 6 Mar 2013 07:15:06 +0000 (17:15 +1000)] 
Zynq:aut-board.h.template: Update PS7 NOR flash parameter name

Change from XILINX_PS7_NOR_BASEADDR to XILINX_PS7_NOR_FLASH_BASEADDR

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agozynq: nand: Minor cleanup on zynq_nand.c
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:06 +0000 (19:35 +0530)] 
zynq: nand: Minor cleanup on zynq_nand.c

- Added few print()
- Removed unneeded nand_info

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: nand: Renamed PSS with PS
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:05 +0000 (19:35 +0530)] 
zynq: nand: Renamed PSS with PS

Acronym PS instead of PSS.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Cleanup xnandps_device_ready
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:04 +0000 (19:35 +0530)] 
zynq: nand: Cleanup xnandps_device_ready

Cleanup the xnandps_device_ready logic by removing unnecessary
status variable.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add waitfor_ecc_completion
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:03 +0000 (19:35 +0530)] 
zynq: nand: Add waitfor_ecc_completion

Replaced endless while loop in waitfor_ecc_completion routine
with a timeout value.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Use u-boot coding style for declaring structure register set
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:02 +0000 (19:35 +0530)] 
zynq: nand: Use u-boot coding style for declaring structure register set

Instead of defining register set as a macros, declare a structure
which consist of a register as per the offset values.

This is recommended coding style in u-boot.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add const qualifier to xnandps_command_format
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:01 +0000 (19:35 +0530)] 
zynq: nand: Add const qualifier to xnandps_command_format

Declared const to xnandps_command_format array, as it never modified
throughout the code.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add static qualifiers
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:00 +0000 (19:35 +0530)] 
zynq: nand: Add static qualifiers

Added few static qualifiers to missing symbols.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Remove drivers/mtd/nand/zynq_nand.h
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:59 +0000 (19:34 +0530)] 
zynq: nand: Remove drivers/mtd/nand/zynq_nand.h

Moved the needed macros onto zynq_nand.c and removed the zynq_nand.h,
as there is no other user using zynq_nand.h.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Fix code cleanups
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:58 +0000 (19:34 +0530)] 
zynq: nand: Fix code cleanups

- Fixed few comment cleanups
- Add tabs
- Removed trailing spaces

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Code cleanups on zynq_nand.c
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:57 +0000 (19:34 +0530)] 
zynq: nand: Code cleanups on zynq_nand.c

- Removed EIO, ENXIO and ENOMEM
- Removed __devinitdata, __force
- Add few print() routines

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Use standard readl/writel io routines
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:56 +0000 (19:34 +0530)] 
zynq: nand: Use standard readl/writel io routines

Use the standard io routines writel and readl instead
of Xil_Out32 and Xil_In32 respectively.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Minor cleanup on zynq_nand.c
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:06 +0000 (19:35 +0530)] 
zynq: nand: Minor cleanup on zynq_nand.c

- Added few print()
- Removed unneeded nand_info

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: nand: Renamed PSS with PS
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:05 +0000 (19:35 +0530)] 
zynq: nand: Renamed PSS with PS

Acronym PS instead of PSS.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Cleanup xnandps_device_ready
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:04 +0000 (19:35 +0530)] 
zynq: nand: Cleanup xnandps_device_ready

Cleanup the xnandps_device_ready logic by removing unnecessary
status variable.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add waitfor_ecc_completion
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:03 +0000 (19:35 +0530)] 
zynq: nand: Add waitfor_ecc_completion

Replaced endless while loop in waitfor_ecc_completion routine
with a timeout value.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Use u-boot coding style for declaring structure register set
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:02 +0000 (19:35 +0530)] 
zynq: nand: Use u-boot coding style for declaring structure register set

Instead of defining register set as a macros, declare a structure
which consist of a register as per the offset values.

This is recommended coding style in u-boot.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add const qualifier to xnandps_command_format
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:01 +0000 (19:35 +0530)] 
zynq: nand: Add const qualifier to xnandps_command_format

Declared const to xnandps_command_format array, as it never modified
throughout the code.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Add static qualifiers
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:05:00 +0000 (19:35 +0530)] 
zynq: nand: Add static qualifiers

Added few static qualifiers to missing symbols.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Remove drivers/mtd/nand/zynq_nand.h
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:59 +0000 (19:34 +0530)] 
zynq: nand: Remove drivers/mtd/nand/zynq_nand.h

Moved the needed macros onto zynq_nand.c and removed the zynq_nand.h,
as there is no other user using zynq_nand.h.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Fix code cleanups
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:58 +0000 (19:34 +0530)] 
zynq: nand: Fix code cleanups

- Fixed few comment cleanups
- Add tabs
- Removed trailing spaces

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Code cleanups on zynq_nand.c
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:57 +0000 (19:34 +0530)] 
zynq: nand: Code cleanups on zynq_nand.c

- Removed EIO, ENXIO and ENOMEM
- Removed __devinitdata, __force
- Add few print() routines

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: nand: Use standard readl/writel io routines
Jagannadha Sutradharudu Teki [Tue, 5 Mar 2013 14:04:56 +0000 (19:34 +0530)] 
zynq: nand: Use standard readl/writel io routines

Use the standard io routines writel and readl instead
of Xil_Out32 and Xil_In32 respectively.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: Do not setup ram start and size in board specific file
Michal Simek [Tue, 5 Mar 2013 12:59:05 +0000 (13:59 +0100)] 
zynq: Do not setup ram start and size in board specific file

It is setup in dram_init_banksize() in board.c
Also do not call get_ram_size to determine ram size.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: Do not setup ram start and size in board specific file
Michal Simek [Tue, 5 Mar 2013 12:59:05 +0000 (13:59 +0100)] 
zynq: Do not setup ram start and size in board specific file

It is setup in dram_init_banksize() in board.c
Also do not call get_ram_size to determine ram size.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agomicroblaze: Remove custom fsl command
Michal Simek [Mon, 4 Mar 2013 17:41:33 +0000 (18:41 +0100)] 
microblaze: Remove custom fsl command

This command was used for microblaze fsl but it has never been
used and properly tested.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: sdhci: Enable MMC host High Capacity support
Jagannadha Sutradharudu Teki [Thu, 21 Feb 2013 15:47:56 +0000 (21:17 +0530)] 
zynq: sdhci: Enable MMC host High Capacity support

This patch enables MMC high capacity support to host, to inform
the card that the host is capable to handle the high capacity cards.

This is needs for the cards(mmc/emmc) which has > 2GB capacity.

Bug log(for > 2GB cards without enabling MMC_MODE_HC):
zynq-uboot> mmcinfo
[snip]
[snip]
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
Card did not respond to voltage select!
Device: zynq_sdhci
Manufacturer ID: 0
OEM: 0
Name: Tran Speed: 0
Rd Block Len: 0
MMC version 0.0
High Capacity: No
Capacity: 0 Bytes
Bus Width: 1-bit

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agopetalinux-auto-board.h.template: Minor style clean up
Jason Wu [Mon, 4 Mar 2013 06:40:25 +0000 (16:40 +1000)] 
petalinux-auto-board.h.template: Minor style clean up

Minor style clean up around boot command

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agopetalinux-auto-board.h.template: Enable boot command for NAND
Jason Wu [Mon, 4 Mar 2013 06:40:24 +0000 (16:40 +1000)] 
petalinux-auto-board.h.template: Enable boot command for NAND

Set CONFIG_BOOTCOMMAND for NAND flash.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agopetalinux-auto-board.h.template: Enable autoboot even if no Flash
Wendy Liang [Mon, 25 Feb 2013 07:17:31 +0000 (17:17 +1000)] 
petalinux-auto-board.h.template: Enable autoboot even if no Flash

Currently, if there is no flash, autoboot is always disabled.
It always set the bootcmd to netboot. However, there is customer
has system without any flash, and wants to boot from SD card but not
netboot.

We just need to reenable autoboot and let the user to set the CONFIG_BOOTCMD
from their platform's .h.template.

Signed-off-by: Wendy Liang <jliang@xilinx.com>
12 years agopetalinux-auto-board.h.template: Add support for PS7 NOR
Jason Wu [Fri, 1 Mar 2013 02:18:48 +0000 (12:18 +1000)] 
petalinux-auto-board.h.template: Add support for PS7 NOR

Set up correct flash start(XILINX_FLASH_START) and size
(XILINX_FLASH_SIZE) for NOR flash.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agopetalinux-auto-board.h.template: Add usual petalinux commands for nand
Jason Wu [Tue, 19 Feb 2013 05:55:01 +0000 (15:55 +1000)] 
petalinux-auto-board.h.template: Add usual petalinux commands for nand

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agopetalinux-auto-board.h.template: Add Nand detection
Jason Wu [Tue, 19 Feb 2013 05:55:00 +0000 (15:55 +1000)] 
petalinux-auto-board.h.template: Add Nand detection

and define the required variables

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agozynq_common: Define CONFIG_ENV_IS_NOWHERE
Jason Wu [Fri, 1 Mar 2013 02:18:49 +0000 (12:18 +1000)] 
zynq_common: Define CONFIG_ENV_IS_NOWHERE

CONFIG_ENV_IS_NOWHERE needs to be defined when CONFIG_SYS_NO_FLASH is
set. Otherwise compilation error will occur when try to compile a
system without a flash.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agozynq_common: Define CONFIG_ENV_IS_NOWHERE
Jason Wu [Fri, 1 Mar 2013 02:18:49 +0000 (12:18 +1000)] 
zynq_common: Define CONFIG_ENV_IS_NOWHERE

CONFIG_ENV_IS_NOWHERE needs to be defined when CONFIG_SYS_NO_FLASH is
set. Otherwise compilation error will occur when try to compile a
system without a flash.

Signed-off-by: Jason Wu <huanyu@xilinx.com>
12 years agozynq: sdhci: Enable MMC host High Capacity support
Jagannadha Sutradharudu Teki [Thu, 21 Feb 2013 15:47:56 +0000 (21:17 +0530)] 
zynq: sdhci: Enable MMC host High Capacity support

This patch enables MMC high capacity support to host, to inform
the card that the host is capable to handle the high capacity cards.

This is needs for the cards(mmc/emmc) which has > 2GB capacity.

Bug log(for > 2GB cards without enabling MMC_MODE_HC):
zynq-uboot> mmcinfo
[snip]
[snip]
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
CMD_SEND:1
                ARG                      0x00300000
                MMC_RSP_R3,4             0x00FF8080
Card did not respond to voltage select!
Device: zynq_sdhci
Manufacturer ID: 0
OEM: 0
Name: Tran Speed: 0
Rd Block Len: 0
MMC version 0.0
High Capacity: No
Capacity: 0 Bytes
Bus Width: 1-bit

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq_common: Ensure that commands won't be run partially
Michal Simek [Mon, 28 Jan 2013 11:34:19 +0000 (12:34 +0100)] 
zynq_common: Ensure that commands won't be run partially

Ensure that if one command fails when others won't be
executed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq_common: Ensure that commands won't be run partially
Michal Simek [Mon, 28 Jan 2013 11:34:19 +0000 (12:34 +0100)] 
zynq_common: Ensure that commands won't be run partially

Ensure that if one command fails when others won't be
executed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agomicroblaze: Remove custom fsl command
Michal Simek [Tue, 12 Feb 2013 11:06:08 +0000 (12:06 +0100)] 
microblaze: Remove custom fsl command

This command was used for microblaze fsl but it has never been
used and properly tested.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "mtd: spi_flash: Warn user with 3 byte addressing limitations"
Jagannadha Sutradharudu Teki [Mon, 11 Feb 2013 11:08:47 +0000 (16:38 +0530)] 
Revert "mtd: spi_flash: Warn user with 3 byte addressing limitations"

This reverts commit eef1451bb3cb039f62b018a5daf9cdbc4ef56f22.

Now the current implementation in spi_flash.c is able to access the
flash from greater than 16MiB in 3-byte addressing.

This should be the part of this patch:
"sf: Add bank address access support"
(sha1: 5b00fc8b7fbf422bdc18de2bfa414db38026094f)

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agopetalinux: Enable fpga command for zynq
Michal Simek [Mon, 11 Feb 2013 10:45:50 +0000 (11:45 +0100)] 
petalinux: Enable fpga command for zynq

fpga command provides an option to configure
programmable logic on zynq.
Enabling this option adds +3kB.

Usage:
tftp 10000000 fpga.bin
fpga info 0
fpga load 0 10000000 ${filesize}

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "mtd: spi_flash: Warn user with 3 byte addressing limitations"
Jagannadha Sutradharudu Teki [Mon, 11 Feb 2013 11:08:47 +0000 (16:38 +0530)] 
Revert "mtd: spi_flash: Warn user with 3 byte addressing limitations"

This reverts commit eef1451bb3cb039f62b018a5daf9cdbc4ef56f22.

Now the current implementation in spi_flash.c is able to access the
flash from greater than 16MiB in 3-byte addressing.

This should be the part of this patch:
"sf: Add bank address access support"
(sha1: 5b00fc8b7fbf422bdc18de2bfa414db38026094f)

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agosf: Do not use SZ_16M for Microblaze
Michal Simek [Wed, 6 Feb 2013 06:57:46 +0000 (07:57 +0100)] 
sf: Do not use SZ_16M for Microblaze

Microblaze doesn't define asm/sizes.h that's why SZ_16M
can't be used. Use direct value instead.

This should be the part of this patch.
"sf: Add bank address access support"
(sha1: 5b00fc8b7fbf422bdc18de2bfa414db38026094f)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agosf: Do not use SZ_16M for Microblaze
Michal Simek [Wed, 6 Feb 2013 06:57:46 +0000 (07:57 +0100)] 
sf: Do not use SZ_16M for Microblaze

Microblaze doesn't define asm/sizes.h that's why SZ_16M
can't be used. Use direct value instead.

This should be the part of this patch.
"sf: Add bank address access support"
(sha1: 5b00fc8b7fbf422bdc18de2bfa414db38026094f)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoMerge branch 'xilinx/master-next' into petalinux/master-next
Michal Simek [Mon, 4 Feb 2013 10:48:51 +0000 (11:48 +0100)] 
Merge branch 'xilinx/master-next' into petalinux/master-next

Change MMC configuration and using new gem driver.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: Removed Xilinx Boot ROM header support
Jagannadha Sutradharudu Teki [Wed, 30 Jan 2013 07:18:40 +0000 (12:48 +0530)] 
zynq: Removed Xilinx Boot ROM header support

Xilinx Boot ROM header support in u-boot is used on ep107
boards for testing XIP images.

This support is removed, as current u-boot is not
supporting ep107 boards and the current zynq boards are
not using/testing XIP as of now.

Removed.
- CONFIG_ZYNQ_XILINX_FLASH_HEADER references
- xromhdr.pl

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agosf: stmicro: Add support for N25Q256A
Jagannadha Sutradharudu Teki [Tue, 29 Jan 2013 11:43:38 +0000 (17:13 +0530)] 
sf: stmicro: Add support for N25Q256A

Add support for Numonyx N25Q256A SPI flash.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agosf: stmicro: Add support for N25Q32A
Jagannadha Sutradharudu Teki [Tue, 29 Jan 2013 11:43:37 +0000 (17:13 +0530)] 
sf: stmicro: Add support for N25Q32A

Add support for Numonyx N25Q32A SPI flash.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agosf: stmicro: Add support for N25Q32
Jagannadha Sutradharudu Teki [Tue, 29 Jan 2013 11:43:36 +0000 (17:13 +0530)] 
sf: stmicro: Add support for N25Q32

Add support for Numonyx N25Q32 SPI flash.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq_common: Enable VFAT support
Michal Simek [Mon, 28 Jan 2013 09:49:38 +0000 (10:49 +0100)] 
zynq_common: Enable VFAT support

Just for sure enable VFAT.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: sdhci: Add a delay quirk during completion of sdhci_send_cmd
Jagannadha Sutradharudu Teki [Fri, 25 Jan 2013 17:17:25 +0000 (18:17 +0100)] 
zynq: sdhci: Add a delay quirk during completion of sdhci_send_cmd

This patch provides to added delay quirk between the every sdhci_send_cmd()
execution.

Without this delay, MMC initialization on zynq board fails with
following error messages.

Controller never released inhibit bit(s).

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: Removed CONFIG_SYS_MMC_MAX_BLK_COUNT
Jagannadha Sutradharudu Teki [Fri, 25 Jan 2013 17:04:12 +0000 (22:34 +0530)] 
zynq: Removed CONFIG_SYS_MMC_MAX_BLK_COUNT

Removed CONFIG_SYS_MMC_MAX_BLK_COUNT, which is for single block reads

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agozynq: mmc: Support the sdhci instead of zynq_mmc
Jagannadha Sutradharudu Teki [Fri, 25 Jan 2013 17:16:36 +0000 (18:16 +0100)] 
zynq: mmc: Support the sdhci instead of zynq_mmc

This patch provides a support to use the generic sdhci interface
for zynq soc, hence removed the the existing zynq_mmc.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
12 years agofpga: zynq: Fix devcfg driver
Michal Simek [Mon, 28 Jan 2013 07:43:48 +0000 (08:43 +0100)] 
fpga: zynq: Fix devcfg driver

- Move slcr functionality to slcr driver
- Use register maps
- Fix coding style

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agonet: axi_emac: Remove compilation warnings
Michal Simek [Fri, 25 Jan 2013 13:46:35 +0000 (14:46 +0100)] 
net: axi_emac: Remove compilation warnings

Remove compilation warnings:
xilinx_axi_emac.c: In function 'setup_phy':
xilinx_axi_emac.c:274:26: warning: unused variable 'ret' [-Wunused-variable]
xilinx_axi_emac.c:274:6: warning: unused variable 'i' [-Wunused-variable]
xilinx_axi_emac.c:273:6: warning: unused variable 'phyreg' [-Wunused-variable]
xilinx_axi_emac.c: In function 'axi_dma_init':
xilinx_axi_emac.c:484:7: warning: suggest parentheses around operand of
 '!' or change '&' to '&&' or '!' to '~' [-Wparentheses]
xilinx_axi_emac.c: In function 'axiemac_send':
xilinx_axi_emac.c:593:4: warning: suggest parentheses around operand of
 '!' or change '&' to '&&' or '!' to '~' [-Wparentheses]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoarm: Do not change memory node setting to the kernel
Michal Simek [Wed, 23 Jan 2013 07:55:16 +0000 (08:55 +0100)] 
arm: Do not change memory node setting to the kernel

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agomtd: cfi_flash: Revert Xilinx specific hack
Nathan Rossi [Wed, 7 Nov 2012 07:10:52 +0000 (17:10 +1000)] 
mtd: cfi_flash: Revert Xilinx specific hack

Revert the hack to force the write buffer size to 256 bits. The
hack breaks any flash devices that have a write buffer that is not
256bits (e.g. JS28F256P30T95, on the ML507).

Signed-off-by: Jason Wu <huanyu@xilinx.com>
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
---
Reverting this patch it is causing the problem on zc770-xm012
flash timeout issue

12 years agowatchdog: Rewrite microblaze watchdog implementation
Michal Simek [Fri, 25 Jan 2013 13:41:04 +0000 (14:41 +0100)] 
watchdog: Rewrite microblaze watchdog implementation

- Move watchdog to drivers/watchdog
- Update documentation
- Change watchdog initialization (here is small problem
  because watchdog uses IRQ that's why must be initialized
  after intc initialization - which can be problematic
  in cases where problem happen between start and watchdog init)
- Rewrite to u-boot coding style
- Disable watchdog in reset function

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: gem: Add support for setup slcr gem clk speed
Michal Simek [Fri, 25 Jan 2013 11:16:39 +0000 (12:16 +0100)] 
zynq: gem: Add support for setup slcr gem clk speed

Fix problem with not setup proper clock for gem1.
This is generic approach for clk setup.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: gem: Simplify return path in zynq_gem_recv
Michal Simek [Fri, 25 Jan 2013 07:24:18 +0000 (08:24 +0100)] 
zynq: gem: Simplify return path in zynq_gem_recv

Remove one return from the code.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Code cleanup on qspips driver
Jagannadha Sutradharudu Teki [Tue, 22 Jan 2013 14:12:47 +0000 (19:42 +0530)] 
spi: zynq: Code cleanup on qspips driver

This patch cleans up zynq_qspi.c:
- removed the code under spin_lock_irqsave, spin_unlock_irqrestore
- removed the code under spin_lock, spin_unlock
- removed XIo_In32 and XIo_Out32, add __raw_readl and__raw_writel instead
- remove spaces
- add tabs
- comments cleanup
- removed few unnecessary variables

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Code cleanup on qspi driver
Jagannadha Sutradharudu Teki [Thu, 24 Jan 2013 12:44:47 +0000 (13:44 +0100)] 
spi: zynq: Code cleanup on qspi driver

Cleanups on.
- Renamed PSS with PS
- Renamed zynq_qspi with zynq_qspips

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agospi: zynq: Code style cleanup
Jagannadha Sutradharudu Teki [Sat, 19 Jan 2013 14:44:51 +0000 (20:14 +0530)] 
spi: zynq: Code style cleanup

This patch cleans up zynq_qspi.c:
- removed the code under the macro LINUX_ONLY_NOT_UBOOT
- remove spaces.
- remove DEBUG macros and add debug func
- add tabs

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agozynq: spi: Removed zynq_qspi_wrap.c file
Jagannadha Sutradharudu Teki [Thu, 24 Jan 2013 12:32:49 +0000 (13:32 +0100)] 
zynq: spi: Removed zynq_qspi_wrap.c file

Moved the code from zynq_qspi_wrap.c to zynq_qspi.c and
removed the zynq_qspi_wrap.c file to make single driver
for zynq qspi ps.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoxilinx: Change file permission for several files
Michal Simek [Thu, 24 Jan 2013 12:35:28 +0000 (13:35 +0100)] 
xilinx: Change file permission for several files

Use 644 permissions instead of 755.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "net: old_gem: Add old gem driver back to the repository"
Michal Simek [Thu, 24 Jan 2013 10:59:39 +0000 (11:59 +0100)] 
Revert "net: old_gem: Add old gem driver back to the repository"

This reverts commit 9c2796ece27a77a564e6f6a17d2f5e0cab036a78.

Use mainline gem driver all the time.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "net: old_gem: Wire up configuration for old gem driver"
Michal Simek [Thu, 24 Jan 2013 11:01:28 +0000 (12:01 +0100)] 
Revert "net: old_gem: Wire up configuration for old gem driver"

This reverts commit df6e39a23578fa57434c2f501a05c79da643420b.

Mainline zynq gem driver is fixed that's why no problem
to enable it and remove old one.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agonet: gem: Do not initialize BDs again
Michal Simek [Thu, 24 Jan 2013 12:04:12 +0000 (13:04 +0100)] 
net: gem: Do not initialize BDs again

BDs can be correctly setup just once and init function
performs only phy autodetection and enabling RX/TX.
RX/TX are disabled in halt function.

This patch solves the problem with repeatable tftp transfers.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoarm: zynq: Move lowlevel initialization from asm to C
Michal Simek [Thu, 24 Jan 2013 09:57:58 +0000 (10:57 +0100)] 
arm: zynq: Move lowlevel initialization from asm to C

- Remove several RTL configuration
- Skip unneeded DDR initialization
- Remove lowlevel_init.S

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoarm: zynq: Add SLCR support with system reset
Michal Simek [Wed, 23 Jan 2013 14:17:00 +0000 (19:47 +0530)] 
arm: zynq: Add SLCR support with system reset

The patch provides slcr base address initialization support
and a support to reset the cpu through slcr driver,
hence removed the reset_cpu() from board.c.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agomicroblaze: Remove FSL support from generic board
Michal Simek [Wed, 23 Jan 2013 13:18:25 +0000 (14:18 +0100)] 
microblaze: Remove FSL support from generic board

This code was targetting one specific Microblaze platform
configuration which is obsolete and fsl bus isn't used
in this way.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agosf: stmicro: Add support for N25Q64A
Jagannadha Sutradharudu Teki [Wed, 23 Jan 2013 12:51:45 +0000 (18:21 +0530)] 
sf: stmicro: Add support for N25Q64A

Add support for Numonyx N25Q64A SPI flash.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agosf: stmicro: Add support for N25Q64
Jagannadha Sutradharudu Teki [Wed, 23 Jan 2013 12:51:44 +0000 (18:21 +0530)] 
sf: stmicro: Add support for N25Q64

Add support for Numonyx N25Q064 SPI flash.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agocommon: cmd_bdinfo: Fix compilation warning for microblaze
Michal Simek [Wed, 23 Jan 2013 13:15:35 +0000 (14:15 +0100)] 
common: cmd_bdinfo: Fix compilation warning for microblaze

Fix one printf compilation warning in microblaze bdinfo part.

Warning log:
cmd_bdinfo.c: In function 'do_bdinfo':
cmd_bdinfo.c:219:2: warning: format '%u' expects argument of type
'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat]

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agocommon: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM
Michal Simek [Wed, 23 Jan 2013 11:02:32 +0000 (12:02 +0100)] 
common: cmd_bdinfo: Fix bdinfo to show all MACs for Microblaze and ARM

- Show all ethernet MACs in the system.
- Show current ethernet device

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agofs: romfs: Remove it
Michal Simek [Wed, 23 Jan 2013 10:16:06 +0000 (11:16 +0100)] 
fs: romfs: Remove it

The romfs support has never been merged to mainline
and using microblaze MMU caused that this support is
started to be obsolete and unused.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "ubi: Only read the actual size of the VID header"
Michal Simek [Wed, 23 Jan 2013 12:06:34 +0000 (13:06 +0100)] 
Revert "ubi: Only read the actual size of the VID header"

This reverts commit befc4f3ee911ffb5c9160bf9861887ce2fa1c411.

We are not using UBI. Sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "ubifs: Allow ubifsmount volume reference by number"
Michal Simek [Wed, 23 Jan 2013 10:32:54 +0000 (11:32 +0100)] 
Revert "ubifs: Allow ubifsmount volume reference by number"

This reverts commit 6e7cf45d9c9473ef52b36527ddd1538f5eda3c1e.

We are not using ubi support that's why let's revert this
patch and be in sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "ppc: Add Xilinx Virtex-5 FXT pvr value"
Michal Simek [Wed, 23 Jan 2013 10:05:22 +0000 (11:05 +0100)] 
Revert "ppc: Add Xilinx Virtex-5 FXT pvr value"

This reverts commit d66798cba7ff45647704ba827f23e61a4940d942.

Values are completely unused because there are missing
strings shown in cpu.c file.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
12 years agoRevert "microblaze: Fix in/out_be8/16/32 functions"
Michal Simek [Wed, 23 Jan 2013 09:07:59 +0000 (10:07 +0100)] 
Revert "microblaze: Fix in/out_be8/16/32 functions"

This reverts commit dcefe33658dfb8628cdba7a3c45df5016f3b0be3.

Just too keep this in sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>