April 2011 - U-Boot

[U-Boot] [PATCH] mvgbe: enable the reception of packets with an odd number of preamble nibbles
by Klaus Flittner 13 Apr '11

13 Apr '11

With the current hardware initialisation of the driver all packets with an odd number of preamble nibbles are dropped. Some switches seem to send all packets with such an preamble. According to the functional specifications of the marvell 88F6180, 6190, 6192 and 6281 the reception of such packets can be enabled by setting bit 22 in register PSC1. Signed-off-by: Klaus Flittner <klaus(a)flittner.org> --- drivers/net/mvgbe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index c701f43..f1081a2 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -446,6 +446,9 @@ static int mvgbe_init(struct eth_device *dev) MVGBE_REG_WR(regs->psc0, MVGBE_MAX_RX_PACKET_9700BYTE | (MVGBE_REG_RD(regs->psc0) & MRU_MASK)); + /* Receive packets with odd number of preamble nibbles */ + MVGBE_REG_BITS_SET(regs->psc1, 1 << 22); + /* Enable port initially */ MVGBE_REG_BITS_SET(regs->psc0, MVGBE_SERIAL_PORT_EN);

3 2

[U-Boot] CEPAT email saya
by Titie 13 Apr '11

13 Apr '11

Salam perkenalan dari saudaramu di  Negara Mesir. Alhamdulillah, Allah menjaga saya di negara ini sampai saat ini.   Nama saya Tities Roro Massayu. Dari Indonesia ke Mesir. Orang tua saya dipanggil saat bus tumpangan mereka terguling. Saya anak satu-satunya. Saya berangkat tanpa berpikir panjang walaupun hanya dijadikan pembantu rumah tangga.  Alhamdulillah, saya tiba di Mesir tanpa halangan dengan TKW Indonesia lainnya. Tapi, agen kami menahan passport kami lalu kabur.   Allah terus menguji.   Saya bekerja di sebuah keluarga dan bertemu dengan lelaki yang adalah teman baik majikan saya. Dia selalu memberikan saya uang ketika mengunjungi rumah kerja saya. Ternyata dia adalah seorang politikus besar di sini. Dia menaruh hati kepada saya dan ingin saya menjadi istri keduanya.   Rencana kami tahun ini 2011 bulan desember, kami akan ke Indonesia untuk investasi dan memulai hidup baru dengan uangnya yang disimpan di Security Company di luar Mesir. Uang  US$2,500,000.00 ini disimpan di kotak di Security Company di luar Mesir. Calon suami saya terbunuh di protest jalanan di cairo. Saya dan pengacara terpercaya almarhum sudah membicarakan semua tentang pemindahan dana ini.   Sekarang saya harus menemukan seorang ahli waris untuk memindahkan uang ini ke Indonesia dengan bantuan pengacara almarhum SEBELUM ISTRI PERTAMA MEMBUNUH SAYA. Saya mencari orang yang dipercaya untuk membantu investasi dan memulai sukses bersama. Saya tidak mau berada di tengah kekadaan tidak stabil ini. Semua persiapan sudah selesai oleh pengacara almarhum dan Direktur Security Company mengerti keadaan saya. Direktur juga siap memastikan pemindahan kotak ini ke Indonesia berhasil.   Penawaran bisnis ini 100% bebas resiko  CEPAT email saya di   mstitie(a)rediffmail.com Allah tahu gusarnya saya.   Wa alaikum assalam wa rahmatu Allah wa barakatuh Tities Masayu  

1 0

[U-Boot] Apple iPhone 3G 32GB unlocked cell phone 100% new
by info＠dtp.org 13 Apr '11

13 Apr '11

We are original distributor of the brands and models of electronics, we sell Laptops, mobile phones, Xbox 360, Sony PSP, Plasma TV, Pda Phones, MP3 & MP4 player, PlayStation, digital cameras, DVD players, portable DVD, DVD car radio, MP3 , MP4, LCD TV, Plasma - TV, CD-ROM and more favorable and affordable prices. When shipping Worldwide at affordable price. Wiliefern international! All items are from us brand new, boxed andwith full warranty, we offer a return policy for defective items from the date of arrival (DOA) at your location, we offer prompt shipping from our warehouse is usually the product within 2 / 3 days via either Fedex / Ups or private courier Apple Iphone 3G 32GB Unlocked Mobile phone Package content: * 1 Apple iPhone 3G Phone * 1 Battery * 1 Charger * 1 Data Cable * 1 Stereo Handsfree * 1 User's Guide Feel free to contact us on Email: haryelectronicsltd(a)gmail.com TEL: +4470240 44 005

1 0

[U-Boot] P2020RDB/P1020RDB regression in 2011.03
by Felix Radensky 13 Apr '11

13 Apr '11

