November 2013 - U-Boot

[U-Boot] Please pull u-boot-x86 (sandbox)
by Simon Glass 25 Nov '13

25 Nov '13

Hi Tom, I've collected up some initial patches why I think are pretty straightforward. buildman passes for all targets I build. The sandbox-only error in patch 5 is unavoidable without squashing these unrelated patches. ./tools/buildman/buildman -b x86-push2 -s Summary of 6 commits for 1182 boards (32 threads, 1 job per thread) 01: Merge branch 'master' of git://git.denx.de/u-boot-mips blackfin: + bf561-acvilon cm-bf561 blackstamp br4 bct-brettl2 cm-bf527 dnp5370 bf506f-ezkit ip04 bf527-sdp bf609-ezkit bf537-stamp bf527-ezkit-v2 cm-bf537e tcm-bf518 cm-bf537u bf537-pnav cm-bf533 pr1 bf533-ezkit ibf-dsp561 bf537-srv1 cm-bf548 bf537-minotaur bf538f-ezkit bf548-ezkit bf525-ucr2 blackvme bf527-ezkit tcm-bf537 bf533-stamp bf518f-ezbrd bf527-ad7160-eval bf526-ezbrd bf561-ezkit m68k: + M54455EVB_a66 M5329AFEE M5249EVB idmr M5208EVBE eb_cpu5282 M5475FFE M54451EVB astro_mcf5373l M54418TWR_serial_rmii M54455EVB_intel M5282EVB M54455EVB_i66 M5475GFE M5253DEMO M54455EVB_stm33 M5485BFE M5485DFE TASREG M5329BFEE M52277EVB M5475EFE M5475CFE cobra5272 M5485AFE M53017EVB M5485HFE M5235EVB M5253EVBE M54418TWR_nand_mii M54418TWR_nand_rmii_lowfreq M5475BFE M5475DFE M5275EVB M52277EVB_stmicro eb_cpu5282_internal M54451EVB_stmicro M5271EVB M5485GFE M5485EFE M5485FFE M54418TWR M5235EVB_Flash32 M5373EVB M54418TWR_nand_rmii M54418TWR_serial_mii M5485CFE M54455EVB M5475AFE M5272C3 powerpc: + MVBLM7 MVSMR lcd4_lwmon5 sparc: + grsim grsim_leon2 gr_cpci_ax2000 gr_xc3s_1500 gr_ep2s60 sh: + rsk7269 rsk7264 sh7752evb rsk7203 sh7757lcr microblaze: + microblaze-generic openrisc: + openrisc-generic arm: + pm9g45 qong nitrogen6dl2g palmtc zipitz2 omap3_zoom2 omap3_zoom1 wandboard_quad omap3_overo goflexhome mx6slevk nitrogen6s nitrogen6q wandboard_solo davinci_sonata VCMA9 mini2440 omap730p2_cs3boot iconnect km_kirkwood_pci titanium ib62x0 lubbock ethernut5 zynq_dcc vpac270_nor_128 nitrogen6q2g colibri_pxa270 sheevaplug kzm9g wandboard_dl am3517_crane mx6dlsabresd zynq tnetv107x_evm xaeniax devkit8000 nitrogen6dl mx6qarm2 magnesium mx6qsabrelite mx6qsabresd palmtreo680 kmsuv31 polaris omap3_sdp3430 imx27lite mgcoge3un mx6qsabreauto vpac270_nor_256 pxa255_idp udoo_quad kmnusa omap730p2_cs0boot kmcoge5un am3517_evm nhk8815_onenand openrd_client omap730p2 openrd_base nhk8815 km_kirkwood dns325 mcx lp8x4x vpac270_ond_256 smdk2410 h2200 nitrogen6s1g scb9328 jornada cgtqmx6qeval balloon3 omap3_evm omap3_logic dockstar portl2 palmld openrd_ultimate trizepsiv pogo_e02 pm9263 mx1ads 02: sandbox: Use uint64_t instead of u64 for time 03: sandbox: Use system headers first for sandbox's os.c 04: sandbox: config: Don't use 64-bit physical memory sandbox: + sandbox 05: sandbox: Correct data sizes and printf() strings in fdtdec.c sandbox: sandbox 06: sandbox: Make map_to_sysmem() use a constant pointer The following changes since commit c2e5e802ecb7ab668ce9911b210ed68c804b349f: Merge branch 'master' of git://git.denx.de/u-boot-mips (2013-11-17 14:11:34 -0500) are available in the git repository at: http://git.denx.de/u-boot-x86.git sandbox1 for you to fetch changes up to ed072b96efd7a5de51cef01c3d4bed4db0e391f0: sandbox: Make map_to_sysmem() use a constant pointer (2013-11-21 16:54:26 -0700) ---------------------------------------------------------------- Simon Glass (5): sandbox: Use uint64_t instead of u64 for time sandbox: Use system headers first for sandbox's os.c sandbox: config: Don't use 64-bit physical memory sandbox: Correct data sizes and printf() strings in fdtdec.c sandbox: Make map_to_sysmem() use a constant pointer arch/sandbox/cpu/Makefile | 6 ++++-- arch/sandbox/cpu/os.c | 3 ++- arch/sandbox/include/asm/io.h | 2 +- arch/sandbox/include/asm/types.h | 4 ++-- config.mk | 9 +++++++-- include/common.h | 2 +- include/configs/sandbox.h | 1 - include/os.h | 4 +++- lib/fdtdec.c | 8 ++++---- 9 files changed, 24 insertions(+), 15 deletions(-) Regards, Simon

