December 2014 - U-Boot

[U-Boot] [PATCH] Fix console functions for U-Boot API
by Simon Glass 08 Dec '14

08 Dec '14

Commit 709ea54 made a subtle change to the way the U-Boot API jump table is set up. So at present putc(), getc(), tstc() and puts() do not work correctly from functions that use the U-Boot API. Previously these were set to the stdio functions, but these now take a parameter specifying which stdio device to use. Instead, we should change them to use the global functions which do not have a parameter. This is a slight change in behaviour. The functions will now output to all selected stdio devices - for example putc() will output a character to all devices selected by stdout. However in most cases there is only one, and it isn't necessarily incorrect behaviour anyway. The API version is not changed since it is compatible with what was there before. Reported-by: Martin Dorwig <dorwig(a)tektronik.com> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/console.c b/common/console.c index 4695386..29560c3 100644 --- a/common/console.c +++ b/common/console.c @@ -125,12 +125,12 @@ static int console_setfile(int file, struct stdio_dev * dev) */ switch (file) { case stdin: - gd->jt[XF_getc] = dev->getc; - gd->jt[XF_tstc] = dev->tstc; + gd->jt[XF_getc] = getc; + gd->jt[XF_tstc] = tstc; break; case stdout: - gd->jt[XF_putc] = dev->putc; - gd->jt[XF_puts] = dev->puts; + gd->jt[XF_putc] = putc; + gd->jt[XF_puts] = puts; gd->jt[XF_printf] = printf; break; } -- 2.1.0.rc2.206.gedb03e5

2 1

[U-Boot] [PATCH 0/2] spl: MMC U-Boot image load from raw partition
by Paul Kocialkowski 08 Dec '14

08 Dec '14

This is a first attempt at adding support for U-Boot image load from raw partitions. It does not support OS boot as I cannot test it on my current setup. This is going to be useful for the Optimus Black port (please do not consider this as dead code because no board is using it right now, there will be one soon)! On the Optimus Black, the second stage bootloader (U-Boot in our case) is stored on the second partition of the internal EMMC. This patch allows reading from that partition without the need of providing the U-Boot config with a sector address, but with the partition address. It makes sense as there is already code to read partition tables, so it would be a shame to hardcode the sector address while it can be obtained dynamically.

3 15

[U-Boot] Please pull u-boot-mpc85xx master
by York Sun 08 Dec '14

08 Dec '14