Hi, Commit b0c5ceb305054aadf2f810b0b7bfcc94926b78ad "powerpc/85xx: Fix PCI memory map setup on P1_P2_RDB" makes mini PCI-E slot on P2020RDB/P1020RDB boards unusable in linux versions before 2.6.39. PCI memory map changes require updates to device tree, which are only available in 2.6.39. In earlier kernels my system hangs when driver for PCI-E device in mini PCI-E slot is loaded. Tested with Atheros AR92XX wireless card and linux-2.6.38.2. The same card in standard PCI-E slot on P1020RDB works fine. Was this compatibility breakage intentional ? Maybe u-boot can update "ranges" properties in PCI-E nodes of device tree to avoid such scenarios in the future ? Felix. Felix.

1 0

[U-Boot] [PATCH v5 0/9] Universal PHY Infrastructure
by Andy Fleming 13 Apr '11

13 Apr '11

Or PHY Lib for U-Boot. This sequence of patches adds infrastructure for universally-available PHY drivers (and MDIO drivers). It piggy-backs on the existing miiphy code, for backwards compatibility, but it also creates a new set of APIs. This was necessary partly to provide cleaner interfaces for more robust driver support, and partly because one goal was to support 10G (802.3 Clause 45) MDIO buses, which has an extra argument for addressing PHY registers. Special thanks goes to Mingkai Hu, who did a substantial amount of work up front to convert the tsec PHY code into something more usable, which I have mostly copied for the purposes of PHY Lib. In this version, I slightly re-architected the 10G support (mmds are now specified in the driver initialization, and the code which auto-detects the mmds is now its own function). I added a phy_reset() function, which works with 10G PHYs as well. I put a reset early in phy_connect(), so that many more PHYs work out of the box. I also fix the Marvell PHY code, which had dropped a number of the resets which were necessary. One last major change was to eliminate fsl_phy_enet_if, and replace it with the phy_interface_t enum. I've made this its own patch, as it touches many files. The new mdio command loses the "busname:addr" addressing mechanism, as "busname addr" felt more natural to me (though I expect most people will go with "ethname", as the ethernet names are much more visible. In addition, the <devad> argument is now optional by way of being combined with the reg argument: [<devad>.]<regnum>. This makes sense, as this is also how the registers are described in the specs and in the data sheets. ie: Register 7.1 - AN Status I've put the relevant changelogs in the patches. Enjoy! I pushed this new version to git://git.denx.de/u-boot/u-boot-mmc.git in the phylib branch Andy Fleming (7): Remove instances of phy_read/write miiphy: Fix some formatting issues Create PHY Lib for U-Boot phylib: Add a bunch of PHY drivers from tsec tsec: Convert tsec to use PHY Lib fsl: Change fsl_phy_enet_if to phy_interface_t Add mdio command for new PHY infrastructure Mingkai Hu (2): tsec: use IO accessors for IO accesses tsec: arrange the code to avoid useless function declaration arch/powerpc/cpu/mpc8xxx/fdt.c | 23 +- arch/powerpc/include/asm/config.h | 9 + arch/powerpc/include/asm/fsl_enet.h | 27 +- board/freescale/mpc8360emds/mpc8360emds.c | 10 +- board/freescale/mpc837xemds/mpc837xemds.c | 10 +- board/freescale/mpc8536ds/mpc8536ds.c | 6 + board/freescale/mpc8544ds/mpc8544ds.c | 30 + board/freescale/mpc8569mds/mpc8569mds.c | 4 +- board/freescale/mpc8572ds/mpc8572ds.c | 6 + board/freescale/p1022ds/p1022ds.c | 6 + board/freescale/p1_p2_rdb/p1_p2_rdb.c | 6 + board/freescale/p2020ds/p2020ds.c | 7 + common/Makefile | 4 + common/cmd_mdio.c | 286 +++++ common/miiphyutil.c | 311 +++-- drivers/net/Makefile | 2 +- drivers/net/dm9000x.c | 18 +- drivers/net/enc28j60.c | 24 +- drivers/net/fsl_mdio.c | 120 ++ drivers/net/phy/Makefile | 13 + drivers/net/phy/atheros.c | 48 + drivers/net/phy/broadcom.c | 286 +++++ drivers/net/phy/davicom.c | 98 ++ drivers/net/phy/generic_10g.c | 105 ++ drivers/net/phy/lxt.c | 87 ++ drivers/net/phy/marvell.c | 367 ++++++ drivers/net/phy/micrel.c | 40 + drivers/net/phy/natsemi.c | 96 ++ drivers/net/phy/phy.c | 753 +++++++++++ drivers/net/phy/realtek.c | 130 ++ drivers/net/phy/teranetics.c | 62 + drivers/net/phy/vitesse.c | 242 ++++ drivers/net/tsec.c | 1992 ++++------------------------- drivers/net/uli526x.c | 24 +- drivers/qe/uec.c | 59 +- drivers/qe/uec.h | 3 +- drivers/qe/uec_phy.c | 181 ++-- include/config_phylib_all_drivers.h | 32 + include/configs/MPC8323ERDB.h | 4 +- include/configs/MPC832XEMDS.h | 4 +- include/configs/MPC8360EMDS.h | 4 +- include/configs/MPC8360ERDK.h | 4 +- include/configs/MPC8568MDS.h | 4 +- include/configs/MPC8569MDS.h | 20 +- include/configs/kmeter1.h | 2 +- include/fsl_mdio.h | 62 + include/linux/ethtool.h | 721 +++++++++++ include/linux/mdio.h | 278 ++++ include/miiphy.h | 53 +- include/phy.h | 229 ++++ include/tsec.h | 302 +---- net/eth.c | 6 + 52 files changed, 4898 insertions(+), 2322 deletions(-) create mode 100644 common/cmd_mdio.c create mode 100644 drivers/net/fsl_mdio.c create mode 100644 drivers/net/phy/atheros.c create mode 100644 drivers/net/phy/broadcom.c create mode 100644 drivers/net/phy/davicom.c create mode 100644 drivers/net/phy/generic_10g.c create mode 100644 drivers/net/phy/lxt.c create mode 100644 drivers/net/phy/marvell.c create mode 100644 drivers/net/phy/micrel.c create mode 100644 drivers/net/phy/natsemi.c create mode 100644 drivers/net/phy/phy.c create mode 100644 drivers/net/phy/realtek.c create mode 100644 drivers/net/phy/teranetics.c create mode 100644 drivers/net/phy/vitesse.c create mode 100644 include/config_phylib_all_drivers.h create mode 100644 include/fsl_mdio.h create mode 100644 include/linux/ethtool.h create mode 100644 include/linux/mdio.h create mode 100644 include/phy.h