2 1

[U-Boot] Pull request: nand flash
by Scott Wood 25 Nov '13

25 Nov '13

The following changes since commit 63c4f17b2f8017d22241522a48c765073b8791b0: cm_t35: use scf0403 driver (2013-11-12 10:12:07 +0100) are available in the git repository at: git://git.denx.de/u-boot-nand-flash.git master for you to fetch changes up to 2c17e6d1d996a1b8b9325de15f253a13d5877dee: am335x: fix GPMC config for NAND and NOR SPL boot (2013-11-21 13:33:41 -0600) ---------------------------------------------------------------- Bo Shen (1): MTD: atmel_nand: support for software BCH ECC Prabhakar Kushwaha (4): driver/mtd/ifc: Read Status while programming NAND flash mtd: move & update nand_ecclayout structure (plus board changes) mtd/ifc: Add support of 8K page size NAND flash board/c29xpcie: Add support of 8K page size NAND flash Wu, Josh (4): mtd: atmel_nand: enable PMECC support for 8k bytes page NAND flash sama5d3xek: support larger than 4G nand flash mtd: atmel_nand: don't print bit correction message in driver mtd: atmel_nand: use dev_xxx instead of printk pekon gupta (4): mtd: nand: omap: make am33xx/elm.c as common driver for all OMAPx and AMxxxx platforms mtd: nand: omap: enable BCH ECC scheme using ELM for generic platform mtd: nand: omap: add CONFIG_NAND_OMAP_ECCSCHEME for selection of ecc-scheme am335x: fix GPMC config for NAND and NOR SPL boot arch/arm/cpu/armv7/am33xx/Makefile | 1 - arch/arm/cpu/armv7/am33xx/mem.c | 52 ++-- arch/arm/include/asm/arch-am33xx/mem.h | 5 - .../include/asm/{arch-am33xx/elm.h => omap_elm.h} | 0 arch/arm/include/asm/omap_gpmc.h | 16 + arch/powerpc/cpu/mpc8xxx/fsl_ifc.c | 24 ++ arch/powerpc/include/asm/fsl_ifc.h | 2 + board/atmel/sama5d3xek/sama5d3xek.c | 5 +- board/ti/am335x/board.c | 14 +- doc/README.nand | 63 ++++ doc/README.omap3 | 3 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/atmel_nand.c | 40 ++- drivers/mtd/nand/fsl_ifc_nand.c | 99 ++++++- drivers/mtd/nand/fsl_ifc_spl.c | 7 +- .../am33xx/elm.c => drivers/mtd/nand/omap_elm.c | 6 +- drivers/mtd/nand/omap_gpmc.c | 321 +++++++++++++-------- drivers/mtd/onenand/onenand_base.c | 15 +- include/configs/ASH405.h | 2 + include/configs/C29XPCIE.h | 10 +- include/configs/MPC8572DS.h | 2 + include/configs/T4240QDS.h | 2 + include/configs/alpr.h | 2 + include/configs/am335x_evm.h | 5 +- include/configs/am335x_igep0033.h | 2 + include/configs/am3517_crane.h | 1 + include/configs/am3517_evm.h | 1 + include/configs/devkit8000.h | 1 + include/configs/mcx.h | 2 +- include/configs/omap3_beagle.h | 1 + include/configs/omap3_evm.h | 1 + include/configs/omap3_evm_quick_nand.h | 1 + include/configs/omap3_igep00x0.h | 1 + include/configs/omap3_overo.h | 1 + include/configs/siemens-am33x-common.h | 2 + include/configs/tam3517-common.h | 2 +- include/configs/tricorder.h | 4 +- include/linux/mtd/mtd.h | 23 ++ include/mtd/mtd-abi.h | 12 - 39 files changed, 532 insertions(+), 220 deletions(-) rename arch/arm/include/asm/{arch-am33xx/elm.h => omap_elm.h} (100%) rename arch/arm/cpu/armv7/am33xx/elm.c => drivers/mtd/nand/omap_elm.c (97%)

2 1

[U-Boot] Please pull u-boot-x86.git
by Simon Glass 25 Nov '13

25 Nov '13

The following changes since commit c2e5e802ecb7ab668ce9911b210ed68c804b349f: Merge branch 'master' of git://git.denx.de/u-boot-mips (2013-11-17 14:11:34 -0500) are available in the git repository at: http://git.denx.de/u-boot-x86.git buildpatman for you to fetch changes up to 8426d8b0899eb6a9845b3468662512a8da236241: buildman: make board selector argument a regex (2013-11-21 13:35:58 -0700) ---------------------------------------------------------------- Albert ARIBAUD (1): patman: add Commit-notes tag and section Andreas Bießmann (1): buildman: fix README Stephen Warren (1): buildman: make board selector argument a regex tools/buildman/README | 16 +++++++++++----- tools/buildman/board.py | 12 +++++++++++- tools/patman/README | 10 +++++++++- tools/patman/commit.py | 2 ++ tools/patman/patchstream.py | 43 ++++++++++++++++++++++++++++++++++++------- 5 files changed, 69 insertions(+), 14 deletions(-)