Tom, The following changes since commit 38cd8c4253013ccdd4052ee021f6066fe9a52551: Merge branch 'master' of git://git.denx.de/u-boot-mips (2014-11-27 10:49:38 -0500) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx.git master for you to fetch changes up to af7219de2c66b64ddae0348b3d3fa5072d800dd2: powerpc/hydra: fix judging condition of RGMII selection (2014-12-05 08:06:17 -0800) ---------------------------------------------------------------- Alison Wang (1): common: spl: Add interactive DDR debugger support for SPL image Chunhe Lan (3): powerpc/p1023rdb: Enable configs to use generic board code powerpc/c29xpcie: Enable configs to use generic board code powerpc/hydra: Update MDIO mux fixups Heiko Schocher (1): powerpc, muas3001: remove CONFIG_SYS_RAMBOOT Holger Brunck (1): km/km82xx: remove CONFIG_SYS_RAMBOOT Joakim Tjernlund (1): Freescale t104x: Do not exclude SGMII Minghuan Lian (1): powerpc/hydra: fix judging condition of RGMII selection Prabhakar Kushwaha (2): powerpc/mpc85xx:Put errata number for T104x NAND boot issue board/t104xrdb: Conditional workaround of errata A-008044 Priyanka Jain (1): powerpc/mpc85xx: Update LIODN entries for T1040 Shaohui Xie (4): powerpc/P5040DS: enable SATA support powerpc/b4860qds: add xfi support powerpc/b4860qds: dtb fixup for xfi powerpc/b4860qds: add workaround for XFI Shaveta Leekha (4): powerpc/b4860: Enable law creation of MAPLE 85xx/b4860: Add alternate serdes protocols for B4860/B4420 B4860QDS: SGMII related updates B4860: Add alternate LC VCO serdes protocols support in board file Shengzhou Liu (11): powerpc/t2080: add serdes2 protocol 0x2e net/phy: Add support for CS4315/CS4340 PHY powerpc/t2080: updating rcw for silicon v1.1 powerpc/mpc85xx: Add T1024/T1023 SoC support powerpc/t1024qds: Add T1024 QDS board support powerpc/t1024rdb: Add T1024 RDB board support net/fman: update 10GEC to fit new SoC board/t1024qds: update pin multiplexing net/phy: enable serdes auto-negotiation for vsc8514 phy t1024qds: increase IO drive strength board/t1024qds: add retimer support on t1024qds Suresh Gupta (2): B4860QDS: Enable SFP or AMC on basis of hwconfig string B4860QDS: Enable enet port as per fsl_b4860_serdes2 string in hwconfig Tang Yuantian (1): mpc85xx/p1022ds: convert to generic board Tudor Laurentiu (1): powerpc/mpc85xx: use correct dma compatible for several SoCs Xiaobo Xie (1): powerpc/t4240rdb: enable eSDHC 3.3V support Ying Zhang (3): powerpc/t208xqds: VID support board/freescale: use generic board architecture for p1025-twr board/freescale: use generic board architecture for p1010rdb York Sun (5): mpc85xx/t208xqds: Adjust DDR timing parameters mpc85xx/t2080: Fix parsing DDR ratio for new revision powerpc/t1040qds: Update DDR option driver/ddr/fsl: Adjust timing_cfg_0 to better support two DDR slots driver/ddr/fsl: Add workaround for faulty SPD Zhao Qiang (1): powerpc/mpc85xx: modify erratum A007186 vijay rai (1): powerpc/t104x: Convert to use generic board code README | 4 + arch/powerpc/cpu/mpc85xx/Kconfig | 10 + arch/powerpc/cpu/mpc85xx/Makefile | 4 + arch/powerpc/cpu/mpc85xx/b4860_ids.c | 4 +- arch/powerpc/cpu/mpc85xx/b4860_serdes.c | 19 + arch/powerpc/cpu/mpc85xx/cmd_errata.c | 11 +- arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 3 +- arch/powerpc/cpu/mpc85xx/p2041_ids.c | 4 +- arch/powerpc/cpu/mpc85xx/p3041_ids.c | 4 +- arch/powerpc/cpu/mpc85xx/p4080_ids.c | 4 +- arch/powerpc/cpu/mpc85xx/p5020_ids.c | 4 +- arch/powerpc/cpu/mpc85xx/p5040_ids.c | 4 +- arch/powerpc/cpu/mpc85xx/speed.c | 35 +- arch/powerpc/cpu/mpc85xx/t1024_ids.c | 82 +++ arch/powerpc/cpu/mpc85xx/t1024_serdes.c | 52 ++ arch/powerpc/cpu/mpc85xx/t1040_ids.c | 30 +- arch/powerpc/cpu/mpc85xx/t2080_ids.c | 6 +- arch/powerpc/cpu/mpc85xx/t2080_serdes.c | 1 + arch/powerpc/cpu/mpc85xx/t4240_ids.c | 4 +- arch/powerpc/cpu/mpc8xxx/cpu.c | 4 + arch/powerpc/include/asm/config_mpc85xx.h | 47 ++ arch/powerpc/include/asm/fsl_errata.h | 24 + arch/powerpc/include/asm/fsl_liodn.h | 4 +- arch/powerpc/include/asm/fsl_secure_boot.h | 4 +- arch/powerpc/include/asm/immap_85xx.h | 22 + arch/powerpc/include/asm/processor.h | 4 + board/freescale/b4860qds/b4860qds.c | 95 ++- board/freescale/b4860qds/eth_b4860qds.c | 127 +++- board/freescale/b4860qds/law.c | 3 - board/freescale/common/Makefile | 1 + board/freescale/common/vid.c | 491 +++++++++++++ board/freescale/common/vid.h | 20 + board/freescale/common/vsc3316_3308.c | 108 +++ board/freescale/common/vsc3316_3308.h | 4 + board/freescale/corenet_ds/eth_hydra.c | 7 +- board/freescale/t102xqds/Kconfig | 12 + board/freescale/t102xqds/MAINTAINERS | 12 + board/freescale/t102xqds/Makefile | 17 + board/freescale/t102xqds/README | 328 +++++++++ board/freescale/t102xqds/ddr.c | 170 +++++ board/freescale/t102xqds/eth_t102xqds.c | 442 +++++++++++ board/freescale/t102xqds/law.c | 32 + board/freescale/t102xqds/pci.c | 23 + board/freescale/t102xqds/spl.c | 151 ++++ board/freescale/t102xqds/t1024_pbi.cfg | 26 + board/freescale/t102xqds/t1024_rcw.cfg | 10 + board/freescale/t102xqds/t102xqds.c | 408 ++++++++++ board/freescale/t102xqds/t102xqds.h | 14 + board/freescale/t102xqds/t102xqds_qixis.h | 64 ++ board/freescale/t102xqds/tlb.c | 117 +++ board/freescale/t102xrdb/Kconfig | 12 + board/freescale/t102xrdb/MAINTAINERS | 10 + board/freescale/t102xrdb/Makefile | 17 + board/freescale/t102xrdb/README | 258 +++++++ board/freescale/t102xrdb/cpld.c | 103 +++ board/freescale/t102xrdb/cpld.h | 45 ++ board/freescale/t102xrdb/ddr.c | 154 ++++ board/freescale/t102xrdb/eth_t102xrdb.c | 100 +++ board/freescale/t102xrdb/law.c | 32 + board/freescale/t102xrdb/pci.c | 23 + board/freescale/t102xrdb/spl.c | 107 +++ board/freescale/t102xrdb/t1024_pbi.cfg | 26 + board/freescale/t102xrdb/t1024_rcw.cfg | 8 + board/freescale/t102xrdb/t102xrdb.c | 144 ++++ board/freescale/t102xrdb/t102xrdb.h | 13 + board/freescale/t102xrdb/tlb.c | 117 +++ board/freescale/t104xrdb/spl.c | 26 +- board/freescale/t208xqds/ddr.h | 15 +- board/freescale/t208xqds/t2080_rcw.cfg | 16 +- board/freescale/t208xqds/t208xqds.c | 13 + board/freescale/t208xrdb/t2080_rcw.cfg | 20 +- board/keymile/km82xx/km82xx.c | 2 - board/muas3001/muas3001.c | 4 - common/Makefile | 20 +- configs/T1024QDS_D4_SECURE_BOOT_defconfig | 4 + configs/T1024QDS_NAND_defconfig | 5 + configs/T1024QDS_SDCARD_defconfig | 5 + configs/T1024QDS_SECURE_BOOT_defconfig | 4 + configs/T1024QDS_SPIFLASH_defconfig | 5 + configs/T1024RDB_NAND_defconfig | 5 + configs/T1024RDB_SDCARD_defconfig | 5 + configs/T1024RDB_SECURE_BOOT_defconfig | 4 + configs/T1024RDB_SPIFLASH_defconfig | 5 + configs/T1024RDB_defconfig | 4 + doc/README.fsl-dpaa | 10 + drivers/ddr/fsl/ctrl_regs.c | 31 +- drivers/ddr/fsl/ddr4_dimm_params.c | 22 + drivers/net/fm/Makefile | 2 + drivers/net/fm/b4860.c | 64 +- drivers/net/fm/eth.c | 7 +- drivers/net/fm/init.c | 2 + drivers/net/fm/t1024.c | 88 +++ drivers/net/fm/t1040.c | 4 - drivers/net/phy/Makefile | 1 + drivers/net/phy/cortina.c | 333 +++++++++ drivers/net/phy/phy.c | 3 + drivers/net/phy/vitesse.c | 13 +- include/configs/B4860QDS.h | 6 +- include/configs/C29XPCIE.h | 2 + include/configs/P1010RDB.h | 2 + include/configs/P1022DS.h | 3 + include/configs/P1023RDB.h | 3 + include/configs/P5040DS.h | 1 + include/configs/T102xQDS.h | 939 ++++++++++++++++++++++++ include/configs/T102xRDB.h | 896 ++++++++++++++++++++++ include/configs/T1040QDS.h | 7 +- include/configs/T104xRDB.h | 12 +- include/configs/T208xQDS.h | 19 +- include/configs/T4240RDB.h | 1 + include/configs/km82xx.h | 3 - include/configs/muas3001.h | 4 - include/configs/p1_twr.h | 2 + include/cortina.h | 75 ++ include/fm_eth.h | 15 + include/phy.h | 2 + 115 files changed, 6835 insertions(+), 144 deletions(-) create mode 100644 arch/powerpc/cpu/mpc85xx/t1024_ids.c create mode 100644 arch/powerpc/cpu/mpc85xx/t1024_serdes.c create mode 100644 board/freescale/common/vid.c create mode 100644 board/freescale/common/vid.h create mode 100644 board/freescale/t102xqds/Kconfig create mode 100644 board/freescale/t102xqds/MAINTAINERS create mode 100644 board/freescale/t102xqds/Makefile create mode 100644 board/freescale/t102xqds/README create mode 100644 board/freescale/t102xqds/ddr.c create mode 100644 board/freescale/t102xqds/eth_t102xqds.c create mode 100644 board/freescale/t102xqds/law.c create mode 100644 board/freescale/t102xqds/pci.c create mode 100644 board/freescale/t102xqds/spl.c create mode 100644 board/freescale/t102xqds/t1024_pbi.cfg create mode 100644 board/freescale/t102xqds/t1024_rcw.cfg create mode 100644 board/freescale/t102xqds/t102xqds.c create mode 100644 board/freescale/t102xqds/t102xqds.h create mode 100644 board/freescale/t102xqds/t102xqds_qixis.h create mode 100644 board/freescale/t102xqds/tlb.c create mode 100644 board/freescale/t102xrdb/Kconfig create mode 100644 board/freescale/t102xrdb/MAINTAINERS create mode 100644 board/freescale/t102xrdb/Makefile create mode 100644 board/freescale/t102xrdb/README create mode 100644 board/freescale/t102xrdb/cpld.c create mode 100644 board/freescale/t102xrdb/cpld.h create mode 100644 board/freescale/t102xrdb/ddr.c create mode 100644 board/freescale/t102xrdb/eth_t102xrdb.c create mode 100644 board/freescale/t102xrdb/law.c create mode 100644 board/freescale/t102xrdb/pci.c create mode 100644 board/freescale/t102xrdb/spl.c create mode 100644 board/freescale/t102xrdb/t1024_pbi.cfg create mode 100644 board/freescale/t102xrdb/t1024_rcw.cfg create mode 100644 board/freescale/t102xrdb/t102xrdb.c create mode 100644 board/freescale/t102xrdb/t102xrdb.h create mode 100644 board/freescale/t102xrdb/tlb.c create mode 100644 configs/T1024QDS_D4_SECURE_BOOT_defconfig create mode 100644 configs/T1024QDS_NAND_defconfig create mode 100644 configs/T1024QDS_SDCARD_defconfig create mode 100644 configs/T1024QDS_SECURE_BOOT_defconfig create mode 100644 configs/T1024QDS_SPIFLASH_defconfig create mode 100644 configs/T1024RDB_NAND_defconfig create mode 100644 configs/T1024RDB_SDCARD_defconfig create mode 100644 configs/T1024RDB_SECURE_BOOT_defconfig create mode 100644 configs/T1024RDB_SPIFLASH_defconfig create mode 100644 configs/T1024RDB_defconfig create mode 100644 doc/README.fsl-dpaa create mode 100644 drivers/net/fm/t1024.c create mode 100644 drivers/net/phy/cortina.c create mode 100644 include/configs/T102xQDS.h create mode 100644 include/configs/T102xRDB.h create mode 100644 include/cortina.h Thanks. York