2 12

[U-Boot] [PATCH v2] MX51: mx51evk: Use struct to access SRSR register instead of offset
by Fabio Estevam 13 Apr '11

13 Apr '11

Use struct to access SRSR register instead of offset. While at it mask the 7 bits of SRSR for correctness. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Use readl to read the srsr register - Mask the lower 7 bits of the SRSR register for getting the correct result. board/freescale/mx51evk/mx51evk.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 02a765d..ea45ece 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -431,6 +431,10 @@ int board_late_init(void) int checkboard(void) { + u32 reset; + struct src *src_regs = (struct src *)SRC_BASE_ADDR; + reset = readl(&src_regs->srsr); + puts("Board: MX51EVK "); switch (system_rev & 0xff) { @@ -452,7 +456,7 @@ int checkboard(void) break; } - switch (__raw_readl(SRC_BASE_ADDR + 0x8)) { + switch (reset & 0x7F) { case 0x0001: puts("POR"); break; -- 1.6.0.4

2 1

[U-Boot] [PATCH] JFFS2: accelerate scanning.
by Leo Liu 13 Apr '11

13 Apr '11

This patch make the JFFS2 scanning faster in U-Boot. 1). if we find 1KB 0xFF data from the beginning of the erase block,skip it. 2). if the 1KB data is 0xFF after the cleanmarker, ship this erase block. For the 16MB nor flash, the scanning time is changed from about 9s to 1s. Signed-off-by: Leo Liu <liucai.lfn(a)gmail.com> --- fs/jffs2/jffs2_1pass.c | 31 +++++++++++++++++++++---------- fs/jffs2/jffs2_nand_1pass.c | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index dfb1745..f38f755 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -1441,7 +1441,7 @@ dump_dirents(struct b_lists *pL) } #endif -#define DEFAULT_EMPTY_SCAN_SIZE 4096 +#define DEFAULT_EMPTY_SCAN_SIZE 1024 static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size) { @@ -1461,7 +1461,7 @@ jffs2_1pass_build_lists(struct part_info * part) u32 counter4 = 0; u32 counterF = 0; u32 counterN = 0; - u32 buf_size = DEFAULT_EMPTY_SCAN_SIZE; + u32 buf_size = 128*1024;; char *buf; /* turn off the lcd. Refreshing the lcd adds 50% overhead to the */ @@ -1559,14 +1559,17 @@ jffs2_1pass_build_lists(struct part_info * part) /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ ofs = 0; - /* Scan only 4KiB of 0xFF before declaring it's empty */ + /* Scan only 1KiB of 0xFF before declaring it's empty */ while (ofs < EMPTY_SCAN_SIZE(part->sector_size) && *(uint32_t *)(&buf[ofs]) == 0xFFFFFFFF) ofs += 4; - if (ofs == EMPTY_SCAN_SIZE(part->sector_size)) + if (ofs == EMPTY_SCAN_SIZE(part->sector_size)) { + printf("Block at 0x%08x is empty (erased)\n", sector_ofs); continue; + } + /* Now ofs is a complete physical flash offset as it always was... */ ofs += sector_ofs; prevofs = ofs - 1; @@ -1594,16 +1597,14 @@ jffs2_1pass_build_lists(struct part_info * part) if (*(uint32_t *)(&buf[ofs-buf_ofs]) == 0xffffffff) { uint32_t inbuf_ofs; - uint32_t empty_start, scan_end; + uint32_t empty_start; empty_start = ofs; ofs += 4; - scan_end = min_t(uint32_t, EMPTY_SCAN_SIZE( - part->sector_size)/8, - buf_len); + more_empty: inbuf_ofs = ofs - buf_ofs; - while (inbuf_ofs < scan_end) { + while (inbuf_ofs < buf_len) { if (*(uint32_t *)(&buf[inbuf_ofs]) != 0xffffffff) goto scan_more; @@ -1613,6 +1614,12 @@ jffs2_1pass_build_lists(struct part_info * part) } /* Ran off end. */ + /* If we're only checking the beginning of a block with a cleanmarker, + bail now */ + if((buf_ofs == sector_ofs) && + (node ==(struct jffs2_unknown_node *)&buf[ofs-buf_ofs])) + break; + /* See how much more there is to read in this * eraseblock... */ @@ -1627,12 +1634,12 @@ jffs2_1pass_build_lists(struct part_info * part) */ break; } - scan_end = buf_len; get_fl_mem((u32)part->offset + ofs, buf_len, buf); buf_ofs = ofs; goto more_empty; } + if (node->magic != JFFS2_MAGIC_BITMASK || !hdr_crc(node)) { ofs += 4; @@ -1650,6 +1657,8 @@ jffs2_1pass_build_lists(struct part_info * part) case JFFS2_NODETYPE_INODE: if (buf_ofs + buf_len < ofs + sizeof(struct jffs2_raw_inode)) { + buf_len = min_t(uint32_t, buf_size, sector_ofs + + part->sector_size - ofs); get_fl_mem((u32)part->offset + ofs, buf_len, buf); buf_ofs = ofs; @@ -1671,6 +1680,8 @@ jffs2_1pass_build_lists(struct part_info * part) ((struct jffs2_raw_dirent *) node)->nsize) { + buf_len = min_t(uint32_t, buf_size, sector_ofs + + part->sector_size - ofs); get_fl_mem((u32)part->offset + ofs, buf_len, buf); buf_ofs = ofs; diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index e3bc536..16bb2e9 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -833,7 +833,7 @@ jffs2_1pass_build_lists(struct part_info * part) return 0; ofs = 0; - /* Scan only 4KiB of 0xFF before declaring it's empty */ + /* Scan only 1KiB of 0xFF before declaring it's empty */ while (ofs < EMPTY_SCAN_SIZE && *(uint32_t *)(&buf[ofs]) == 0xFFFFFFFF) ofs += 4; if (ofs == EMPTY_SCAN_SIZE) -- 1.7.3.1.msysgit.0