2 1

[U-Boot] Getting U-Boot running on Toradex Colibri T20 on Iris board
by Andrzej Telszewski 25 Nov '13

25 Nov '13

Hi, I'm trying to get the U-Boot running on the Iris board with the Toradex Colibri T20 module. I was able to flash the U-Boot and it starts but then immediately stops with the only message being: U-Boot 2013.07 (Aug 06 2013 - 17:47:43) TEGRA20 Board: Toradex Colibri T20 on Iris DRAM: The Colibri T20 board used is: 256MB RAM V1.2A Could you please give me any idea what I might be doing wrong? -- Best regards, Andrzej Telszewski Embedded Systems Developer Versa Design S.L. phone: +34 633 535 308 e-mail: atelszewski(a)versades.com

3 4

[U-Boot] pull-request: u-boot-mpc85xx/master
by York Sun 25 Nov '13

25 Nov '13

Tom, The following changes since commit c2e5e802ecb7ab668ce9911b210ed68c804b349f: Merge branch 'master' of git://git.denx.de/u-boot-mips (2013-11-17 14:11:34 -0500) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to f7f155e1e180e2e7743a036016ed917bba581d98: t2080qds/ramboot: enable PBL tool for t2080qds (2013-11-25 12:36:55 -0800) ---------------------------------------------------------------- Priyanka Jain (1): powerpc/t1040qds: Correct Maintainer name in boards.cfg Shaohui Xie (2): powerpc/p4080: enable support for PCIe SATA phy: introduce structure fixed-link Shengzhou Liu (4): net/fman: Add support for 10GEC3 and 10GEC4 powerpc/mpc85xx: Add T2080/T2081 SoC support powerpc/t2080qds: add support for t2080qds board t2080qds/ramboot: enable PBL tool for t2080qds Tang Yuantian (1): mpc85xx: Fix the offset of register address error York Sun (6): Driver/DDR: Moving Freescale DDR driver to a common driver Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx Driver/DDR: Add Freescale DDR driver for ARM powerpc/mpc8xxx: Extend DDR registers' fields Driver/DDR: Update DDR driver to allow non-zero base address Driver/IFC: Move Freescale IFC driver to a common driver Zhao Qiang (1): p1010rdb: enable mtdparts for NAND Makefile | 1 + README | 44 +- arch/powerpc/cpu/mpc83xx/Makefile | 6 +- arch/powerpc/cpu/mpc83xx/ecc.c | 8 +- arch/powerpc/cpu/mpc85xx/Makefile | 49 +- arch/powerpc/cpu/mpc85xx/cpu.c | 22 +- arch/powerpc/cpu/mpc85xx/mp.c | 2 +- arch/powerpc/cpu/mpc85xx/speed.c | 2 +- arch/powerpc/cpu/mpc85xx/spl_minimal.c | 2 +- arch/powerpc/cpu/mpc85xx/t2080_ids.c | 142 ++++ arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 208 +++++ arch/powerpc/cpu/mpc86xx/Makefile | 3 - arch/powerpc/cpu/mpc8xxx/Makefile | 7 - arch/powerpc/cpu/mpc8xxx/cpu.c | 2 + arch/powerpc/cpu/mpc8xxx/ddr/Makefile | 29 - arch/powerpc/include/asm/config.h | 6 + arch/powerpc/include/asm/config_mpc85xx.h | 57 ++ arch/powerpc/include/asm/config_mpc86xx.h | 2 + arch/powerpc/include/asm/fsl_serdes.h | 2 + arch/powerpc/include/asm/immap_83xx.h | 110 +-- arch/powerpc/include/asm/immap_85xx.h | 126 +-- arch/powerpc/include/asm/immap_86xx.h | 78 +- arch/powerpc/include/asm/mpc85xx_gpio.h | 4 +- arch/powerpc/include/asm/processor.h | 2 + board/exmeritus/hww1u1a/ddr.c | 4 +- board/exmeritus/hww1u1a/hww1u1a.c | 5 +- board/freescale/b4860qds/ddr.c | 6 +- board/freescale/bsc9131rdb/ddr.c | 4 +- board/freescale/bsc9131rdb/spl_minimal.c | 5 +- board/freescale/bsc9132qds/bsc9132qds.c | 18 +- board/freescale/bsc9132qds/ddr.c | 4 +- board/freescale/bsc9132qds/spl_minimal.c | 5 +- board/freescale/c29xpcie/c29xpcie.c | 2 +- board/freescale/c29xpcie/ddr.c | 4 +- board/freescale/corenet_ds/ddr.c | 4 +- board/freescale/corenet_ds/eth_p4080.c | 2 +- board/freescale/corenet_ds/p3041ds_ddr.c | 2 +- board/freescale/corenet_ds/p4080ds_ddr.c | 2 +- board/freescale/corenet_ds/p5020ds_ddr.c | 2 +- board/freescale/corenet_ds/p5040ds_ddr.c | 2 +- board/freescale/mpc8349emds/Makefile | 2 +- board/freescale/mpc8349emds/ddr.c | 4 +- board/freescale/mpc8349emds/mpc8349emds.c | 6 +- board/freescale/mpc8536ds/ddr.c | 4 +- board/freescale/mpc8536ds/mpc8536ds.c | 4 +- board/freescale/mpc8540ads/ddr.c | 4 +- board/freescale/mpc8540ads/mpc8540ads.c | 5 +- board/freescale/mpc8541cds/ddr.c | 4 +- board/freescale/mpc8541cds/mpc8541cds.c | 2 +- board/freescale/mpc8544ds/ddr.c | 4 +- board/freescale/mpc8544ds/mpc8544ds.c | 2 +- board/freescale/mpc8548cds/ddr.c | 4 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8555cds/ddr.c | 4 +- board/freescale/mpc8555cds/mpc8555cds.c | 2 +- board/freescale/mpc8560ads/ddr.c | 4 +- board/freescale/mpc8560ads/mpc8560ads.c | 4 +- board/freescale/mpc8568mds/ddr.c | 4 +- board/freescale/mpc8568mds/mpc8568mds.c | 2 +- board/freescale/mpc8569mds/ddr.c | 4 +- board/freescale/mpc8569mds/mpc8569mds.c | 5 +- board/freescale/mpc8572ds/ddr.c | 4 +- board/freescale/mpc8572ds/mpc8572ds.c | 4 +- board/freescale/mpc8610hpcd/Makefile | 2 +- board/freescale/mpc8610hpcd/ddr.c | 4 +- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 4 +- board/freescale/mpc8641hpcn/Makefile | 2 +- board/freescale/mpc8641hpcn/ddr.c | 4 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 4 +- board/freescale/p1010rdb/ddr.c | 4 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1010rdb/spl_minimal.c | 5 +- board/freescale/p1022ds/ddr.c | 4 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1022ds/spl_minimal.c | 2 +- board/freescale/p1023rdb/ddr.c | 4 +- board/freescale/p1023rdb/p1023rdb.c | 2 +- board/freescale/p1023rds/p1023rds.c | 5 +- board/freescale/p1_p2_rdb/ddr.c | 2 +- board/freescale/p1_p2_rdb_pc/ddr.c | 4 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_p2_rdb_pc/spl_minimal.c | 2 +- board/freescale/p1_twr/ddr.c | 4 +- board/freescale/p1_twr/p1_twr.c | 2 +- board/freescale/p2020come/ddr.c | 4 +- board/freescale/p2020ds/ddr.c | 6 +- board/freescale/p2020ds/p2020ds.c | 5 +- board/freescale/p2041rdb/ddr.c | 4 +- board/freescale/t1040qds/ddr.c | 4 +- board/freescale/t104xrdb/ddr.c | 4 +- board/freescale/t2080qds/Makefile | 12 + board/freescale/t2080qds/ddr.c | 127 +++ board/freescale/t2080qds/ddr.h | 85 +++ board/freescale/t2080qds/eth_t2080qds.c | 511 +++++++++++++ board/freescale/t2080qds/law.c | 34 + board/freescale/t2080qds/pci.c | 23 + board/freescale/t2080qds/t2080_pbi.cfg | 41 + board/freescale/t2080qds/t2080_rcw.cfg | 8 + board/freescale/t2080qds/t2080qds.c | 324 ++++++++ board/freescale/t2080qds/t2080qds.h | 13 + board/freescale/t2080qds/t2080qds_qixis.h | 47 ++ board/freescale/t2080qds/tlb.c | 146 ++++ board/freescale/t4qds/ddr.c | 4 +- board/freescale/t4qds/eth.c | 2 +- board/gdsys/p1022/controlcenterd.c | 2 +- board/gdsys/p1022/ddr.c | 4 +- board/keymile/kmp204x/ddr.c | 4 +- board/sbc8548/Makefile | 2 +- board/sbc8548/ddr.c | 7 +- board/sbc8548/sbc8548.c | 2 +- board/sbc8641d/Makefile | 2 +- board/sbc8641d/ddr.c | 4 +- board/sbc8641d/sbc8641d.c | 8 +- board/socrates/Makefile | 2 +- board/socrates/ddr.c | 4 +- board/socrates/sdram.c | 5 +- board/stx/stxgp3/Makefile | 2 +- board/stx/stxgp3/ddr.c | 4 +- board/stx/stxgp3/stxgp3.c | 2 +- board/stx/stxssa/Makefile | 2 +- board/stx/stxssa/ddr.c | 4 +- board/stx/stxssa/stxssa.c | 2 +- board/xes/xpedite517x/ddr.c | 4 +- board/xes/xpedite517x/xpedite517x.c | 2 +- board/xes/xpedite520x/ddr.c | 4 +- board/xes/xpedite537x/ddr.c | 4 +- board/xes/xpedite550x/ddr.c | 4 +- boards.cfg | 7 +- drivers/ddr/fsl/Makefile | 34 + drivers/ddr/fsl/arm_ddr_gen3.c | 213 ++++++ .../mpc8xxx/ddr => drivers/ddr/fsl}/ctrl_regs.c | 88 ++- .../ddr => drivers/ddr/fsl}/ddr1_dimm_params.c | 4 +- .../ddr => drivers/ddr/fsl}/ddr2_dimm_params.c | 4 +- .../ddr => drivers/ddr/fsl}/ddr3_dimm_params.c | 4 +- .../mpc8xxx/ddr => drivers/ddr/fsl}/interactive.c | 21 +- .../ddr/fsl}/lc_common_dimm_params.c | 18 +- .../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/main.c | 20 +- .../ddr/fsl/mpc85xx_ddr_gen1.c | 8 +- .../ddr/fsl/mpc85xx_ddr_gen2.c | 5 +- .../ddr/fsl/mpc85xx_ddr_gen3.c | 18 +- .../ddr-8641.c => drivers/ddr/fsl/mpc86xx_ddr.c | 10 +- .../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/options.c | 32 +- .../cpu/mpc8xxx/ddr => drivers/ddr/fsl}/util.c | 15 +- drivers/misc/Makefile | 1 + .../powerpc/cpu/mpc8xxx => drivers/misc}/fsl_ifc.c | 2 +- drivers/mtd/nand/fsl_ifc_nand.c | 2 +- drivers/mtd/nand/fsl_ifc_spl.c | 2 +- drivers/net/fm/Makefile | 2 + drivers/net/fm/eth.c | 12 +- drivers/net/fm/fm.h | 2 + drivers/net/fm/init.c | 18 +- drivers/net/fm/t2080.c | 91 +++ .../mpc8xxx/ddr => include}/common_timing_params.h | 0 include/configs/B4860QDS.h | 2 +- include/configs/BSC9131RDB.h | 2 +- include/configs/BSC9132QDS.h | 2 +- include/configs/C29XPCIE.h | 2 +- include/configs/HWW1U1A.h | 2 +- include/configs/MPC8349EMDS.h | 6 +- include/configs/MPC8536DS.h | 2 +- include/configs/MPC8540ADS.h | 2 +- include/configs/MPC8541CDS.h | 2 +- include/configs/MPC8544DS.h | 2 +- include/configs/MPC8548CDS.h | 2 +- include/configs/MPC8555CDS.h | 2 +- include/configs/MPC8560ADS.h | 2 +- include/configs/MPC8568MDS.h | 2 +- include/configs/MPC8569MDS.h | 2 +- include/configs/MPC8572DS.h | 2 +- include/configs/MPC8610HPCD.h | 2 +- include/configs/MPC8641HPCN.h | 2 +- include/configs/P1010RDB.h | 9 +- include/configs/P1022DS.h | 2 +- include/configs/P1023RDB.h | 2 +- include/configs/P1_P2_RDB.h | 2 +- include/configs/P2020COME.h | 2 +- include/configs/P2020DS.h | 4 +- include/configs/P2041RDB.h | 2 +- include/configs/P4080DS.h | 6 + include/configs/T1040QDS.h | 2 +- include/configs/T1040RDB.h | 2 +- include/configs/T1042RDB_PI.h | 2 +- include/configs/T2080QDS.h | 805 ++++++++++++++++++++ include/configs/controlcenterd.h | 2 +- include/configs/corenet_ds.h | 2 +- include/configs/km/kmp204x-common.h | 2 +- include/configs/mpq101.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/p1_twr.h | 2 +- include/configs/sbc8548.h | 2 +- include/configs/socrates.h | 2 +- include/configs/stxgp3.h | 2 +- include/configs/stxssa.h | 2 +- include/configs/t4qds.h | 2 +- include/configs/xpedite517x.h | 2 +- include/configs/xpedite520x.h | 2 +- include/configs/xpedite537x.h | 2 +- include/configs/xpedite550x.h | 2 +- include/fm_eth.h | 18 + .../cpu/mpc8xxx/ddr/ddr.h => include/fsl_ddr.h | 6 +- .../include/asm => include}/fsl_ddr_dimm_params.h | 0 .../include/asm => include}/fsl_ddr_sdram.h | 8 +- {arch/powerpc/include/asm => include}/fsl_ifc.h | 6 +- include/fsl_immap.h | 112 +++ include/phy.h | 8 + nand_spl/board/freescale/mpc8569mds/nand_boot.c | 2 +- nand_spl/board/freescale/p1023rds/nand_boot.c | 5 +- nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 2 +- spl/Makefile | 1 + 209 files changed, 3595 insertions(+), 735 deletions(-) create mode 100644 arch/powerpc/cpu/mpc85xx/t2080_ids.c create mode 100644 arch/powerpc/cpu/mpc85xx/t2080_serdes.c delete mode 100644 arch/powerpc/cpu/mpc8xxx/ddr/Makefile create mode 100644 board/freescale/t2080qds/Makefile create mode 100644 board/freescale/t2080qds/ddr.c create mode 100644 board/freescale/t2080qds/ddr.h create mode 100644 board/freescale/t2080qds/eth_t2080qds.c create mode 100644 board/freescale/t2080qds/law.c create mode 100644 board/freescale/t2080qds/pci.c create mode 100644 board/freescale/t2080qds/t2080_pbi.cfg create mode 100644 board/freescale/t2080qds/t2080_rcw.cfg create mode 100644 board/freescale/t2080qds/t2080qds.c create mode 100644 board/freescale/t2080qds/t2080qds.h create mode 100644 board/freescale/t2080qds/t2080qds_qixis.h create mode 100644 board/freescale/t2080qds/tlb.c create mode 100644 drivers/ddr/fsl/Makefile create mode 100644 drivers/ddr/fsl/arm_ddr_gen3.c rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ctrl_regs.c (96%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr1_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr2_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/ddr3_dimm_params.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/interactive.c (99%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/lc_common_dimm_params.c (98%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/main.c (98%) rename arch/powerpc/cpu/mpc85xx/ddr-gen1.c => drivers/ddr/fsl/mpc85xx_ddr_gen1.c (91%) rename arch/powerpc/cpu/mpc85xx/ddr-gen2.c => drivers/ddr/fsl/mpc85xx_ddr_gen2.c (96%) rename arch/powerpc/cpu/mpc85xx/ddr-gen3.c => drivers/ddr/fsl/mpc85xx_ddr_gen3.c (96%) rename arch/powerpc/cpu/mpc86xx/ddr-8641.c => drivers/ddr/fsl/mpc86xx_ddr.c (91%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/options.c (97%) rename {arch/powerpc/cpu/mpc8xxx/ddr => drivers/ddr/fsl}/util.c (95%) rename {arch/powerpc/cpu/mpc8xxx => drivers/misc}/fsl_ifc.c (99%) create mode 100644 drivers/net/fm/t2080.c rename {arch/powerpc/cpu/mpc8xxx/ddr => include}/common_timing_params.h (100%) create mode 100644 include/configs/T2080QDS.h rename arch/powerpc/cpu/mpc8xxx/ddr/ddr.h => include/fsl_ddr.h (97%) rename {arch/powerpc/include/asm => include}/fsl_ddr_dimm_params.h (100%) rename {arch/powerpc/include/asm => include}/fsl_ddr_sdram.h (98%) rename {arch/powerpc/include/asm => include}/fsl_ifc.h (99%) create mode 100644 include/fsl_immap.h Thanks, York

