| Message ID | 566F69EB.9000700@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Dec 15, 2015 at 09:16:27AM +0800, York Sun wrote: > Tom, > > The following changes since commit 5076c64a08d2083af5a7761b12a30116ef0da967: > > Merge branch 'master' of git://git.denx.de/u-boot-spi (2015-12-11 15:07:44 -0500) > > are available in the git repository at: > > > git://git.denx.de/u-boot-fsl-qoriq.git master > > for you to fetch changes up to 989c5f0a8f8694ac92eb0d6cff8745ae8659364f: > > armv8: Add sata support on Layerscape ARMv8 board (2015-12-15 08:57:35 +0800) > Applied to u-boot/master, thanks!
Tom, Please hold on pushing to repository. I did my test on powerpc and arm SoCs and all passed. But my local build just failed on uintptr_t. I am tracing it now. York On 12/16/2015 07:29 AM, Tom Rini wrote: > On Tue, Dec 15, 2015 at 09:16:27AM +0800, York Sun wrote: > >> Tom, >> >> The following changes since commit 5076c64a08d2083af5a7761b12a30116ef0da967: >> >> Merge branch 'master' of git://git.denx.de/u-boot-spi (2015-12-11 15:07:44 -0500) >> >> are available in the git repository at: >> >> >> git://git.denx.de/u-boot-fsl-qoriq.git master >> >> for you to fetch changes up to 989c5f0a8f8694ac92eb0d6cff8745ae8659364f: >> >> armv8: Add sata support on Layerscape ARMv8 board (2015-12-15 08:57:35 +0800) >> > > Applied to u-boot/master, thanks! >
Tom, This issue is caused by 32-bit host has uintptr_t defined in /usr/include/stdint.h as "unsigned int". I am working on a solution. In the meantime, how do we deal with this PR? York On 12/16/2015 09:40 AM, York Sun wrote: > Tom, > > Please hold on pushing to repository. I did my test on powerpc and arm SoCs and > all passed. But my local build just failed on uintptr_t. I am tracing it now. > > York > > > On 12/16/2015 07:29 AM, Tom Rini wrote: >> On Tue, Dec 15, 2015 at 09:16:27AM +0800, York Sun wrote: >> >>> Tom, >>> >>> The following changes since commit 5076c64a08d2083af5a7761b12a30116ef0da967: >>> >>> Merge branch 'master' of git://git.denx.de/u-boot-spi (2015-12-11 15:07:44 -0500) >>> >>> are available in the git repository at: >>> >>> >>> git://git.denx.de/u-boot-fsl-qoriq.git master >>> >>> for you to fetch changes up to 989c5f0a8f8694ac92eb0d6cff8745ae8659364f: >>> >>> armv8: Add sata support on Layerscape ARMv8 board (2015-12-15 08:57:35 +0800) >>> >> >> Applied to u-boot/master, thanks! >>
On Wed, Dec 16, 2015 at 09:48:59AM +0800, York Sun wrote: > Tom, > > This issue is caused by 32-bit host has uintptr_t defined in > /usr/include/stdint.h as "unsigned int". > > I am working on a solution. In the meantime, how do we deal with this PR? And then what fails... sandbox?
On 12/16/2015 09:59 AM, Tom Rini wrote: > On Wed, Dec 16, 2015 at 09:48:59AM +0800, York Sun wrote: > >> Tom, >> >> This issue is caused by 32-bit host has uintptr_t defined in >> /usr/include/stdint.h as "unsigned int". >> >> I am working on a solution. In the meantime, how do we deal with this PR? > > And then what fails... sandbox? > Not only. When I compile powerpc targets on a 32-bit host, all fail, due to stdint.h has a different typedef. York
On 12/16/2015 10:01 AM, York Sun wrote: > > > On 12/16/2015 09:59 AM, Tom Rini wrote: >> On Wed, Dec 16, 2015 at 09:48:59AM +0800, York Sun wrote: >> >>> Tom, >>> >>> This issue is caused by 32-bit host has uintptr_t defined in >>> /usr/include/stdint.h as "unsigned int". >>> >>> I am working on a solution. In the meantime, how do we deal with this PR? >> >> And then what fails... sandbox? >> > > Not only. When I compile powerpc targets on a 32-bit host, all fail, due to > stdint.h has a different typedef. > Tom, I think the original proposal of moving typedef of uintptr_t from compiler.h to types.h may be flawed. U-boot builds host tools, which may have different size than the target. Would it be appropriate to abandon this change, and to include compiler.h whenever uintptr_t is needed? York
Tom, The following changes since commit 5076c64a08d2083af5a7761b12a30116ef0da967: Merge branch 'master' of git://git.denx.de/u-boot-spi (2015-12-11 15:07:44 -0500) are available in the git repository at: git://git.denx.de/u-boot-fsl-qoriq.git master for you to fetch changes up to 989c5f0a8f8694ac92eb0d6cff8745ae8659364f: armv8: Add sata support on Layerscape ARMv8 board (2015-12-15 08:57:35 +0800) ---------------------------------------------------------------- Alexander Stein (1): fsl_qspi: Pet the watchdog while reading/writing Aneesh Bansal (5): armv8: define usec2ticks function armv8: Make SEC read/write as snoopable for LS1043 include/linux: move typdef for uintptr_t armv8/ls1043ardb: add SECURE BOOT target for NOR drivers/crypto/fsl: fix endianness issue in RNG Pratiyush Mohan Srivastava (1): Enable console log from earlyconsole in Linux bootargs Shaohui Xie (2): freescale: fman: make sure phy-handle property is big endian armv8/ls1043ardb: Add support for >2GB memory Shengzhou Liu (3): arm: ls102x: add get_svr and IS_SVR_REV helper fsl/errata: move fsl_errata.h to common directory fsl/ddr: updated ddr errata-A008378 for arm and power SoCs Tang Yuantian (1): armv8: Add sata support on Layerscape ARMv8 board Tom Rini (2): fsl_*_serdes.c: Modify memset call in serdes_init qbman_portal.c: Update BUG_ON() call in qbman_swp_mc_submit Yao Yuan (5): arm: ls1021a: merge SoC specific code in a separate file arm: ls102xa: enable all the snoop signal for masters. armv7: ls102xa: cci-400: Enable snoop and DVM message requests. armv7/fsl-ls102xa: Workaround for DDR erratum A008514 move erratum a008336 and a008514 to soc specific file York Sun (11): driver/ddr/fsl: Update DDR4 RTT values driver/ddr/fsl: Update DDR4 MR6 for Vref range driver/ddr/fsl: Update MR5 RTT park driver/ddr/fsl: Update workaround for A008511 for vref range driver/ddr/fsl: Update timing config for heavy load armv8/ls2080aqds: Update DDR settings for four chip-select case armv8/ls2080ardb: Update DDR settings for four chip-select case Reserve secure memory armv8: fsl-layerscape: Make DDR non secure in MMU tables common: Rewrite hiding the end of memory armv8: fsl-layerscale: Rewrite reserving memory for MC and debug server README | 14 +- arch/arm/cpu/armv7/ls102xa/Makefile | 1 + arch/arm/cpu/armv7/ls102xa/cpu.c | 8 + arch/arm/cpu/armv7/ls102xa/soc.c | 90 ++++++++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 142 ++++++++++-- .../cpu/armv8/fsl-layerscape/fsl_lsch2_serdes.c | 2 +- .../cpu/armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 85 +++++++ arch/arm/cpu/armv8/generic_timer.c | 11 + arch/arm/include/asm/arch-fsl-layerscape/config.h | 14 +- arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 14 +- .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 2 +- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 4 + arch/arm/include/asm/arch-fsl-layerscape/soc.h | 31 +++ arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 13 +- arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h | 12 + arch/arm/include/asm/fsl_secure_boot.h | 6 +- arch/powerpc/cpu/mpc85xx/cmd_errata.c | 2 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 4 +- arch/powerpc/include/asm/config_mpc85xx.h | 2 + board/freescale/common/fman.c | 2 + board/freescale/common/fsl_validate.c | 34 ++- board/freescale/ls1021aqds/ls1021aqds.c | 49 +--- board/freescale/ls1021atwr/ls1021atwr.c | 42 +--- board/freescale/ls1043aqds/ddr.c | 9 + board/freescale/ls1043ardb/MAINTAINERS | 5 + board/freescale/ls1043ardb/ddr.c | 24 +- board/freescale/ls1043ardb/ls1043ardb.c | 28 ++- board/freescale/ls2080a/ddr.c | 15 ++ board/freescale/ls2080a/ls2080a.c | 17 -- board/freescale/ls2080aqds/ddr.c | 31 ++- board/freescale/ls2080aqds/ls2080aqds.c | 17 -- board/freescale/ls2080ardb/ddr.c | 31 ++- board/freescale/ls2080ardb/ls2080ardb.c | 17 -- common/board_f.c | 32 ++- common/cmd_bdinfo.c | 6 + common/cmd_blob.c | 6 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 9 + drivers/crypto/fsl/jr.c | 8 +- drivers/ddr/fsl/ctrl_regs.c | 48 +++- drivers/ddr/fsl/fsl_ddr_gen4.c | 65 ++---- drivers/ddr/fsl/options.c | 237 +++++++++++++++++++- drivers/net/fsl-mc/dpio/qbman_portal.c | 2 +- drivers/spi/fsl_qspi.c | 5 + include/asm-generic/global_data.h | 14 ++ include/compiler.h | 3 - include/configs/ls1043a_common.h | 1 + include/configs/ls1043aqds.h | 17 ++ include/configs/ls1043ardb.h | 12 +- include/configs/ls2080a_common.h | 11 +- include/configs/ls2080aqds.h | 18 ++ include/configs/ls2080ardb.h | 20 +- include/fsl_ddr_sdram.h | 9 + {arch/powerpc/include/asm => include}/fsl_errata.h | 47 +++- include/fsl_validate.h | 9 +- include/linux/types.h | 1 + 57 files changed, 1079 insertions(+), 283 deletions(-) create mode 100644 arch/arm/cpu/armv7/ls102xa/soc.c create mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_soc.h create mode 100644 configs/ls1043ardb_SECURE_BOOT_defconfig rename {arch/powerpc/include/asm => include}/fsl_errata.h (57%) Thanks. York