2 1

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 08 Dec '14

08 Dec '14

Hello myself, The following changes since commit f0c6e1c31b94f193047619b6adf67c2d792b659e: Revert "image-fdt: boot_get_fdt() return value when no DTB exists" (2014-12-03 13:19:34 -0500) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to 956a8bae537974673e126f67a227355f27e48ec6: ns16550.c: Fix for ns16550 driver hanging on OMAP4 (2014-12-04 21:28:32 -0500) ---------------------------------------------------------------- Felipe Balbi (10): arm: omap5: don't enable misc_init_r by default arm: omap5: tps659038: rename regulator defines arm: dra7xx: prcm: add missing registers usb: phy: omap_usb_phy: fix build breakage arm: omap-common: emif: allow to map memory without interleaving arm: omap5: make hw_init_data weak arm: omap5: sdram: mark emif_get_ext_phy_ctrl_const_regs __weak arm: omap_common: expose tps659038 and dra7xx_dplls arm: omap: add support for am57xx devices beagle_x15: add board support for Beagle x15 Franklin S Cooper Jr (1): configs: omap5_common : Boot rootfs from sd card by default Gregoire Gentil (1): ns16550.c: Fix for ns16550 driver hanging on OMAP4 Heiko Schocher (3): arm, am335x, siemens: fix factoryset interpretation arm, am335x, siemens: read COMP/ver from factoryset arm, am335x: siemens boards add FIT support Lubomir Popov (2): ARM: OMAP5: DRA7xx: Enable 8-bit eMMC access on the dra7xx_evm ARM: OMAP5: DRA7xx: Fix misleading comments in mux_data.h Paul Kocialkowski (3): mmc: Board-specific MMC power initializations twl4030: device-index-specific MMC power initializations, common ramp-up delay omap_hsmmc: Board-specific TWL4030 MMC power initializations Stefan Roese (2): arm: am33xx: Handle NAND+I2C boot-device the same way as NAND mtd: nand: omap_gpmc: Always use ready/busy pin arch/arm/cpu/armv7/omap-common/boot-common.c | 17 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 9 +- arch/arm/cpu/armv7/omap5/Kconfig | 4 + arch/arm/cpu/armv7/omap5/hw_data.c | 12 +- arch/arm/cpu/armv7/omap5/prcm-regs.c | 3 + arch/arm/cpu/armv7/omap5/sdram.c | 2 +- arch/arm/include/asm/arch-am33xx/spl.h | 1 + arch/arm/include/asm/arch-omap5/clock.h | 12 +- arch/arm/include/asm/arch-omap5/omap.h | 4 +- arch/arm/include/asm/omap_common.h | 3 + board/comelit/dig297/dig297.c | 5 + board/compulab/cm_t35/cm_t35.c | 7 + board/corscience/tricorder/tricorder.c | 7 + board/isee/igep00x0/igep00x0.c | 7 + board/logicpd/omap3som/omap3logic.c | 7 + board/logicpd/zoom1/zoom1.c | 5 + board/matrix_vision/mvblx/mvblx.c | 6 + board/nokia/rx51/rx51.c | 6 + board/overo/overo.c | 7 + board/pandora/pandora.c | 5 + board/siemens/common/board.c | 9 - board/siemens/common/factoryset.c | 52 ++-- board/siemens/common/factoryset.h | 2 + board/siemens/draco/board.c | 9 + board/siemens/pxm2/board.c | 34 +++ board/siemens/rut/board.c | 23 ++ board/technexion/tao3530/tao3530.c | 7 + board/ti/beagle/beagle.c | 7 + board/ti/beagle_x15/Kconfig | 12 + board/ti/beagle_x15/Makefile | 8 + board/ti/beagle_x15/board.c | 395 ++++++++++++++++++++++++++ board/ti/beagle_x15/mux_data.h | 55 ++++ board/ti/dra7xx/evm.c | 12 - board/ti/dra7xx/mux_data.h | 4 +- board/ti/evm/evm.c | 8 + board/ti/sdp3430/sdp.c | 5 + board/timll/devkit8000/devkit8000.c | 7 + configs/beagle_x15_defconfig | 5 + drivers/mmc/mmc.c | 7 + drivers/mmc/omap_hsmmc.c | 12 +- drivers/mtd/nand/omap_gpmc.c | 9 +- drivers/power/palmas.c | 2 +- drivers/power/twl4030.c | 28 +- drivers/serial/ns16550.c | 9 +- drivers/spi/ti_qspi.c | 8 +- drivers/usb/phy/omap_usb_phy.c | 2 - include/configs/beagle_x15.h | 88 ++++++ include/configs/cm_t54.h | 1 - include/configs/dra7xx_evm.h | 1 + include/configs/omap5_uevm.h | 1 + include/configs/pxm2.h | 4 + include/configs/rut.h | 4 + include/configs/ti_omap5_common.h | 5 +- include/linux/usb/xhci-omap.h | 4 + include/mmc.h | 1 + include/twl4030.h | 2 +- 56 files changed, 870 insertions(+), 101 deletions(-) create mode 100644 board/ti/beagle_x15/Kconfig create mode 100644 board/ti/beagle_x15/Makefile create mode 100644 board/ti/beagle_x15/board.c create mode 100644 board/ti/beagle_x15/mux_data.h create mode 100644 configs/beagle_x15_defconfig create mode 100644 include/configs/beagle_x15.h -- Tom