1 0

[U-Boot] [PATCH 1/4 v2] net/fman: Add support for 10GEC3 and 10GEC4
by Shengzhou Liu 25 Nov '13

25 Nov '13

There are more than two 10GEC in single FMAN in some SoCs(e.g. T2080). This patch adds support for 10GEC3 and 10GEC4. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- Against master branch of git://git.denx.de/u-boot.git v2: Rebase and add more comments description. arch/powerpc/include/asm/fsl_serdes.h | 2 ++ arch/powerpc/include/asm/immap_85xx.h | 2 ++ drivers/net/fm/eth.c | 12 ++++++++++-- drivers/net/fm/fm.h | 2 ++ drivers/net/fm/init.c | 18 ++++++++++++++---- include/fm_eth.h | 18 ++++++++++++++++++ 6 files changed, 48 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/fsl_serdes.h b/arch/powerpc/include/asm/fsl_serdes.h index cce892c..404ded4 100644 --- a/arch/powerpc/include/asm/fsl_serdes.h +++ b/arch/powerpc/include/asm/fsl_serdes.h @@ -62,6 +62,8 @@ enum srds_prtcl { QSGMII_FM1_B, /* B indicates MACs 5,6,9,10 */ QSGMII_FM2_A, QSGMII_FM2_B, + XFI_FM1_MAC1, + XFI_FM1_MAC2, XFI_FM1_MAC9, XFI_FM1_MAC10, XFI_FM2_MAC9, diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 6312618..f351521 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1719,6 +1719,8 @@ typedef struct ccsr_gur { #define FSL_CORENET_DEVDISR2_DTSEC1_10 0x00400000 #define FSL_CORENET_DEVDISR2_10GEC1_1 0x00800000 #define FSL_CORENET_DEVDISR2_10GEC1_2 0x00400000 +#define FSL_CORENET_DEVDISR2_10GEC1_3 0x80000000 +#define FSL_CORENET_DEVDISR2_10GEC1_4 0x40000000 #define FSL_CORENET_DEVDISR2_DTSEC2_1 0x00080000 #define FSL_CORENET_DEVDISR2_DTSEC2_2 0x00040000 #define FSL_CORENET_DEVDISR2_DTSEC2_3 0x00020000 diff --git a/drivers/net/fm/eth.c b/drivers/net/fm/eth.c index cb099cd..218a5ed 100644 --- a/drivers/net/fm/eth.c +++ b/drivers/net/fm/eth.c @@ -557,8 +557,16 @@ static int fm_eth_init_mac(struct fm_eth *fm_eth, struct ccsr_fman *reg) num = fm_eth->num; #ifdef CONFIG_SYS_FMAN_V3 - if (fm_eth->type == FM_ETH_10G_E) - num += 8; + if (fm_eth->type == FM_ETH_10G_E) { + /* 10GEC1/10GEC2 use mEMAC9/mEMAC10 + * 10GEC3/10GEC4 use mEMAC1/mEMAC2 + * so it needs to change the num. + */ + if (fm_eth->num >= 2) + num -= 2; + else + num += 8; + } base = &reg->memac[num].fm_memac; phyregs = &reg->memac[num].fm_memac_mdio; #else diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index 3ec49a4..43de114 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -18,9 +18,11 @@ #define RX_PORT_1G_BASE 0x08 #define MAX_NUM_RX_PORT_1G CONFIG_SYS_NUM_FM1_DTSEC #define RX_PORT_10G_BASE 0x10 +#define RX_PORT_10G_BASE2 0x08 #define TX_PORT_1G_BASE 0x28 #define MAX_NUM_TX_PORT_1G CONFIG_SYS_NUM_FM1_DTSEC #define TX_PORT_10G_BASE 0x30 +#define TX_PORT_10G_BASE2 0x28 #define MIIM_TIMEOUT 0xFFFF struct fm_muram { diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 35edd7a..cd787f4 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -64,6 +64,12 @@ struct fm_eth_info fm_info[] = { #if (CONFIG_SYS_NUM_FM1_10GEC >= 2) FM_TGEC_INFO_INITIALIZER(1, 2), #endif +#if (CONFIG_SYS_NUM_FM1_10GEC >= 3) + FM_TGEC_INFO_INITIALIZER2(1, 3), +#endif +#if (CONFIG_SYS_NUM_FM1_10GEC >= 4) + FM_TGEC_INFO_INITIALIZER2(1, 4), +#endif #if (CONFIG_SYS_NUM_FM2_10GEC >= 1) FM_TGEC_INFO_INITIALIZER(2, 1), #endif @@ -239,10 +245,14 @@ static void ft_fixup_port(void *blob, struct fm_eth_info *info, char *prop) * FM1_10GEC1 is enabled and FM1_DTSEC9 is disabled, ensure that the * dual-role MAC is not disabled, ditto for other dual-role MACs. */ - if (((info->port == FM1_DTSEC9) && (PORT_IS_ENABLED(FM1_10GEC1))) || - ((info->port == FM1_DTSEC10) && (PORT_IS_ENABLED(FM1_10GEC2))) || - ((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC9))) || - ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC10))) + if (((info->port == FM1_DTSEC9) && (PORT_IS_ENABLED(FM1_10GEC1))) || + ((info->port == FM1_DTSEC10) && (PORT_IS_ENABLED(FM1_10GEC2))) || + ((info->port == FM1_DTSEC1) && (PORT_IS_ENABLED(FM1_10GEC3))) || + ((info->port == FM1_DTSEC2) && (PORT_IS_ENABLED(FM1_10GEC4))) || + ((info->port == FM1_10GEC1) && (PORT_IS_ENABLED(FM1_DTSEC9))) || + ((info->port == FM1_10GEC2) && (PORT_IS_ENABLED(FM1_DTSEC10))) || + ((info->port == FM1_10GEC3) && (PORT_IS_ENABLED(FM1_DTSEC1))) || + ((info->port == FM1_10GEC4) && (PORT_IS_ENABLED(FM1_DTSEC2))) #if (CONFIG_SYS_NUM_FMAN == 2) || ((info->port == FM2_DTSEC9) && (PORT_IS_ENABLED(FM2_10GEC1))) || diff --git a/include/fm_eth.h b/include/fm_eth.h index 5a4fb70..98edfcf 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -22,6 +22,8 @@ enum fm_port { FM1_DTSEC10, FM1_10GEC1, FM1_10GEC2, + FM1_10GEC3, + FM1_10GEC4, FM2_DTSEC1, FM2_DTSEC2, FM2_DTSEC3, @@ -85,6 +87,22 @@ enum fm_eth_type { .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ offsetof(struct ccsr_fman, memac[n-1+8]),\ } + +#if (CONFIG_SYS_NUM_FM1_10GEC >= 3) +#define FM_TGEC_INFO_INITIALIZER2(idx, n) \ +{ \ + FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ + .index = idx, \ + .num = n - 1, \ + .type = FM_ETH_10G_E, \ + .port = FM##idx##_10GEC##n, \ + .rx_port_id = RX_PORT_10G_BASE2 + n - 3, \ + .tx_port_id = TX_PORT_10G_BASE2 + n - 3, \ + .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ + offsetof(struct ccsr_fman, memac[n-1-2]),\ +} +#endif + #else #define FM_DTSEC_INFO_INITIALIZER(idx, n) \ { \ -- 1.8.0

