From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Tue, 7 Oct 2014 12:02:34 -0400 Subject: [U-Boot] Pull request: u-boot-arm/master In-Reply-To: References: Message-ID: <20141007160234.GI25506@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tue, Oct 07, 2014 at 01:16:00PM +0200, Albert ARIBAUD wrote: > Hi Tom, > > The following changes since commit > be9f643ae6aa9044c60fe80e3a2c10be8371c692: > > Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 > 20:10:48 -0400) > > are available in the git repository at: > > > git://git.denx.de/u-boot-arm master > > for you to fetch changes up to c19a8bc5711ec63e905ef91f045a1489f0aa3cb0: > > vf610twr: Tune DDR initialization settings (2014-10-07 13:08:31 +0200) > > ---------------------------------------------------------------- > Albert ARIBAUD (1): > Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master' > > Anthony Felice (1): > vf610twr: Tune DDR initialization settings > > DrEagle (5): > ARM: sheevaplug: change env location > ARM: sheevaplug: add MVSATA driver > ARM: sheevaplug: add MTD defaults > ARM: sheevaplug: redefine MTDPARTS > ARM: sheevaplug: add HUSH parser > > Masahiro Yamada (7): > mtd: denali: add Denali controller configs to Kconfig > mtd: denali: add Denali NAND driver for SPL > serial: add UniPhier serial driver > ARM: UniPhier: add UniPhier SoC support code > ARM: UniPhier: add Kconfig and defconfig > MAINTAINERS: add me as a maintainer of UniPhier platform > git-mailrc: add me as a maintainer of UniPhier platform > > Michael Walle (1): > lsxl: convert to generic board and fix typo > > MAINTAINERS | 9 + > arch/arm/Kconfig | 5 + > arch/arm/cpu/armv7/uniphier/Kconfig | 32 + > arch/arm/cpu/armv7/uniphier/Makefile | 23 + > arch/arm/cpu/armv7/uniphier/board_common.c | 32 + > arch/arm/cpu/armv7/uniphier/board_late_init.c | 91 ++ > arch/arm/cpu/armv7/uniphier/cache_uniphier.c | 154 +++ > arch/arm/cpu/armv7/uniphier/cmd_pinmon.c | 33 + > arch/arm/cpu/armv7/uniphier/cpu_info.c | 59 ++ > arch/arm/cpu/armv7/uniphier/dram_init.c | 37 + > arch/arm/cpu/armv7/uniphier/init_page_table.c | 1068 > ++++++++++++++++++++ > arch/arm/cpu/armv7/uniphier/lowlevel_init.S | 159 +++ > arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile | 10 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/bcu_init.c | 33 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/board_info.c | 16 > + .../armv7/uniphier/ph1-ld4/board_postclk_init.c | 42 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/boot-mode.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c | 29 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/pinctrl.c | 63 ++ > arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_init.c | 189 ++++ > arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_spectrum.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c | 44 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c | 28 + > arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c | 162 +++ > arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile | 10 + > arch/arm/cpu/armv7/uniphier/ph1-pro4/board_info.c | 16 > + .../armv7/uniphier/ph1-pro4/board_postclk_init.c | 39 + > arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c | 66 ++ > arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 29 + > arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c | 45 + > arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_init.c | 168 > +++ .../arm/cpu/armv7/uniphier/ph1-pro4/pll_spectrum.c | 18 + > arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 75 ++ > arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c | 28 + > arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c | 136 +++ > arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 10 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/bcu_init.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/board_info.c | 16 > + .../armv7/uniphier/ph1-sld8/board_postclk_init.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/boot-mode.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c | 29 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/pinctrl.c | 57 ++ > arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_init.c | 201 > ++++ .../arm/cpu/armv7/uniphier/ph1-sld8/pll_spectrum.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c | 51 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/sg_init.c | 1 + > arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c | 142 +++ > arch/arm/cpu/armv7/uniphier/reset.c | 29 + > arch/arm/cpu/armv7/uniphier/smp.S | 54 + > arch/arm/cpu/armv7/uniphier/spl.c | 17 + > arch/arm/cpu/armv7/uniphier/support_card.c | 180 ++++ > arch/arm/cpu/armv7/uniphier/timer.c | 39 + > arch/arm/include/asm/arch-uniphier/arm-mpcore.h | 46 + > arch/arm/include/asm/arch-uniphier/bcu-regs.h | 30 + > arch/arm/include/asm/arch-uniphier/board.h | 35 + > arch/arm/include/asm/arch-uniphier/boot-device.h | 20 + > arch/arm/include/asm/arch-uniphier/led.h | 101 ++ > arch/arm/include/asm/arch-uniphier/sbc-regs.h | 108 ++ > arch/arm/include/asm/arch-uniphier/sc-regs.h | 62 ++ > arch/arm/include/asm/arch-uniphier/sg-regs.h | 182 ++++ > arch/arm/include/asm/arch-uniphier/ssc-regs.h | 67 ++ > arch/arm/include/asm/arch-uniphier/umc-regs.h | 119 +++ > arch/arm/include/asm/arch-vf610/imx-regs.h | 49 +- > arch/arm/include/asm/arch-vf610/iomux-vf610.h | 44 +- > arch/arm/include/asm/imx-common/iomux-v3.h | 2 + > board/freescale/vf610twr/vf610twr.c | 94 +- > configs/ph1_ld4_defconfig | 8 + > configs/ph1_pro4_defconfig | 8 + > configs/ph1_sld8_defconfig | 8 + > doc/README.nand | 6 - > doc/git-mailrc | 1 + > drivers/mtd/Kconfig | 1 + > drivers/mtd/nand/Kconfig | 42 + > drivers/mtd/nand/Makefile | 1 + > drivers/mtd/nand/denali_spl.c | 231 +++++ > drivers/serial/Makefile | 1 + > drivers/serial/serial.c | 2 + > drivers/serial/serial_uniphier.c | 204 ++++ > include/configs/lsxl.h | 4 +- > include/configs/ph1_ld4.h | 59 ++ > include/configs/ph1_pro4.h | 61 ++ > include/configs/ph1_sld8.h | 61 ++ > include/configs/sheevaplug.h | 46 +- > include/configs/uniphier-common.h | 266 +++++ 84 > files changed, 5675 insertions(+), 74 deletions(-) create mode 100644 > arch/arm/cpu/armv7/uniphier/Kconfig create mode 100644 > arch/arm/cpu/armv7/uniphier/Makefile create mode 100644 > arch/arm/cpu/armv7/uniphier/board_common.c create mode 100644 > arch/arm/cpu/armv7/uniphier/board_late_init.c create mode 100644 > arch/arm/cpu/armv7/uniphier/cache_uniphier.c create mode 100644 > arch/arm/cpu/armv7/uniphier/cmd_pinmon.c create mode 100644 > arch/arm/cpu/armv7/uniphier/cpu_info.c create mode 100644 > arch/arm/cpu/armv7/uniphier/dram_init.c create mode 100644 > arch/arm/cpu/armv7/uniphier/init_page_table.c create mode 100644 > arch/arm/cpu/armv7/uniphier/lowlevel_init.S create mode 100644 > arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile create mode 100644 > arch/arm/cpu/armv7/uniphier/ph1-ld4/bcu_init.c create mode 100644 > arch/arm/cpu/armv7/uniphier/ph1-ld4/board_info.c create mode 100644 > arch/arm/cpu/armv7/uniphier/ph1-ld4/board_postclk_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/boot-mode.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/pinctrl.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_spectrum.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/board_info.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_spectrum.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/bcu_init.c > create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/board_info.c > create mode 100644 > arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/boot-mode.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/pinctrl.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_spectrum.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/sg_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c create mode > 100644 arch/arm/cpu/armv7/uniphier/reset.c create mode 100644 > arch/arm/cpu/armv7/uniphier/smp.S create mode 100644 > arch/arm/cpu/armv7/uniphier/spl.c create mode 100644 > arch/arm/cpu/armv7/uniphier/support_card.c create mode 100644 > arch/arm/cpu/armv7/uniphier/timer.c create mode 100644 > arch/arm/include/asm/arch-uniphier/arm-mpcore.h create mode 100644 > arch/arm/include/asm/arch-uniphier/bcu-regs.h create mode 100644 > arch/arm/include/asm/arch-uniphier/board.h create mode 100644 > arch/arm/include/asm/arch-uniphier/boot-device.h create mode 100644 > arch/arm/include/asm/arch-uniphier/led.h create mode 100644 > arch/arm/include/asm/arch-uniphier/sbc-regs.h create mode 100644 > arch/arm/include/asm/arch-uniphier/sc-regs.h create mode 100644 > arch/arm/include/asm/arch-uniphier/sg-regs.h create mode 100644 > arch/arm/include/asm/arch-uniphier/ssc-regs.h create mode 100644 > arch/arm/include/asm/arch-uniphier/umc-regs.h create mode 100644 > configs/ph1_ld4_defconfig create mode 100644 > configs/ph1_pro4_defconfig create mode 100644 > configs/ph1_sld8_defconfig create mode 100644 drivers/mtd/nand/Kconfig > create mode 100644 drivers/mtd/nand/denali_spl.c create mode 100644 > drivers/serial/serial_uniphier.c create mode 100644 > include/configs/ph1_ld4.h create mode 100644 include/configs/ph1_pro4.h > create mode 100644 include/configs/ph1_sld8.h > create mode 100644 include/configs/uniphier-common.h Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: