| Submitter | Stefano Babic |
|---|---|
| Date | Nov. 10, 2012, 7:55 a.m. |
| Message ID | <509E0857.9030005@denx.de> |
| Download | mbox |
| Permalink | /patch/198176/ |
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Pull-request
git://www.denx.de/git/u-boot-imx.git masterComments
Hi Stefano, On Sat, 10 Nov 2012 08:55:03 +0100, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > please pull from u-boot-imx, thanks. > > The following changes since commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5: > > Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze > (2012-11-09 08:47:25 -0700) > > are available in the git repository at: > > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to 34275d70fec6cc369a931090ebb686bc213bb80d: > > arch-mx6: add mx6dl_pins.h (2012-11-10 08:15:40 +0100) > > ---------------------------------------------------------------- > Fabio Estevam (11): > mx25pdk: Include CONFIG_MX25 > mx25pdk: Add esdhc support > pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH > mx25: Place common functions into sys_proto.h > pmic: Add support for mc34704 > mx25pdk: Add Ethernet support > mx53loco: Allow booting a zImage kernel > mx25pdk: Allow booting a zImage kernel > mx51evk: Allow booting a zImage kernel > mx35pdk: Allow booting a zImage kernel > mx6qsabre_common: Allow booting a zImage kernel > > Stefano Babic (8): > ARM: Fix start.S when used with SPL in arm1136 > MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK > MX35: Add soc_boot_mode and soc_boot_device to MX35 > SPL: Added SPL target for mx35 SOC to SPL Makefile > ARM: Add SPL target to arm1136 > MX35: add support for woodburn board > MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk > Merge git://git.denx.de/u-boot > > Troy Kisky (4): > mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite > mx6: use CONFIG_MX6 instead of CONFIG_MX6Q > imx-common: cpu: add imx_ddr_size > arch-mx6: add mx6dl_pins.h > > MAINTAINERS | 1 + > Makefile | 1 + > arch/arm/cpu/arm1136/config.mk | 3 + > arch/arm/cpu/arm1136/mx35/Makefile | 1 + > arch/arm/cpu/arm1136/mx35/generic.c | 75 ++++++ > arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 +++++++++++ > arch/arm/cpu/arm1136/start.S | 31 ++- > arch/arm/cpu/arm1136/u-boot-spl.lds | 62 +++++ > arch/arm/cpu/armv7/mx6/soc.c | 32 ++- > arch/arm/imx-common/cpu.c | 66 +++++- > arch/arm/include/asm/arch-mx25/imx-regs.h | 4 - > arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + > arch/arm/include/asm/arch-mx35/imx-regs.h | 2 + > arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 +++ > arch/arm/include/asm/arch-mx35/spl.h | 38 +++ > arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + > arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- > arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + > arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++++++++++ > arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- > board/freescale/mx25pdk/mx25pdk.c | 114 +++++++++ > board/freescale/mx31ads/u-boot.lds | 2 + > board/syteco/zmx25/zmx25.c | 1 + > board/woodburn/Makefile | 43 ++++ > board/woodburn/imximage.cfg | 4 + > board/woodburn/lowlevel_init.S | 38 +++ > board/woodburn/woodburn.c | 261 +++++++++++++++++++++ > boards.cfg | 2 + > drivers/gpio/mxc_gpio.c | 6 +- > drivers/misc/pmic_fsl.c | 8 +- > drivers/video/ipu_regs.h | 2 +- > include/configs/mx25pdk.h | 40 +++- > include/configs/mx35pdk.h | 2 + > include/configs/mx51evk.h | 2 +- > include/configs/mx53evk.h | 1 + > include/configs/mx53loco.h | 2 + > include/configs/mx6qarm2.h | 1 + > include/configs/mx6qsabre_common.h | 2 + > include/configs/mx6qsabrelite.h | 1 + > include/configs/woodburn.h | 34 +++ > include/configs/woodburn_common.h | 313 > +++++++++++++++++++++++++ > include/configs/woodburn_sd.h | 60 +++++ > include/mc34704.h | 49 ++++ > nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + > spl/Makefile | 6 + > 45 files changed, 1617 insertions(+), 39 deletions(-) > create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c > create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds > create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h > create mode 100644 arch/arm/include/asm/arch-mx35/spl.h > create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h > create mode 100644 board/woodburn/Makefile > create mode 100644 board/woodburn/imximage.cfg > create mode 100644 board/woodburn/lowlevel_init.S > create mode 100644 board/woodburn/woodburn.c > create mode 100644 include/configs/woodburn.h > create mode 100644 include/configs/woodburn_common.h > create mode 100644 include/configs/woodburn_sd.h > create mode 100644 include/mc34704.h > Applied to u-boot-arm/master, thanks! Amicalement,
Hi Albert, please pull from u-boot-imx, thanks. The following changes since commit 59852d03867108217fe88e3bfc3e1e9cedfe63c5: Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze (2012-11-09 08:47:25 -0700) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 34275d70fec6cc369a931090ebb686bc213bb80d: arch-mx6: add mx6dl_pins.h (2012-11-10 08:15:40 +0100) ---------------------------------------------------------------- Fabio Estevam (11): mx25pdk: Include CONFIG_MX25 mx25pdk: Add esdhc support pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH mx25: Place common functions into sys_proto.h pmic: Add support for mc34704 mx25pdk: Add Ethernet support mx53loco: Allow booting a zImage kernel mx25pdk: Allow booting a zImage kernel mx51evk: Allow booting a zImage kernel mx35pdk: Allow booting a zImage kernel mx6qsabre_common: Allow booting a zImage kernel Stefano Babic (8): ARM: Fix start.S when used with SPL in arm1136 MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK MX35: Add soc_boot_mode and soc_boot_device to MX35 SPL: Added SPL target for mx35 SOC to SPL Makefile ARM: Add SPL target to arm1136 MX35: add support for woodburn board MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk Merge git://git.denx.de/u-boot Troy Kisky (4): mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite mx6: use CONFIG_MX6 instead of CONFIG_MX6Q imx-common: cpu: add imx_ddr_size arch-mx6: add mx6dl_pins.h MAINTAINERS | 1 + Makefile | 1 + arch/arm/cpu/arm1136/config.mk | 3 + arch/arm/cpu/arm1136/mx35/Makefile | 1 + arch/arm/cpu/arm1136/mx35/generic.c | 75 ++++++ arch/arm/cpu/arm1136/mx35/mx35_sdram.c | 137 +++++++++++ arch/arm/cpu/arm1136/start.S | 31 ++- arch/arm/cpu/arm1136/u-boot-spl.lds | 62 +++++ arch/arm/cpu/armv7/mx6/soc.c | 32 ++- arch/arm/imx-common/cpu.c | 66 +++++- arch/arm/include/asm/arch-mx25/imx-regs.h | 4 - arch/arm/include/asm/arch-mx25/sys_proto.h | 3 + arch/arm/include/asm/arch-mx35/imx-regs.h | 2 + arch/arm/include/asm/arch-mx35/mmc_host_def.h | 31 +++ arch/arm/include/asm/arch-mx35/spl.h | 38 +++ arch/arm/include/asm/arch-mx35/sys_proto.h | 2 + arch/arm/include/asm/arch-mx5/sys_proto.h | 10 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 149 ++++++++++++ arch/arm/include/asm/arch-mx6/sys_proto.h | 10 +- board/freescale/mx25pdk/mx25pdk.c | 114 +++++++++ board/freescale/mx31ads/u-boot.lds | 2 + board/syteco/zmx25/zmx25.c | 1 + board/woodburn/Makefile | 43 ++++ board/woodburn/imximage.cfg | 4 + board/woodburn/lowlevel_init.S | 38 +++ board/woodburn/woodburn.c | 261 +++++++++++++++++++++ boards.cfg | 2 + drivers/gpio/mxc_gpio.c | 6 +- drivers/misc/pmic_fsl.c | 8 +- drivers/video/ipu_regs.h | 2 +- include/configs/mx25pdk.h | 40 +++- include/configs/mx35pdk.h | 2 + include/configs/mx51evk.h | 2 +- include/configs/mx53evk.h | 1 + include/configs/mx53loco.h | 2 + include/configs/mx6qarm2.h | 1 + include/configs/mx6qsabre_common.h | 2 + include/configs/mx6qsabrelite.h | 1 + include/configs/woodburn.h | 34 +++ include/configs/woodburn_common.h | 313 +++++++++++++++++++++++++ include/configs/woodburn_sd.h | 60 +++++ include/mc34704.h | 49 ++++ nand_spl/board/freescale/mx31pdk/u-boot.lds | 2 + spl/Makefile | 6 + 45 files changed, 1617 insertions(+), 39 deletions(-) create mode 100644 arch/arm/cpu/arm1136/mx35/mx35_sdram.c create mode 100644 arch/arm/cpu/arm1136/u-boot-spl.lds create mode 100644 arch/arm/include/asm/arch-mx35/mmc_host_def.h create mode 100644 arch/arm/include/asm/arch-mx35/spl.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl_pins.h create mode 100644 board/woodburn/Makefile create mode 100644 board/woodburn/imximage.cfg create mode 100644 board/woodburn/lowlevel_init.S create mode 100644 board/woodburn/woodburn.c create mode 100644 include/configs/woodburn.h create mode 100644 include/configs/woodburn_common.h create mode 100644 include/configs/woodburn_sd.h create mode 100644 include/mc34704.h