2 7

[U-Boot] [PATCH] p1010rdb: enable mtdparts for NAND
by Zhao Qiang 25 Nov '13

25 Nov '13

The default partition table matches the .dts files for these boards in Linux. This allows these partitions to be used by name with U-Boot's "nand" command. Signed-off-by: Zhao Qiang <B45475(a)freescale.com> --- include/configs/P1010RDB.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index f0d6c8b..5864402 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -329,6 +329,13 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE #endif +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITION +#define CONFIG_CMD_MTDPARTS +#define MTDIDS_DEFAULT "nand0=ff800000.flash" +#define MTDPARTS_DEFAULT \ + "mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)" + #define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | CSPR_PORT_SIZE_8 \ | CSPR_MSEL_NAND \ -- 1.8.0

2 1

[U-Boot] [PATCH v2] mpc85xx: Fix the offset of register address error
by Yuantian.Tang＠freescale.com 25 Nov '13

25 Nov '13

From: Tang Yuantian <yuantian.tang(a)freescale.com> The offset of register address within GPIO module is just CONFIG_SYS_MPC85xx_GPIO_ADDR. So, fix it. The following platforms are confirmed: MPC8572, P1023, P1020, P1022, P2020, P4080, P5020, P5040, T4240, B4860. Signed-off-by: Tang Yuantian <Yuantian.Tang(a)freescale.com> --- v2: - updated the commit message. arch/powerpc/include/asm/mpc85xx_gpio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/mpc85xx_gpio.h b/arch/powerpc/include/asm/mpc85xx_gpio.h index 3d11884..87bb4a0 100644 --- a/arch/powerpc/include/asm/mpc85xx_gpio.h +++ b/arch/powerpc/include/asm/mpc85xx_gpio.h @@ -20,7 +20,7 @@ static inline void mpc85xx_gpio_set(unsigned int mask, unsigned int dir, unsigned int val) { - ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR + 0xc00); + ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR); /* First mask off the unwanted parts of "dir" and "val" */ dir &= mask; @@ -56,7 +56,7 @@ static inline void mpc85xx_gpio_set_high(unsigned int gpios) static inline unsigned int mpc85xx_gpio_get(unsigned int mask) { - ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR + 0xc00); + ccsr_gpio_t *gpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR); /* Read the requested values */ return in_be32(&gpio->gpdat) & mask; -- 1.8.0