1 1

[U-Boot] [i2c] Pull request
by Heiko Schocher 08 Dec '14

08 Dec '14

Hello Tom, please pull from u-boot-i2c.git The following changes since commit 97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9: Merge branch 'sandbox' of git://git.denx.de/u-boot-x86 (2014-12-04 09:24:05 -0500) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to f4ed36964a7ab4e729d62e96dac15a674dcc2668: i2c: Correct spelling error (2014-12-08 07:27:22 +0100) ---------------------------------------------------------------- Mark Tomlinson (2): i2c: Fix deselection of muxes i2c: Correct spelling error drivers/i2c/i2c_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] Pull request: u-boot-sh/master
by Nobuhiro Iwamatsu 08 Dec '14

08 Dec '14

Dear Tom Rini. Please pull u-boot-sh master branch. The following changes since commit 97cdf64026c7d749dd7a5c0dbaba7a60a7292ac9: Merge branch 'sandbox' of git://git.denx.de/u-boot-x86 (2014-12-04 09:24:05 -0500) are available in the git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 9675f6107725a1002858df2246ebfb0cd3082e76: mmc: sh_mmcif: Add support rmobile (2014-12-05 11:16:22 +0900) ---------------------------------------------------------------- Nobuhiro Iwamatsu (3): mmc: sh_mmcif: Use DIV_ROUND_UP and fls instead of calculation loop mmc: sh_mmcif: Change maximum and minimum value of MMC clock mmc: sh_mmcif: Add support rmobile drivers/mmc/sh_mmcif.c | 19 +++++++++---------- drivers/mmc/sh_mmcif.h | 8 +++++++- 2 files changed, 16 insertions(+), 11 deletions(-) -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 1

