From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Tue, 29 Jul 2014 15:08:16 +0200 Subject: [U-Boot] Pull request: u-boot-arm/master Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Tom, The following changes since commit 772e173802627a1917a3f5878ad4b9b920089a33: Merge branch 'master' of git://git.denx.de/u-boot-sh (2014-07-25 15:05:09 -0400) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to 9d195a546179bc732aba9eacccf0a9a3db591288: ARM: HYP/non-sec: remove MIDR check to validate CBAR (2014-07-28 17:19:55 +0200) ---------------------------------------------------------------- Albert ARIBAUD (4): Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master' Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master' Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master' Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' Andreas Bie?mann (1): tricorder: convert to generic board Chen-Yu Tsai (1): sunxi: Add support for using MII phy-s with the GMAC nic Hans de Goede (12): sunxi: mksunxiboot: Fix loading of files with a size which is not a multiple of 4 sunxi: Fix u-boot-spl.lds to refer to .vectors sunxi: Remove mmc DMA support sunxi: Implement reset_cpu sunxi: Add sun4i support sunxi: Add sun5i support sunxi: Add emac glue, enable emac on the cubieboard sunxi: Add Ian Campbell and Hans de Goede as cubietruck board-maintainers mvtwsi: convert to CONFIG_SYS_I2C framework sunxi: Add i2c support sunxi: Add axp152 pmic support sunxi: Fix reset hang on sun5i Hao Zhang (10): keystone2: ddr: add DDR3 PHY configs updated for PG 2.0 keystone2: move cpu_to_bus() to keystone.c keystone2: add possibility to turn off all dsps ARM: keystone2: move K2HK board files to common KS2 board directory configs: k2hk_evm: config: add common EVM configuration header keystone: ddr3: move K2HK DDR3 configuration to a common file ARM: keystone2: add K2E SoC hardware definitions ARM: keystone2: clock: add K2E clock support ARM: keystone2: add MSMC cache coherency support for K2E SOC board: k2e-evm: add board support Henrik Nordstrom (1): sunxi: Add axp209 pmic support Ian Campbell (4): sunxi: Avoid unused variable warning. sunxi: add Cubieboard2 support sunxi: add gpio driver sunxi: use setbits_le32 to enable the DMA clock Jonathan Liu (1): sunxi: use random parts of SID to set ethaddr Khoronzhuk, Ivan (10): mtd: nand: davinci: add opportunity to write keystone U-boot image keystone: add support for NAND gpheader image k2hk_evm: add script to automate NAND flash process ARM: keystone2: psc: use common PSC base keystone: ddr3: add ddr3.h to hold ddr3 API ARM: keystone2: keystone_nav: make it dependent on keystone driver k2hk: use common KS2_ prefix for all hardware definitions ARM: keystone: clock: move K2HK SoC dependent code in separate file keystone2: use CONFIG_SOC_KEYSTONE in common places ARM: keystone2: spl: add K2E SoC support Ma Haijun (1): ARM: convert arch_fixup_memory_node to a generic FDT fixup function Marc Zyngier (10): ARM: HYP/non-sec: move switch to non-sec to the last boot phase ARM: HYP/non-sec: add a barrier after setting SCR.NS==1 ARM: non-sec: reset CNTVOFF to zero ARM: add missing HYP mode constant ARM: HYP/non-sec: add separate section for secure code ARM: HYP/non-sec: allow relocation to secure RAM ARM: HYP/non-sec: add generic ARMv7 PSCI code ARM: HYP/non-sec: add the option for a second-stage monitor ARM: HYP/non-sec/PSCI: emit DT nodes ARM: HYP/non-sec: remove MIDR check to validate CBAR Masahiro Yamada (1): zynq: disable -Wstrict-prototypes option for ps7_init.c Michal Simek (2): ARM: zynq: Enable generic board for Xilinx Zynq ARM: zynq: Show ECC status on the same line as DRAM size Mugunthan V N (3): drivers: net: cpsw: add support for using second port as ethernet ARM: DRA7xx: Add cpsw second port pinmux ARM: dra7_evm: Add Ethernet support for dra72x platform Murali Karicheri (1): keystone2: add env option to do unitrd dt fixup Nobuhiro Iwamatsu (4): net: sh-eth: Add support R8A7794 serial: sh: Add support R8A7794 arm: rmobile: Add support R8A7794 arm: rmobile: Add support Alt board Rajendra Nayak (1): ARM: OMAP: Fix handling of errata i727 Stefan Roese (4): net: Rename and cleanup sunxi (Allwinner) emac driver ARM: omap: Fix GPMC init for OMAP3 platforms ARM: omap: Remove unused arch/arm/cpu/armv7/omap3/mem.c ARM: omap: tao3530: Convert to generic board Tom Rini (3): power/pmic.h: Add prototype for power_init_board. tps65218/am43xx_evm: Add power framework support to TPS65218 am335x_evm / gumstix pepper: Correct DDR settings pekon gupta (3): ARM: omap: fix GPMC address-map size for NAND and NOR devices ARM: omap: clean redundant PISMO_xx macros used in OMAP3 ARM: omap: move board specific NAND configs out from ti_armv7_common.h Makefile | 6 + arch/arm/config.mk | 2 +- arch/arm/cpu/armv7/Makefile | 5 + arch/arm/cpu/armv7/keystone/Makefile | 5 +- arch/arm/cpu/armv7/keystone/clock-k2e.c | 101 ++++++++ arch/arm/cpu/armv7/keystone/clock-k2hk.c | 113 +++++++++ arch/arm/cpu/armv7/keystone/clock.c | 154 +++--------- arch/arm/cpu/armv7/keystone/cmd_clock.c | 31 ++- arch/arm/cpu/armv7/keystone/ddr3.c | 25 +- arch/arm/cpu/armv7/keystone/init.c | 16 +- arch/arm/cpu/armv7/keystone/keystone.c | 87 +++++++ arch/arm/cpu/armv7/keystone/msmc.c | 6 +- arch/arm/cpu/armv7/keystone/psc.c | 42 ++-- arch/arm/cpu/armv7/keystone/spl.c | 8 + arch/arm/cpu/armv7/nonsec_virt.S | 168 +++++++------ arch/arm/cpu/armv7/omap-common/hwinit-common.c | 3 +- arch/arm/cpu/armv7/omap-common/mem-common.c | 15 +- arch/arm/cpu/armv7/omap3/mem.c | 139 ----------- arch/arm/cpu/armv7/psci.S | 102 ++++++++ arch/arm/cpu/armv7/rmobile/Makefile | 1 + arch/arm/cpu/armv7/rmobile/cpu_info.c | 1 + arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c | 1513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/sunxi/Makefile | 4 + arch/arm/cpu/armv7/sunxi/board.c | 41 +++- arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 3 +- arch/arm/cpu/armv7/sunxi/cpu_info.c | 15 ++ arch/arm/cpu/armv7/sunxi/dram.c | 102 +++++++- arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds | 5 + arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 6 + arch/arm/cpu/armv7/virt-dt.c | 100 ++++++++ arch/arm/cpu/armv7/virt-v7.c | 76 ++---- arch/arm/cpu/armv7/zynq/ddrc.c | 4 +- arch/arm/cpu/u-boot.lds | 30 +++ arch/arm/include/asm/arch-am33xx/ddr_defs.h | 4 - arch/arm/include/asm/arch-am33xx/mem.h | 7 - arch/arm/include/asm/arch-keystone/clock-k2e.h | 68 ++++++ arch/arm/include/asm/arch-keystone/clock-k2hk.h | 23 +- arch/arm/include/asm/arch-keystone/clock.h | 32 +++ arch/arm/include/asm/arch-keystone/clock_defs.h | 2 +- arch/arm/include/asm/arch-keystone/ddr3.h | 56 +++++ arch/arm/include/asm/arch-keystone/hardware-k2e.h | 44 ++++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 182 +++++--------- arch/arm/include/asm/arch-keystone/hardware.h | 117 +++++---- arch/arm/include/asm/arch-keystone/mon.h | 15 ++ arch/arm/include/asm/arch-keystone/msmc.h | 17 ++ arch/arm/include/asm/arch-kirkwood/config.h | 3 +- arch/arm/include/asm/arch-omap3/cpu.h | 1 - arch/arm/include/asm/arch-omap3/mem.h | 13 - arch/arm/include/asm/arch-rmobile/gpio.h | 3 + arch/arm/include/asm/arch-rmobile/r8a7794-gpio.h | 176 ++++++++++++++ arch/arm/include/asm/arch-rmobile/r8a7794.h | 14 ++ arch/arm/include/asm/arch-rmobile/rcar-base.h | 4 +- arch/arm/include/asm/arch-rmobile/rmobile.h | 2 + arch/arm/include/asm/arch-sunxi/gpio.h | 2 + arch/arm/include/asm/arch-sunxi/i2c.h | 15 ++ arch/arm/include/asm/arch-sunxi/timer.h | 5 + arch/arm/include/asm/armv7.h | 11 +- arch/arm/include/asm/omap_common.h | 8 + arch/arm/include/asm/proc-armv/ptrace.h | 2 + arch/arm/include/asm/psci.h | 35 +++ arch/arm/include/asm/secure.h | 26 ++ arch/arm/lib/bootm-fdt.c | 14 +- arch/arm/lib/bootm.c | 31 ++- arch/arm/lib/interrupts.c | 2 +- arch/arm/lib/sections.c | 2 + board/gumstix/pepper/board.c | 30 +-- board/renesas/alt/Makefile | 9 + board/renesas/alt/alt.c | 173 +++++++++++++ board/renesas/alt/qos.c | 944 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/renesas/alt/qos.h | 12 + board/sunxi/Makefile | 4 + board/sunxi/board.c | 67 +++++ board/sunxi/dram_a13_oli_micro.c | 32 +++ board/sunxi/dram_cubieboard.c | 31 +++ board/sunxi/dram_cubieboard2.c | 31 +++ board/sunxi/dram_r7dongle.c | 31 +++ board/sunxi/gmac.c | 11 + board/ti/am335x/board.c | 30 +-- board/ti/am43xx/board.c | 14 ++ board/ti/dra7xx/evm.c | 7 +- board/ti/dra7xx/mux_data.h | 12 + board/ti/k2hk_evm/Makefile | 9 - board/ti/k2hk_evm/ddr3.c | 268 -------------------- board/ti/ks2_evm/Makefile | 13 + board/ti/{k2hk_evm/README => ks2_evm/README_K2HK} | 28 ++- board/ti/{k2hk_evm => ks2_evm}/board.c | 156 ++++-------- board/ti/ks2_evm/board.h | 19 ++ board/ti/ks2_evm/board_k2e.c | 39 +++ board/ti/ks2_evm/board_k2hk.c | 81 ++++++ board/ti/ks2_evm/ddr3_cfg.c | 170 +++++++++++++ board/ti/ks2_evm/ddr3_cfg.h | 24 ++ board/ti/ks2_evm/ddr3_k2e.c | 55 +++++ board/ti/ks2_evm/ddr3_k2hk.c | 84 +++++++ board/xilinx/zynq/Makefile | 3 + boards.cfg | 13 +- common/image-fdt.c | 9 +- doc/README.nand | 12 + drivers/gpio/Makefile | 1 + drivers/gpio/sunxi_gpio.c | 102 ++++++++ drivers/i2c/Makefile | 2 +- drivers/i2c/mvtwsi.c | 88 ++++--- drivers/mmc/sunxi_mmc.c | 141 +---------- drivers/mtd/nand/davinci_nand.c | 196 +++++++++++++++ drivers/net/Makefile | 2 +- drivers/net/cpsw.c | 8 +- drivers/net/sh_eth.c | 5 +- drivers/net/sh_eth.h | 6 +- drivers/net/{sunxi_wemac.c => sunxi_emac.c} | 140 ++++++----- drivers/power/Makefile | 2 + drivers/power/axp152.c | 97 ++++++++ drivers/power/axp209.c | 167 +++++++++++++ drivers/power/pmic/pmic_tps65218.c | 22 ++ drivers/serial/ns16550.c | 4 +- drivers/serial/serial_sh.h | 3 +- include/axp152.h | 10 + include/axp209.h | 14 ++ include/common.h | 6 +- include/configs/alt.h | 166 +++++++++++++ include/configs/am335x_evm.h | 6 + include/configs/am3517_crane.h | 7 +- include/configs/am3517_evm.h | 7 +- include/configs/am43xx_evm.h | 2 + include/configs/cm_t335.h | 5 + include/configs/cm_t35.h | 3 - include/configs/devkit8000.h | 2 - include/configs/dig297.h | 4 - include/configs/edminiv2.h | 3 +- include/configs/k2e_evm.h | 37 +++ include/configs/k2hk_evm.h | 253 ++----------------- include/configs/ks2_evm.h | 275 +++++++++++++++++++++ include/configs/mcx.h | 4 - include/configs/nokia_rx51.h | 2 - include/configs/omap3_beagle.h | 13 +- include/configs/omap3_evm_common.h | 7 +- include/configs/omap3_igep00x0.h | 10 +- include/configs/omap3_logic.h | 8 +- include/configs/omap3_overo.h | 12 +- include/configs/omap3_pandora.h | 7 +- include/configs/omap3_zoom1.h | 13 +- include/configs/pengwyn.h | 6 + include/configs/sun4i.h | 24 ++ include/configs/sun5i.h | 24 ++ include/configs/sun7i.h | 1 + include/configs/sunxi-common.h | 27 +- include/configs/tam3517-common.h | 4 - include/configs/tao3530.h | 8 +- include/configs/ti_armv7_common.h | 8 - include/configs/tricorder.h | 4 +- include/configs/zynq-common.h | 2 + include/cpsw.h | 1 + include/netdev.h | 2 +- include/power/pmic.h | 1 + include/power/tps65218.h | 1 + tools/mksunxiboot.c | 10 +- 154 files changed, 6535 insertions(+), 1736 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2e.c create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2hk.c create mode 100644 arch/arm/cpu/armv7/keystone/keystone.c delete mode 100644 arch/arm/cpu/armv7/omap3/mem.c create mode 100644 arch/arm/cpu/armv7/psci.S create mode 100644 arch/arm/cpu/armv7/rmobile/pfc-r8a7794.c create mode 100644 arch/arm/cpu/armv7/virt-dt.c create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2e.h create mode 100644 arch/arm/include/asm/arch-keystone/ddr3.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2e.h create mode 100644 arch/arm/include/asm/arch-keystone/mon.h create mode 100644 arch/arm/include/asm/arch-keystone/msmc.h create mode 100644 arch/arm/include/asm/arch-rmobile/r8a7794-gpio.h create mode 100644 arch/arm/include/asm/arch-rmobile/r8a7794.h create mode 100644 arch/arm/include/asm/arch-sunxi/i2c.h create mode 100644 arch/arm/include/asm/psci.h create mode 100644 arch/arm/include/asm/secure.h create mode 100644 board/renesas/alt/Makefile create mode 100644 board/renesas/alt/alt.c create mode 100644 board/renesas/alt/qos.c create mode 100644 board/renesas/alt/qos.h create mode 100644 board/sunxi/dram_a13_oli_micro.c create mode 100644 board/sunxi/dram_cubieboard.c create mode 100644 board/sunxi/dram_cubieboard2.c create mode 100644 board/sunxi/dram_r7dongle.c delete mode 100644 board/ti/k2hk_evm/Makefile delete mode 100644 board/ti/k2hk_evm/ddr3.c create mode 100644 board/ti/ks2_evm/Makefile rename board/ti/{k2hk_evm/README => ks2_evm/README_K2HK} (80%) rename board/ti/{k2hk_evm => ks2_evm}/board.c (65%) create mode 100644 board/ti/ks2_evm/board.h create mode 100644 board/ti/ks2_evm/board_k2e.c create mode 100644 board/ti/ks2_evm/board_k2hk.c create mode 100644 board/ti/ks2_evm/ddr3_cfg.c create mode 100644 board/ti/ks2_evm/ddr3_cfg.h create mode 100644 board/ti/ks2_evm/ddr3_k2e.c create mode 100644 board/ti/ks2_evm/ddr3_k2hk.c create mode 100644 drivers/gpio/sunxi_gpio.c rename drivers/net/{sunxi_wemac.c => sunxi_emac.c} (78%) create mode 100644 drivers/power/axp152.c create mode 100644 drivers/power/axp209.c create mode 100644 include/axp152.h create mode 100644 include/axp209.h create mode 100644 include/configs/alt.h create mode 100644 include/configs/k2e_evm.h create mode 100644 include/configs/ks2_evm.h create mode 100644 include/configs/sun4i.h create mode 100644 include/configs/sun5i.h Amicalement, -- Albert.