2 1

[U-Boot] [PATCH] powerpc/t1040qds: Correct Maintainer name in boards.cfg
by Priyanka Jain 25 Nov '13

25 Nov '13

Update T1040QDS naem to Poonam Aggrwal. Signed-off-by: Priyanka Jain <Priyanka.Jain(a)freescale.com> --- Based on u-boot-mpc85xx/next branch. boards.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/boards.cfg b/boards.cfg index 5e10125..dfe1c59 100644 --- a/boards.cfg +++ b/boards.cfg @@ -962,7 +962,7 @@ Active powerpc mpc85xx - freescale t4qds Active powerpc mpc85xx - freescale t4qds T4240QDS_SDCARD T4240QDS:PPC_T4240,RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000 - Active powerpc mpc85xx - freescale t4qds T4240QDS_SPIFLASH T4240QDS:PPC_T4240,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000 - Active powerpc mpc85xx - freescale t4qds T4240QDS_SRIO_PCIE_BOOT T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000 - -Active powerpc mpc85xx - freescale t1040qds T1040QDS T1040QDS:PPC_T1040 Naveen Burmi <NaveenBurmi(a)freescale.com> +Active powerpc mpc85xx - freescale t1040qds T1040QDS T1040QDS:PPC_T1040 Poonam Aggrwal <poonam.aggrwal(a)freescale.com> Active powerpc mpc85xx - gdsys p1022 controlcenterd_36BIT_SDCARD controlcenterd:36BIT,SDCARD Dirk Eibach <eibach(a)gdsys.de> Active powerpc mpc85xx - gdsys p1022 controlcenterd_36BIT_SDCARD_DEVELOP controlcenterd:36BIT,SDCARD,DEVELOP Dirk Eibach <eibach(a)gdsys.de> Active powerpc mpc85xx - gdsys p1022 controlcenterd_TRAILBLAZER controlcenterd:TRAILBLAZER,SPIFLASH Dirk Eibach <eibach(a)gdsys.de> -- 1.7.4.1

2 1

[U-Boot] [PATCH] phy: introduce structure fixed-link
by shh.xie＠gmail.com 25 Nov '13

25 Nov '13

From: Shaohui Xie <Shaohui.Xie(a)freescale.com> fixed-link is used in kernel for PHY-less MAC, so introduce this structure that U-boot can use it to fixup dtb dynamically. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)freescale.com> --- include/phy.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/phy.h b/include/phy.h index f0f522a..f86ffb9 100644 --- a/include/phy.h +++ b/include/phy.h @@ -160,6 +160,14 @@ struct phy_device { u32 flags; }; +struct fixed_link { + int phy_id; + int duplex; + int link_speed; + int pause; + int asym_pause; +}; + static inline int phy_read(struct phy_device *phydev, int devad, int regnum) { struct mii_dev *bus = phydev->bus; -- 1.8.0

3 3