[U-Boot] [PATCH] doc/gitmail-rc: Update m68k alias
by Tom Rini 08 Dec '14

08 Dec '14

Signed-off-by: Tom Rini <trini(a)ti.com> --- doc/git-mailrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index 98069e6..6c79a6d 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -75,7 +75,7 @@ alias avr32 uboot, abiessmann alias bfin uboot, vapier, sonic alias blackfin bfin -alias m68k uboot, jasonjin +alias m68k uboot, alisonwang, angelo_ts alias coldfire m68k alias microblaze uboot, monstr -- 1.7.9.5

1 1

[U-Boot] Link error for arm targets
by York Sun 08 Dec '14

08 Dec '14

Guys, I need some help to understand the link error introduced by commit d455d8789d5b35a39a0a179b3af4b423db13bfdd fs: API changes enabling extra parameter to return size of type loff_t I don't see anything wrong with this commit, but some of my targets don't link after this commit. The error I got for compiling ls1021aqds_nor is: /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-ld.bfd: error: /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/../lib/gcc/arm-linux-gnueabihf/4.9.2/libgcc.a(bpabi.o) uses VFP register arguments, u-boot does not /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-ld.bfd: failed to merge target specific data of file /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/../lib/gcc/arm-linux-gnueabihf/4.9.2/libgcc.a(bpabi.o) /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-ld.bfd: error: /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/../lib/gcc/arm-linux-gnueabihf/4.9.2/libgcc.a(_divdi3.o) uses VFP register arguments, u-boot does not /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-ld.bfd: failed to merge target specific data of file /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/../lib/gcc/arm-linux-gnueabihf/4.9.2/libgcc.a(_divdi3.o) /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-ld.bfd: error: /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/../lib/gcc/arm-linux-gnueabihf/4.9.2/libgcc.a(_udivdi3.o) uses VFP register arguments, u-boot does not /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/arm-linux-gnueabihf-ld.bfd: failed to merge target specific data of file /opt/linaro/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/bin/../lib/gcc/arm-linux-gnueabihf/4.9.2/libgcc.a(_udivdi3.o) make[2]: *** [u-boot] Error 1 make[1]: *** [__build_one_by_one] Error 2 make: *** [sub-make] Error 2 I don't know much about this error. Can someone help? I should have caught this error earlier but a bad escape flaw in my Jenkins script skipped all the ARM targets I normally test. I hope I didn't let in any patch with compiling errors (finger crossed). York