2 1

[U-Boot] [PATCH] MX51: mx51evk: Use struct to access SRSR register instead of offset
by Fabio Estevam 13 Apr '11

13 Apr '11

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx51evk/mx51evk.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 02a765d..3f2217c 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -431,6 +431,10 @@ int board_late_init(void) int checkboard(void) { + u32 reset; + struct src *src_regs = (struct src *)SRC_BASE_ADDR; + reset = src_regs->srsr; + puts("Board: MX51EVK "); switch (system_rev & 0xff) { @@ -452,7 +456,7 @@ int checkboard(void) break; } - switch (__raw_readl(SRC_BASE_ADDR + 0x8)) { + switch (reset) { case 0x0001: puts("POR"); break; -- 1.6.0.4

3 2

[U-Boot] [PATCH 0/6] x86: General cleanup
by Graeme Russ 13 Apr '11

13 Apr '11

The following is a series of relative minor x86 patches. Patch 4 (rename i386 to x86) is far more trivial than it looks :) In theory they could be submitted as six mutually independent patches, but the order becomes important due to the rename and they are all 'cleanup' patches with no significant functional changes NOTE: checkpatch does complain a bit about the Daniel Engström's name and the '%' used to designate registers in asm files plus there is one long line picked up in the i386 to x86 rename Graeme Russ (6): eNET: Fix saveenv crash eNET: Remove config.mk x86: Code cleanup x86: Rename i386 to x86 sc520: Move reset to stand-alone file x86: Update MAINTAINERS and delete README files MAINTAINERS | 4 +- MAKEALL | 4 +- Makefile | 4 +- README | 2 +- arch/{i386 => x86}/config.mk | 0 arch/{i386 => x86}/cpu/Makefile | 0 arch/{i386 => x86}/cpu/config.mk | 2 +- arch/{i386 => x86}/cpu/cpu.c | 33 ++++----- arch/{i386 => x86}/cpu/interrupts.c | 8 +- arch/{i386 => x86}/cpu/resetvec.S | 5 +- arch/{i386 => x86}/cpu/sc520/Makefile | 1 + arch/{i386 => x86}/cpu/sc520/sc520.c | 18 +---- arch/{i386 => x86}/cpu/sc520/sc520_car.S | 5 +- arch/{i386 => x86}/cpu/sc520/sc520_pci.c | 14 ++-- .../processor.h => x86/cpu/sc520/sc520_reset.c} | 24 ++++-- arch/{i386 => x86}/cpu/sc520/sc520_sdram.c | 4 +- arch/{i386 => x86}/cpu/sc520/sc520_ssi.c | 5 +- arch/{i386 => x86}/cpu/sc520/sc520_timer.c | 7 +- arch/{i386 => x86}/cpu/start.S | 34 ++++----- arch/{i386 => x86}/cpu/start16.S | 8 ++- arch/{i386 => x86}/cpu/u-boot.lds | 5 +- arch/{i386 => x86}/include/asm/bitops.h | 0 arch/{i386 => x86}/include/asm/bootparam.h | 0 arch/{i386 => x86}/include/asm/byteorder.h | 0 arch/{i386 => x86}/include/asm/config.h | 0 arch/{i386 => x86}/include/asm/e820.h | 0 arch/{i386 => x86}/include/asm/errno.h | 0 arch/{i386 => x86}/include/asm/global_data.h | 0 arch/{i386 => x86}/include/asm/i8254.h | 0 arch/{i386 => x86}/include/asm/i8259.h | 0 arch/{i386 => x86}/include/asm/ibmpc.h | 0 arch/{i386 => x86}/include/asm/ic/pci.h | 0 arch/{i386 => x86}/include/asm/ic/sc520.h | 0 arch/{i386 => x86}/include/asm/ic/ssi.h | 0 arch/{i386 => x86}/include/asm/interrupt.h | 4 +- arch/{i386 => x86}/include/asm/io.h | 0 arch/{i386 => x86}/include/asm/ioctl.h | 0 arch/{i386 => x86}/include/asm/ist.h | 0 arch/{i386 => x86}/include/asm/pci.h | 0 arch/{i386 => x86}/include/asm/posix_types.h | 0 arch/{i386 => x86}/include/asm/processor-flags.h | 0 arch/{i386 => x86}/include/asm/processor.h | 0 arch/{i386 => x86}/include/asm/ptrace.h | 0 arch/{i386 => x86}/include/asm/realmode.h | 0 arch/{i386 => x86}/include/asm/string.h | 0 arch/{i386 => x86}/include/asm/types.h | 0 .../u-boot-i386.h => x86/include/asm/u-boot-x86.h} | 4 +- arch/{i386 => x86}/include/asm/u-boot.h | 0 arch/{i386 => x86}/include/asm/unaligned.h | 0 arch/{i386 => x86}/include/asm/video/edid.h | 0 arch/{i386 => x86}/include/asm/zimage.h | 0 arch/{i386 => x86}/lib/Makefile | 0 arch/{i386 => x86}/lib/bios.S | 3 +- arch/{i386 => x86}/lib/bios.h | 12 ++-- arch/{i386 => x86}/lib/bios_pci.S | 0 arch/{i386 => x86}/lib/bios_setup.c | 3 +- arch/{i386 => x86}/lib/board.c | 23 +++---- arch/{i386 => x86}/lib/bootm.c | 15 +++-- arch/{i386 => x86}/lib/interrupts.c | 16 ++-- arch/{i386 => x86}/lib/pcat_interrupts.c | 4 +- arch/{i386 => x86}/lib/pcat_timer.c | 2 +- arch/{i386 => x86}/lib/pci.c | 18 ++--- arch/{i386 => x86}/lib/pci_type1.c | 27 ++++++-- arch/{i386 => x86}/lib/realmode.c | 10 +-- arch/{i386 => x86}/lib/realmode_switch.S | 1 - arch/{i386 => x86}/lib/timer.c | 5 +- arch/{i386 => x86}/lib/video.c | 27 +++----- arch/{i386 => x86}/lib/video_bios.c | 2 +- arch/{i386 => x86}/lib/zimage.c | 4 +- board/eNET/config.mk | 24 ------ board/eNET/eNET_pci.c | 7 +- boards.cfg | 4 +- common/exports.c | 2 +- doc/README-i386 | 74 -------------------- doc/TODO-i386 | 29 -------- examples/standalone/stubs.c | 4 +- include/common.h | 6 +- include/configs/eNET.h | 23 ++++-- include/exports.h | 2 +- 79 files changed, 209 insertions(+), 333 deletions(-) rename arch/{i386 => x86}/config.mk (100%) rename arch/{i386 => x86}/cpu/Makefile (100%) rename arch/{i386 => x86}/cpu/config.mk (94%) rename arch/{i386 => x86}/cpu/cpu.c (89%) rename arch/{i386 => x86}/cpu/interrupts.c (99%) rename arch/{i386 => x86}/cpu/resetvec.S (89%) rename arch/{i386 => x86}/cpu/sc520/Makefile (96%) rename arch/{i386 => x86}/cpu/sc520/sc520.c (82%) rename arch/{i386 => x86}/cpu/sc520/sc520_car.S (97%) rename arch/{i386 => x86}/cpu/sc520/sc520_pci.c (94%) copy arch/{i386/include/asm/processor.h => x86/cpu/sc520/sc520_reset.c} (67%) rename arch/{i386 => x86}/cpu/sc520/sc520_sdram.c (99%) rename arch/{i386 => x86}/cpu/sc520/sc520_ssi.c (94%) rename arch/{i386 => x86}/cpu/sc520/sc520_timer.c (94%) rename arch/{i386 => x86}/cpu/start.S (84%) rename arch/{i386 => x86}/cpu/start16.S (93%) rename arch/{i386 => x86}/cpu/u-boot.lds (90%) rename arch/{i386 => x86}/include/asm/bitops.h (100%) rename arch/{i386 => x86}/include/asm/bootparam.h (100%) rename arch/{i386 => x86}/include/asm/byteorder.h (100%) rename arch/{i386 => x86}/include/asm/config.h (100%) rename arch/{i386 => x86}/include/asm/e820.h (100%) rename arch/{i386 => x86}/include/asm/errno.h (100%) rename arch/{i386 => x86}/include/asm/global_data.h (100%) rename arch/{i386 => x86}/include/asm/i8254.h (100%) rename arch/{i386 => x86}/include/asm/i8259.h (100%) rename arch/{i386 => x86}/include/asm/ibmpc.h (100%) rename arch/{i386 => x86}/include/asm/ic/pci.h (100%) rename arch/{i386 => x86}/include/asm/ic/sc520.h (100%) rename arch/{i386 => x86}/include/asm/ic/ssi.h (100%) rename arch/{i386 => x86}/include/asm/interrupt.h (95%) rename arch/{i386 => x86}/include/asm/io.h (100%) rename arch/{i386 => x86}/include/asm/ioctl.h (100%) rename arch/{i386 => x86}/include/asm/ist.h (100%) rename arch/{i386 => x86}/include/asm/pci.h (100%) rename arch/{i386 => x86}/include/asm/posix_types.h (100%) rename arch/{i386 => x86}/include/asm/processor-flags.h (100%) rename arch/{i386 => x86}/include/asm/processor.h (100%) rename arch/{i386 => x86}/include/asm/ptrace.h (100%) rename arch/{i386 => x86}/include/asm/realmode.h (100%) rename arch/{i386 => x86}/include/asm/string.h (100%) rename arch/{i386 => x86}/include/asm/types.h (100%) rename arch/{i386/include/asm/u-boot-i386.h => x86/include/asm/u-boot-x86.h} (93%) rename arch/{i386 => x86}/include/asm/u-boot.h (100%) rename arch/{i386 => x86}/include/asm/unaligned.h (100%) rename arch/{i386 => x86}/include/asm/video/edid.h (100%) rename arch/{i386 => x86}/include/asm/zimage.h (100%) rename arch/{i386 => x86}/lib/Makefile (100%) rename arch/{i386 => x86}/lib/bios.S (99%) rename arch/{i386 => x86}/lib/bios.h (90%) rename arch/{i386 => x86}/lib/bios_pci.S (100%) rename arch/{i386 => x86}/lib/bios_setup.c (99%) rename arch/{i386 => x86}/lib/board.c (95%) rename arch/{i386 => x86}/lib/bootm.c (86%) rename arch/{i386 => x86}/lib/interrupts.c (88%) rename arch/{i386 => x86}/lib/pcat_interrupts.c (96%) rename arch/{i386 => x86}/lib/pcat_timer.c (97%) rename arch/{i386 => x86}/lib/pci.c (94%) rename arch/{i386 => x86}/lib/pci_type1.c (61%) rename arch/{i386 => x86}/lib/realmode.c (95%) rename arch/{i386 => x86}/lib/realmode_switch.S (99%) rename arch/{i386 => x86}/lib/timer.c (94%) rename arch/{i386 => x86}/lib/video.c (94%) rename arch/{i386 => x86}/lib/video_bios.c (99%) rename arch/{i386 => x86}/lib/zimage.c (98%) delete mode 100644 board/eNET/config.mk delete mode 100644 doc/README-i386 delete mode 100644 doc/TODO-i386

1 12

[U-Boot] [PATCH]: add canyonlands RAM-boot target
by Fawaz 13 Apr '11

13 Apr '11

This Patch adds another build target for the AMCC Canyonlands [PPC460Ex] eval board, this target can be used to do NAND flash or NOR flash programming in a virgin board using u-boot commands. Using JTAG debugger(e.g. BDI2000/3000) configured to setup the SDRAM. here are TLB entries required to load RAM-u-boot (for BDI2000/3000): WTLB 0x00000095 0x0000003F ;SDRAM 256MB @ 0x00000000 WTLB 0xE1000005 0x4E10001B do SDRAM configuration. Then do the following usin JTAG emulator: 460EX>load 0x01000000 u-boot.bin bin 460EX>go Back to serial session that connected to canyonlands's serial port. Signed-off-by: Fawaz Gaili <fwazgai(a)gmail.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Felix Radensky <felix(a)embedded-sol.com> --- arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c | 11 ++- arch/powerpc/cpu/ppc4xx/Makefile | 2 + board/amcc/canyonlands/canyonlands.c | 3 +- board/amcc/canyonlands/init.S | 6 ++ board/amcc/canyonlands/u-boot-ram.lds | 96 ++++++++++++++++++++ boards.cfg | 1 + include/configs/canyonlands.h | 31 +++++-- 7 files changed, 137 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c index 95df1d9..2660cd2 100644 --- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c +++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c @@ -66,7 +66,8 @@ "SDRAM_" #mnemonic, SDRAM_##mnemonic, data); \ } while (0) -#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#if (!defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_SYS_RAMBOOT)) \ + || defined(CONFIG_NAND_SPL) static void update_rdcc(void) { u32 val; @@ -2896,7 +2897,8 @@ phys_size_t initdram(int board_type) * mustn't be reconfigured again since we're already running * from SDRAM. */ -#if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#if (!defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_SYS_RAMBOOT)) \ + || defined(CONFIG_NAND_SPL) unsigned long val; #if defined(CONFIG_440) @@ -3013,12 +3015,13 @@ phys_size_t initdram(int board_type) #endif #if defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION) -#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) +#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_SYS_RAMBOOT) \ + && !defined(CONFIG_NAND_SPL) /*------------------------------------------------------------------ | DQS calibration. +-----------------------------------------------------------------*/ DQS_autocalibration(); -#endif /* !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) */ +#endif /* !defined(CONFIG_NAND_U_BOOT && CONFIG_SYS_RAMBOOT) && !defined(CONFIG_NAND_SPL) */ #endif /* CONFIG_PPC4xx_DDR_AUTOCALIBRATION */ /* diff --git a/arch/powerpc/cpu/ppc4xx/Makefile b/arch/powerpc/cpu/ppc4xx/Makefile index d97ca20..02a48f9 100644 --- a/arch/powerpc/cpu/ppc4xx/Makefile +++ b/arch/powerpc/cpu/ppc4xx/Makefile @@ -36,9 +36,11 @@ COBJS := 40x_spd_sdram.o ifndef CONFIG_NAND_SPL ifndef CONFIG_NAND_U_BOOT +ifndef CONFIG_SYS_RAMBOOT COBJS += 44x_spd_ddr.o endif endif +endif COBJS-$(CONFIG_SDRAM_PPC4xx_IBM_DDR2) += 44x_spd_ddr2.o COBJS-$(CONFIG_PPC4xx_DDR_AUTOCALIBRATION) += 4xx_ibm_ddr2_autocalib.o COBJS += 4xx_pci.o diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 80e2739..d1f5e4f 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -390,8 +390,8 @@ int board_early_init_r (void) */ /* Remap the NOR FLASH to 0xcc00.0000 ... 0xcfff.ffff */ -#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) - mtebc(PB3CR, CONFIG_SYS_FLASH_BASE_PHYS_L | 0xda000); +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) \ + || defined(CONFIG_SYS_RAMBOOT) mtebc(PB3CR, CONFIG_SYS_FLASH_BASE_PHYS_L | 0xda000); #else mtebc(PB0CR, CONFIG_SYS_FLASH_BASE_PHYS_L | 0xda000); #endif diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index 8b7bfce..526d8bd 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -66,6 +66,13 @@ tlbtab: tlbentry(CONFIG_SYS_INIT_RAM_ADDR, SZ_4K, CONFIG_SYS_INIT_RAM_ADDR, 0, AC_RWX | SA_G) #endif +#ifdef CONFIG_SYS_RAMBOOT +#if CONFIG_SYS_MBYTES_SDRAM >= 512 + tlbentry(0x10000000, SZ_256M, 0x10000000, 0x0, AC_R|AC_W|SA_G|SA_I|AC_X) + /*additional entry required*/ +#endif +#endif + tlbentry(CONFIG_SYS_PCI_BASE, SZ_256M, 0x00000000, 0xC, AC_RW | SA_IG) tlbentry(CONFIG_SYS_PCI_MEMBASE, SZ_256M, 0x20000000, 0xC, AC_RW | SA_IG) tlbentry(CONFIG_SYS_PCIE_MEMBASE, SZ_256M, 0xB0000000, 0xD, AC_RW | SA_IG) diff --git a/board/amcc/canyonlands/u-boot-ram.lds b/board/amcc/canyonlands/u-boot-ram.lds new file mode 100644 index 0000000..e98d947 --- /dev/null +++ b/board/amcc/canyonlands/u-boot-ram.lds @@ -0,0 +1,96 @@ +/* + * (C) Copyright 2011 + * Stefan Roese, DENX Software Engineering, sr(a)denx.de. + * Fawaz Giali, Nile Center for Technology Research, fwazgai(a)gmail.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_ARCH(powerpc) +SECTIONS +{ + /* Read-only sections, merged into text segment: */ + . = + SIZEOF_HEADERS; + .text : + { + arch/powerpc/cpu/ppc4xx/start.o (.text*) + board/amcc/canyonlands/init.o (.text*) + + *(.text*) + } + _etext = .; + PROVIDE (etext = .); + .rodata : + { + *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) + } + + /* Read-write section, merged into data segment: */ + . = (. + 0x00FF) & 0xFFFFFF00; + _erotext = .; + PROVIDE (erotext = .); + .reloc : + { + KEEP(*(.got)) + _GOT2_TABLE_ = .; + KEEP(*(.got2)) + _FIXUP_TABLE_ = .; + KEEP(*(.fixup)) + } + __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2; + __fixup_entries = (. - _FIXUP_TABLE_)>>2; + + .data : + { + *(.data*) + *(.sdata*) + } + _edata = .; + PROVIDE (edata = .); + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + + . = .; + __start___ex_table = .; + __ex_table : { *(__ex_table) } + __stop___ex_table = .; + + . = ALIGN(256); + __init_begin = .; + .text.init : { *(.text.init) } + .data.init : { *(.data.init) } + . = ALIGN(256); + __init_end = .; + + __bss_start = .; + .bss (NOLOAD) : + { + *(.bss*) + *(.sbss*) + *(COMMON) + . = ALIGN(4); + } + + _end = . ; + PROVIDE (end = .); +} diff --git a/boards.cfg b/boards.cfg index c3b164e..1f7f4dd 100644 --- a/boards.cfg +++ b/boards.cfg @@ -647,6 +647,7 @@ bluestone powerpc ppc4xx - amcc bubinga powerpc ppc4xx - amcc canyonlands powerpc ppc4xx canyonlands amcc - canyonlands:CANYONLANDS canyonlands_nand powerpc ppc4xx canyonlands amcc - canyonlands:CANYONLANDS,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000 +canyonlands_ramboot powerpc ppc4xx canyonlands amcc - canyonlands:CANYONLANDS,SYS_RAMBOOT,SYS_TEXT_BASE=0x01000000,SYS_LDSCRIPT=board/amcc/canyonlands/u-boot-ram.lds ebony powerpc ppc4xx - amcc glacier powerpc ppc4xx canyonlands amcc - canyonlands:GLACIER glacier_nand powerpc ppc4xx canyonlands amcc - canyonlands:GLACIER,NAND_U_BOOT,SYS_TEXT_BASE=0x01000000 diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 8c03582..c7c817f 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -137,17 +137,31 @@ * Environment *----------------------------------------------------------------------*/ /* - * Define here the location of the environment variables (FLASH). + * Define here the location of the environment variables (FLASH). + */ +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */ +#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ +#elif defined(CONFIG_SYS_RAMBOOT) +#define CONFIG_ENV_IS_NOWHERE /* Store env in memory only*/ +#define CONFIG_ENV_SIZE (8 << 10) +/* + * In RAM-booting version, we have no environment storage. So we need to + * provide at least preliminary MAC addresses for the 4xx EMAC driver to + * register the interfaces. */ -#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) +#define CONFIG_ETHADDR 4a:56:49:22:3e:43 +#define CONFIG_ETH1ADDR 02:93:53:d5:06:98 +#else #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ #define CONFIG_SYS_NOR_CS 0 /* NOR chip connected to CSx */ #define CONFIG_SYS_NAND_CS 3 /* NAND chip connected to CSx */ -#else -#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ +#endif/*CONFIG_NAND_U_BOOT || CONFIG_NAND_SPL*/ + +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) \ + || defined(CONFIG_SYS_RAMBOOT) #define CONFIG_SYS_NOR_CS 3 /* NOR chip connected to CSx */ #define CONFIG_SYS_NAND_CS 0 /* NAND chip connected to CSx */ -#define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif /* @@ -251,7 +265,7 @@ /*------------------------------------------------------------------------------ * DDR SDRAM *----------------------------------------------------------------------------*/ -#if !defined(CONFIG_NAND_U_BOOT) +#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_SYS_RAMBOOT) #if !defined(CONFIG_ARCHES) /* * NAND booting U-Boot version uses a fixed initialization, since the whole @@ -324,7 +338,7 @@ #define CONFIG_SYS_SDRAM0_MMODE 0x00000432 #define CONFIG_SYS_SDRAM0_MEMODE 0x00000004 #endif /* !defined(CONFIG_ARCHES) */ -#endif /* !defined(CONFIG_NAND_U_BOOT) */ +#endif /* !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_SYS_RAMBOOT) */ #define CONFIG_SYS_MBYTES_SDRAM 512 /* 512MB */ @@ -571,7 +585,8 @@ * 0xfe00.0000 -> 4.ce00.0000 */ -#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) \ + || defined(CONFIG_SYS_RAMBOOT) /* Memory Bank 3 (NOR-FLASH) initialization */ #define CONFIG_SYS_EBC_PB3AP 0x10055e00 #define CONFIG_SYS_EBC_PB3CR (CONFIG_SYS_BOOT_BASE_ADDR | 0x9a000) -- Best Regards Fawaz Gaili NCTR NTC - Tower 8th floor

2 1