[U-Boot] Please pull u-boot-fsl-qoriq master

Tom,
The following changes since commit 0574f786d3c85ab1a9fe9ee8ade65e3ae83e18a4:
Merge branch 'master' of git://git.denx.de/u-boot-video (2017-03-08 07:14:21 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-fsl-qoriq.git
for you to fetch changes up to bbf04d4e8094074855d6d0e4f3f1882110f85b15:
LS1021ATWR: Modify u-boot size for sd secure boot (2017-03-09 09:01:39 -0800)
---------------------------------------------------------------- Hou Zhiqiang (1): armv8/ls104xa: remove the DDR interactive debugging info from SPL
Priyanka Jain (3): armv8: fsl-layerscape: Updates DCFG register map armv8: fsl-lsch3: Update VID support armv8: fsl-layerscape: Add vid support for LS2080AQDS
Tang Yuantian (1): armv8: fsl-lsch2: add workaround for erratum A-010635
Vinitha Pillai (1): LS1021ATWR: Modify u-boot size for sd secure boot
York Sun (11): armv8: Add global variable resv_ram armv8: ls2080a: Move CONFIG_FSL_MC_ENET to Kconfig armv8: ls2080a: Move CONFIG_SYS_MC_RSV_MEM_ALIGN to Kconfig efi: Add a hook to allow adding memory mapping armv8: layerscape: Rewrite memory reservation driver: net: fsl-mc: Update calculation of MC RAM armv8: layerscape: Update MMU mapping with actual DDR size armv8: layerscape: Fix the sequence of changing MMU table armv8: ls2080a: Drop early MMU for SPL build armv8: mmu: Add a function to change mapping attributes armv8: layerscape: Update early MMU for DDR after initialization
arch/arm/cpu/armv8/cache_v8.c | 72 ++++- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 26 ++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 331 +++++++++++++++++++-- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 - arch/arm/cpu/armv8/fsl-layerscape/spl.c | 3 - arch/arm/include/asm/arch-fsl-layerscape/config.h | 4 +- arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 12 +- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 69 +++-- arch/arm/include/asm/arch-fsl-layerscape/mmu.h | 2 +- arch/arm/include/asm/armv8/mmu.h | 5 + arch/arm/include/asm/fsl_secure_boot.h | 4 +- arch/arm/include/asm/global_data.h | 7 + arch/arm/include/asm/system.h | 1 + board/freescale/common/vid.c | 174 ++++++++++- board/freescale/ls1012afrdm/ls1012afrdm.c | 34 +-- board/freescale/ls1012aqds/ls1012aqds.c | 34 +-- board/freescale/ls1012ardb/ls1012ardb.c | 34 +-- board/freescale/ls1043aqds/ddr.c | 29 -- board/freescale/ls1043aqds/ls1043aqds.c | 5 + board/freescale/ls1043ardb/ddr.c | 29 -- board/freescale/ls1043ardb/ls1043ardb.c | 7 - board/freescale/ls1046aqds/ddr.c | 29 -- board/freescale/ls1046aqds/ls1046aqds.c | 5 + board/freescale/ls1046ardb/ddr.c | 29 -- board/freescale/ls1046ardb/ls1046ardb.c | 7 - board/freescale/ls2080a/ddr.c | 55 ---- board/freescale/ls2080a/ls2080a.c | 17 +- board/freescale/ls2080aqds/ddr.c | 55 ---- board/freescale/ls2080aqds/ls2080aqds.c | 26 +- board/freescale/ls2080ardb/ddr.c | 55 ---- board/freescale/ls2080ardb/ls2080ardb.c | 26 +- cmd/bdinfo.c | 4 + common/board_f.c | 32 +- drivers/net/fsl-mc/mc.c | 75 +---- include/configs/ls1021atwr.h | 4 +- include/configs/ls1043aqds.h | 2 + include/configs/ls1043ardb.h | 2 + include/configs/ls1046aqds.h | 2 + include/configs/ls1046ardb.h | 2 + include/configs/ls2080a_common.h | 2 - lib/efi_loader/efi_memory.c | 14 +- scripts/config_whitelist.txt | 2 - 42 files changed, 750 insertions(+), 579 deletions(-)
Thanks.
York