2 2

[U-Boot] [PATCH v4] mpc85xx: inhibit bman portals by default
by Jeffrey Ladouceur 08 Dec '14

08 Dec '14

Not all portals might be managed and therefore visible. Set the isdr register so that the corresponding isr register won't be set. This is needed for deepsleep. Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur(a)freescale.com> --- The following dependent patches should be applied first: http://patchwork.ozlabs.org/patch/403532 http://patchwork.ozlabs.org/patch/403533 http://patchwork.ozlabs.org/patch/403540 http://patchwork.ozlabs.org/patch/403534 http://patchwork.ozlabs.org/patch/403535 http://patchwork.ozlabs.org/patch/403538 http://patchwork.ozlabs.org/patch/403536 http://patchwork.ozlabs.org/patch/403539 Changes in v4: - The assertion that reading from portal reserved memory would return zero is incorrect. Therefore modify code to depend on specified number of portals in board config file Changes in v3: - Update subject title to be consistent Changes in v2: - Removed P1023RDS as it is no longer supported. arch/powerpc/cpu/mpc85xx/portals.c | 36 +++++++++++++++++++++++++++++++++++ include/configs/B4860QDS.h | 8 ++++++++ include/configs/P1023RDB.h | 8 ++++++++ include/configs/P2041RDB.h | 8 ++++++++ include/configs/T102xQDS.h | 8 ++++++++ include/configs/T102xRDB.h | 8 ++++++++ include/configs/T1040QDS.h | 8 ++++++++ include/configs/T104xRDB.h | 8 ++++++++ include/configs/T208xQDS.h | 8 ++++++++ include/configs/T208xRDB.h | 8 ++++++++ include/configs/T4240EMU.h | 8 ++++++++ include/configs/T4240QDS.h | 8 ++++++++ include/configs/T4240RDB.h | 8 ++++++++ include/configs/corenet_ds.h | 8 ++++++++ include/configs/km/kmp204x-common.h | 8 ++++++++ 15 files changed, 148 insertions(+) diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c index 98815f8..2972865 100644 --- a/arch/powerpc/cpu/mpc85xx/portals.c +++ b/arch/powerpc/cpu/mpc85xx/portals.c @@ -14,6 +14,39 @@ #include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> +#define MAX_PORTALS (CONFIG_SYS_BMAN_CINH_SIZE / CONFIG_SYS_BMAN_SP_CINH_SIZE) +void inhibit_bman_portals(void) +{ + void __iomem *addr = (void *)CONFIG_SYS_BMAN_CINH_BASE + + CONFIG_SYS_BMAN_SWP_ISDR_REG; + uint32_t val; + int i, max_portals = CONFIG_SYS_BMAN_NUM_PORTALS; + + /* MAX_PORTALS is the maximum based on memory size. This includes the + * reserved memory in the SoC. CONFIG_SYS_BMAN_NUM_PORTALS is the + * number of physical portals in the SoC */ + if (CONFIG_SYS_BMAN_NUM_PORTALS > MAX_PORTALS) { + printf("ERROR: BMAN portal config error\n"); + max_portals = MAX_PORTALS; + } + + for (i = 0; i < max_portals; i++) { + out_be32(addr, -1); + val = in_be32(addr); + if (!val) { + printf("ERROR: Stopped after %d BMan portals\n", i); + goto done; + } + addr += CONFIG_SYS_BMAN_SP_CINH_SIZE; + } +#ifdef DEBUG + printf("Cleared %d Bman portals\n", i); +#endif +done: + + return; +} + void setup_portals(void) { ccsr_qman_t *qman = (void *)CONFIG_SYS_FSL_QMAN_ADDR; @@ -38,6 +71,9 @@ void setup_portals(void) out_be32(&qman->qcsp_bare, (u32)(CONFIG_SYS_QMAN_MEM_PHYS >> 32)); #endif out_be32(&qman->qcsp_bar, (u32)CONFIG_SYS_QMAN_MEM_PHYS); + + /* Change default state of BMan ISDR portals to all 1s */ + inhibit_bman_portals(); } /* Update portal containter to match LAW setup of portal in phy map */ diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index dc1a9bc..31f1d3f 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -641,6 +641,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE #endif #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 25 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 6b29add..053113f 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -347,6 +347,14 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xff200000 #define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE #define CONFIG_SYS_BMAN_MEM_SIZE 0x00200000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 /* For FM */ #define CONFIG_SYS_DPAA_FMAN diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 2e11aaa..686fc73 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -489,6 +489,14 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE #endif #define CONFIG_SYS_BMAN_MEM_SIZE 0x00200000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 10 #define CONFIG_SYS_QMAN_MEM_BASE 0xf4200000 #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 5f8f749..35834fa 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -724,6 +724,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE #endif #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 25 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 2960bd1..e54e100 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -685,6 +685,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE #endif #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 25 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 2178f9d..d09c58d 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -607,6 +607,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 25 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 216f34f..5b663a0 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -630,6 +630,14 @@ #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 25 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 2f381e7..8907d51 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -617,6 +617,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 18 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 47b3bd5..8828bc0 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -567,6 +567,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 18 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/T4240EMU.h b/include/configs/T4240EMU.h index 53c69b0..4df8f10 100644 --- a/include/configs/T4240EMU.h +++ b/include/configs/T4240EMU.h @@ -85,6 +85,14 @@ #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 50 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 1e0f5ec..d26852c 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -417,6 +417,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 50 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 48b8dc7..cf6a2e5 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -577,6 +577,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x02000000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 50 #define CONFIG_SYS_QMAN_MEM_BASE 0xf6000000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff6000000ull diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 72b7efa..d25e65a 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -495,6 +495,14 @@ #define CONFIG_SYS_BMAN_MEM_PHYS CONFIG_SYS_BMAN_MEM_BASE #endif #define CONFIG_SYS_BMAN_MEM_SIZE 0x00200000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 10 #define CONFIG_SYS_QMAN_MEM_BASE 0xf4200000 #ifdef CONFIG_PHYS_64BIT diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 864e5f1..9eb6779 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -339,6 +339,14 @@ int get_scl(void); #define CONFIG_SYS_BMAN_MEM_BASE 0xf4000000 #define CONFIG_SYS_BMAN_MEM_PHYS 0xff4000000ull #define CONFIG_SYS_BMAN_MEM_SIZE 0x00200000 +#define CONFIG_SYS_BMAN_SP_CENA_SIZE 0x4000 +#define CONFIG_SYS_BMAN_SP_CINH_SIZE 0x1000 +#define CONFIG_SYS_BMAN_CENA_BASE CONFIG_SYS_BMAN_MEM_BASE +#define CONFIG_SYS_BMAN_CENA_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_CINH_BASE (CONFIG_SYS_BMAN_MEM_BASE + \ + CONFIG_SYS_BMAN_CENA_SIZE) +#define CONFIG_SYS_BMAN_CINH_SIZE (CONFIG_SYS_BMAN_MEM_SIZE >> 1) +#define CONFIG_SYS_BMAN_SWP_ISDR_REG 0xE08 #define CONFIG_SYS_QMAN_NUM_PORTALS 10 #define CONFIG_SYS_QMAN_MEM_BASE 0xf4200000 #define CONFIG_SYS_QMAN_MEM_PHYS 0xff4200000ull -- 1.7.9.5

1 0

[U-Boot] [PATCH v2 6/9] ARM: UniPhier: add more device nodes to device tree
by Masahiro Yamada 08 Dec '14

08 Dec '14

Add I2C controller and NAND controller devices. Fix indentation too. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- Changes v2: - I2C Ch4 does not exist on PH1-Pro4 - Add "clock-frequency" property arch/arm/dts/uniphier-ph1-ld4-ref.dts | 27 +++++++++++--- arch/arm/dts/uniphier-ph1-ld4.dtsi | 44 ++++++++++++++++++++++- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 29 ++++++++++++--- arch/arm/dts/uniphier-ph1-pro4.dtsi | 64 +++++++++++++++++++++++++++++++++- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 27 +++++++++++--- arch/arm/dts/uniphier-ph1-sld8.dtsi | 44 ++++++++++++++++++++++- 6 files changed, 220 insertions(+), 15 deletions(-) diff --git a/arch/arm/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/dts/uniphier-ph1-ld4-ref.dts index f01189c..08bbd03 100644 --- a/arch/arm/dts/uniphier-ph1-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ph1-ld4-ref.dts @@ -23,20 +23,39 @@ bootargs = "console=ttyPS0,115200 earlyprintk"; stdout-path = &uart0; }; + + aliases { + uart0 = &uart0; + uart1 = &uart1; + uart2 = &uart2; + uart3 = &uart3; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + }; }; &uart0 { - status = "okay"; + status = "okay"; }; &uart1 { - status = "okay"; + status = "okay"; +}; + +&i2c0 { + status = "okay"; + eeprom { + compatible = "i2c-eeprom"; + reg = <0x50>; + }; }; &usb0 { - status = "okay"; + status = "okay"; }; &usb1 { - status = "okay"; + status = "okay"; }; diff --git a/arch/arm/dts/uniphier-ph1-ld4.dtsi b/arch/arm/dts/uniphier-ph1-ld4.dtsi index 80074c5..2a3dd73 100644 --- a/arch/arm/dts/uniphier-ph1-ld4.dtsi +++ b/arch/arm/dts/uniphier-ph1-ld4.dtsi @@ -13,8 +13,8 @@ compatible = "panasonic,ph1-ld4"; cpus { - #size-cells = <0>; #address-cells = <1>; + #size-cells = <0>; cpu@0 { device_type = "cpu"; @@ -57,6 +57,42 @@ clock-frequency = <36864000>; }; + i2c0: i2c@58400000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58400000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c1: i2c@58480000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58480000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c2: i2c@58500000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58500000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c3: i2c@58580000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58580000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + usb0: usb@5a800100 { compatible = "panasonic,uniphier-ehci", "usb-ehci"; status = "disabled"; @@ -74,5 +110,11 @@ status = "disabled"; reg = <0x5a820100 0x100>; }; + + nand: nand@68000000 { + compatible = "denali,denali-nand-dt"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + reg-names = "nand_data", "denali_reg"; + }; }; }; diff --git a/arch/arm/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/dts/uniphier-ph1-pro4-ref.dts index 52fa81f..23add7c 100644 --- a/arch/arm/dts/uniphier-ph1-pro4-ref.dts +++ b/arch/arm/dts/uniphier-ph1-pro4-ref.dts @@ -23,20 +23,41 @@ bootargs = "console=ttyPS0,115200 earlyprintk"; stdout-path = &uart0; }; + + aliases { + uart0 = &uart0; + uart1 = &uart1; + uart2 = &uart2; + uart3 = &uart3; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c5 = &i2c5; + i2c6 = &i2c6; + }; }; &uart0 { - status = "okay"; + status = "okay"; }; &uart1 { - status = "okay"; + status = "okay"; +}; + +&i2c0 { + status = "okay"; + eeprom { + compatible = "i2c-eeprom"; + reg = <0x50>; + }; }; &usb0 { - status = "okay"; + status = "okay"; }; &usb1 { - status = "okay"; + status = "okay"; }; diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi index dd84269..49e375e 100644 --- a/arch/arm/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi @@ -13,8 +13,8 @@ compatible = "panasonic,ph1-pro4"; cpus { - #size-cells = <0>; #address-cells = <1>; + #size-cells = <0>; cpu@0 { device_type = "cpu"; @@ -63,6 +63,62 @@ clock-frequency = <73728000>; }; + i2c0: i2c@58780000 { + compatible = "panasonic,uniphier-fi2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58780000 0x80>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c1: i2c@58781000 { + compatible = "panasonic,uniphier-fi2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58781000 0x80>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c2: i2c@58782000 { + compatible = "panasonic,uniphier-fi2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58782000 0x80>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c3: i2c@58783000 { + compatible = "panasonic,uniphier-fi2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58783000 0x80>; + clock-frequency = <100000>; + status = "disabled"; + }; + + /* i2c4 does not exist */ + + i2c5: i2c@58785000 { + compatible = "panasonic,uniphier-fi2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58785000 0x80>; + clock-frequency = <400000>; + status = "ok"; + }; + + i2c6: i2c@58786000 { + compatible = "panasonic,uniphier-fi2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58786000 0x80>; + clock-frequency = <400000>; + status = "ok"; + }; + usb0: usb@5a800100 { compatible = "panasonic,uniphier-ehci", "usb-ehci"; status = "disabled"; @@ -74,5 +130,11 @@ status = "disabled"; reg = <0x5a810100 0x100>; }; + + nand: nand@68000000 { + compatible = "denali,denali-nand-dt"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + reg-names = "nand_data", "denali_reg"; + }; }; }; diff --git a/arch/arm/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/dts/uniphier-ph1-sld8-ref.dts index ac73aad..a8ce049 100644 --- a/arch/arm/dts/uniphier-ph1-sld8-ref.dts +++ b/arch/arm/dts/uniphier-ph1-sld8-ref.dts @@ -23,20 +23,39 @@ bootargs = "console=ttyPS0,115200 earlyprintk"; stdout-path = &uart0; }; + + aliases { + uart0 = &uart0; + uart1 = &uart1; + uart2 = &uart2; + uart3 = &uart3; + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + }; }; &uart0 { - status = "okay"; + status = "okay"; }; &uart1 { - status = "okay"; + status = "okay"; +}; + +&i2c0 { + status = "okay"; + eeprom { + compatible = "i2c-eeprom"; + reg = <0x50>; + }; }; &usb0 { - status = "okay"; + status = "okay"; }; &usb1 { - status = "okay"; + status = "okay"; }; diff --git a/arch/arm/dts/uniphier-ph1-sld8.dtsi b/arch/arm/dts/uniphier-ph1-sld8.dtsi index 43a39f5..0ea76e5 100644 --- a/arch/arm/dts/uniphier-ph1-sld8.dtsi +++ b/arch/arm/dts/uniphier-ph1-sld8.dtsi @@ -13,8 +13,8 @@ compatible = "panasonic,ph1-sld8"; cpus { - #size-cells = <0>; #address-cells = <1>; + #size-cells = <0>; cpu@0 { device_type = "cpu"; @@ -57,6 +57,42 @@ clock-frequency = <80000000>; }; + i2c0: i2c@58400000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58400000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c1: i2c@58480000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58480000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c2: i2c@58500000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58500000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + + i2c3: i2c@58580000 { + compatible = "panasonic,uniphier-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x58580000 0x40>; + clock-frequency = <100000>; + status = "disabled"; + }; + usb0: usb@5a800100 { compatible = "panasonic,uniphier-ehci", "usb-ehci"; status = "disabled"; @@ -74,5 +110,11 @@ status = "disabled"; reg = <0x5a820100 0x100>; }; + + nand: nand@68000000 { + compatible = "denali,denali-nand-dt"; + reg = <0x68000000 0x20>, <0x68100000 0x1000>; + reg-names = "nand_data", "denali_reg"; + }; }; }; -- 1.9.1

2 3