On Thu, Mar 09, 2017 at 09:33:51PM +0000, york sun wrote:
Tom,
The following changes since commit 0574f786d3c85ab1a9fe9ee8ade65e3ae83e18a4:
Merge branch 'master' of git://git.denx.de/u-boot-video (2017-03-08 07:14:21 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-fsl-qoriq.git
for you to fetch changes up to bbf04d4e8094074855d6d0e4f3f1882110f85b15:
LS1021ATWR: Modify u-boot size for sd secure boot (2017-03-09 09:01:39 -0800)
Hou Zhiqiang (1): armv8/ls104xa: remove the DDR interactive debugging info from SPL
Priyanka Jain (3): armv8: fsl-layerscape: Updates DCFG register map armv8: fsl-lsch3: Update VID support armv8: fsl-layerscape: Add vid support for LS2080AQDS
Tang Yuantian (1): armv8: fsl-lsch2: add workaround for erratum A-010635
Vinitha Pillai (1): LS1021ATWR: Modify u-boot size for sd secure boot
York Sun (11): armv8: Add global variable resv_ram armv8: ls2080a: Move CONFIG_FSL_MC_ENET to Kconfig armv8: ls2080a: Move CONFIG_SYS_MC_RSV_MEM_ALIGN to Kconfig efi: Add a hook to allow adding memory mapping armv8: layerscape: Rewrite memory reservation driver: net: fsl-mc: Update calculation of MC RAM armv8: layerscape: Update MMU mapping with actual DDR size armv8: layerscape: Fix the sequence of changing MMU table armv8: ls2080a: Drop early MMU for SPL build armv8: mmu: Add a function to change mapping attributes armv8: layerscape: Update early MMU for DDR after initialization
The release is Monday so I'm not really comfortable pulling in the "rewrite memory reservation" series at this point in the cycle. Thanks!

On Fri, Mar 10, 2017 at 04:46:58PM +0000, york sun wrote:
On 03/10/2017 07:23 AM, Tom Rini wrote:
The release is Monday so I'm not really comfortable pulling in the "rewrite memory reservation" series at this point in the cycle. Thanks!
No problem. You can pull it after the release.
Can you please re-submit it, after release and include the gcc-6 warning fixes? Thanks again!

On 03/10/2017 01:07 PM, Tom Rini wrote:
On Fri, Mar 10, 2017 at 04:46:58PM +0000, york sun wrote:
On 03/10/2017 07:23 AM, Tom Rini wrote:
The release is Monday so I'm not really comfortable pulling in the "rewrite memory reservation" series at this point in the cycle. Thanks!
No problem. You can pull it after the release.
Can you please re-submit it, after release and include the gcc-6 warning fixes? Thanks again!
Yes I can. Does it mean I have to rebase to the release head and force update my branch?
York

On Fri, Mar 10, 2017 at 09:21:03PM +0000, york sun wrote:
On 03/10/2017 01:07 PM, Tom Rini wrote:
On Fri, Mar 10, 2017 at 04:46:58PM +0000, york sun wrote:
On 03/10/2017 07:23 AM, Tom Rini wrote:
The release is Monday so I'm not really comfortable pulling in the "rewrite memory reservation" series at this point in the cycle. Thanks!
No problem. You can pull it after the release.
Can you please re-submit it, after release and include the gcc-6 warning fixes? Thanks again!
Yes I can. Does it mean I have to rebase to the release head and force update my branch?
I don't want merge commits in your PR. You probably won't conflict with the few things I've already pushed however. Your choice.
participants (2)
-
Tom Rini
-
york sun