| Message ID | 503B168C.9090205@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Stefano, On Mon, 27 Aug 2012 08:41:16 +0200, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > please pull from u-boot-imx, thanks. > > The following changes since commit > 5f50310588e87f2ff501992564d1b05df71419f4: > > davinci, c6x: Always use C version of reset code (2012-08-25 > 13:40:03 +0200) > > are available in the git repository at: > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to > ff1728c902587c2dc76869a30a32013ef005b84a: > > mxs: Convert timeout parameter to 'unsigned int' (2012-08-27 > 08:28:01 +0200) > > ---------------------------------------------------------------- > Ashok Kumar Reddy (1): > mx6qarm2:Use IMX_GPIO_NR macro > > Benoît Thébaudeau (17): > mxc_spi: Round up clock divider > mx25: Enable dcache > mx5: Enable dcache > mx35: Fix typo on EDIO > mx3: Fix typo on IPU_CONF_CSI_EN > mx5/6 timer: Round up tick_to_time() value > mx5: cosmetic: Clean up lowlevel_init > mx35: Remove duplicate GPIO3_BASE_ADDR > mx5/6: Fix cpu_mmc_init() return value > mx35: Add cpu_mmc_init() > mx5: Undeclare imx_decode_pll() > mx35 iomux: Remove unused macro > mx35: Fix broken pin definitions > mx35: Remove declaration of non-existing function > mx35: Move clock enums to clock.h > mx35: Remove declaration of non-existing function > mxc: Make gpio_get_value() use PSR > > Fabio Estevam (7): > m28evk: Turn on caches > apx4devkit: Turn on caches > mx28evk: Remove unneeded 'undef' > mxs: Use correct function name to initialize dram > mx53loco: Use IMX_GPIO_NR macro > mx51evk: Use IMX_GPIO_NR macro > mx53ard: Use IMX_GPIO_NR macro > > Marek Vasut (7): > MX28: Drop the cp15 reconfiguration from SPL > MX28: Shuffle around the power management code > MX28: DMA: Align the struct mxs_dma_desc > MX28: DMA: Prolong the DMA timeout > MX28: SPI: Supercharge the SPI driver > MX28: m28evk: Align SSP clock speed > MX28: m28evk: Enable SPI DMA > > Matt Sealey (7): > spi: fix mxc_spi_slave structure allocation to clear memory > spi: fix mxs_spi_slave structure allocation to clear memory > mx5: add iomux-mx51.h include > efikamx: move and rename Efika MX directories and config files > to prepare for new boards > efikamx: remove drive strength function and roll its > functionality into the DCD > efikamx: configure Smarttop PCBID and LED pads in DCD for > convenience efikamx: update MAINTAINERS for Genesi Efika MX systems > > Otavio Salvador (9): > mxs: Remove not required explicit iomux-mx28.h include > mxs: Remove not required include of iomux-mx28.h > mxs: rename regs-clkctrl.h to regs-clkctrl-mx28.h > mxs: Convert sys_proto.h prefixes to 'mxs' > MX28: config: Allow different target generation in elftosb call > MX28: Move "regs-base.h" include after SoC type configuration > mxs: Replace i.MX233 by i.MX23 on copyright header > mxs: Only build internal Ethernet controller for i.MX28 > mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' > > Stefano Babic (1): > MX: Set a common gpio.h for all i.MX > > Troy Kisky (4): > iomux: move IOMUX_GPR13_xxx defines > imx-common/cmd_bmode.c: add imx bmode (bootmode) command > mx6qsabrelite: add boot_mode support > mx53evk: add boot_mode support > > Vikram Narayanan (1): > tx25: Use generic gpio_* calls > > fabio.estevam@freescale.com (1): > mxs: Convert timeout parameter to 'unsigned int' > > trem (3): > rtc: add support of mx27 rtc > gpio: add gpio api support to mx27 (v4) > imx27lite: update with gpio api change (v4) > > MAINTAINERS | 7 +- > Makefile | 5 +- > arch/arm/cpu/arm1136/mx35/generic.c | 19 ++- > arch/arm/cpu/arm1136/mx35/iomux.c | 2 - > arch/arm/cpu/arm926ejs/mx25/generic.c | 8 + > arch/arm/cpu/arm926ejs/mx27/generic.c | 11 +- > arch/arm/cpu/arm926ejs/mxs/mxs.c | 40 ++--- > arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 7 +- > arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 - > arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 9 +- > arch/arm/cpu/arm926ejs/mxs/start.S | 42 ----- > arch/arm/cpu/arm926ejs/mxs/timer.c | 2 +- > .../arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} | 0 > arch/arm/cpu/armv7/imx-common/Makefile | 1 + > arch/arm/cpu/armv7/imx-common/cmd_bmode.c | 119 > ++++++++++++++ arch/arm/cpu/armv7/imx-common/cpu.c > | 6 +- arch/arm/cpu/armv7/imx-common/timer.c | 2 +- > arch/arm/cpu/armv7/mx5/lowlevel_init.S | 46 +++--- > arch/arm/cpu/armv7/mx5/soc.c | 39 +++++ > arch/arm/cpu/armv7/mx6/soc.c | 36 +++++ > arch/arm/include/asm/arch-mx25/gpio.h | 17 +- > arch/arm/include/asm/arch-mx27/gpio.h | 55 +++++++ > arch/arm/include/asm/arch-mx27/imx-regs.h | 33 ++-- > arch/arm/include/asm/arch-mx27/regs-rtc.h | 40 +++++ > arch/arm/include/asm/arch-mx31/gpio.h | 7 +- > arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- > arch/arm/include/asm/arch-mx35/clock.h | 28 +++- > arch/arm/include/asm/arch-mx35/crm_regs.h | 4 +- > arch/arm/include/asm/arch-mx35/gpio.h | 12 +- > arch/arm/include/asm/arch-mx35/imx-regs.h | 29 +--- > arch/arm/include/asm/arch-mx35/mx35_pins.h | 3 - > arch/arm/include/asm/arch-mx35/sys_proto.h | 1 - > arch/arm/include/asm/arch-mx5/clock.h | 2 - > arch/arm/include/asm/arch-mx5/gpio.h | 7 +- > arch/arm/include/asm/arch-mx5/imx-regs.h | 18 +++ > arch/arm/include/asm/arch-mx5/iomux-mx51.h | 164 > ++++++++++++++++++++ > arch/arm/include/asm/arch-mx6/gpio.h | 7 +- > arch/arm/include/asm/arch-mx6/imx-regs.h | 23 ++- > arch/arm/include/asm/arch-mx6/iomux.h | 129 > +++++++++++++++ arch/arm/include/asm/arch-mxs/dma.h > | 3 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 +- > .../{regs-clkctrl.h => regs-clkctrl-mx28.h} | 0 > arch/arm/include/asm/arch-mxs/sys_proto.h | 24 +-- > arch/arm/include/asm/imx-common/boot_mode.h | 36 +++++ > arch/arm/include/asm/imx-common/gpio.h | 39 +++++ > arch/arm/include/asm/imx-common/iomux-v3.h | 111 > ------------- board/CarMediaLab/flea3/flea3.c | > 6 +- board/bluegiga/apx4devkit/apx4devkit.c | 4 +- > board/denx/m28evk/m28evk.c | 6 +- > board/freescale/mx28evk/mx28evk.c | 2 +- > board/freescale/mx35pdk/mx35pdk.c | 2 +- > board/freescale/mx51evk/mx51evk.c | 6 +- > board/freescale/mx53ard/mx53ard.c | 2 +- > board/freescale/mx53evk/mx53evk.c | 13 ++ > board/freescale/mx53loco/mx53loco.c | 2 +- > board/freescale/mx6qarm2/mx6qarm2.c | 4 +- > board/freescale/mx6qsabrelite/mx6qsabrelite.c | 43 +++-- > board/{efikamx => genesi/mx51_efikamx}/Makefile | 0 > .../{efikamx => genesi/mx51_efikamx}/efikamx-usb.c | 2 +- > board/{efikamx => genesi/mx51_efikamx}/efikamx.c | 77 --------- > .../mx51_efikamx}/imximage_mx.cfg | 50 +++--- > .../mx51_efikamx}/imximage_sb.cfg | 0 > board/karo/tx25/tx25.c | 25 ++- > board/logicpd/imx27lite/imx27lite.c | 5 +- > board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- > board/syteco/zmx25/zmx25.c | 26 ++-- > boards.cfg | 4 +- > drivers/dma/apbh_dma.c | 6 +- > drivers/gpio/mxc_gpio.c | 10 +- > drivers/i2c/mxs_i2c.c | 2 +- > drivers/mmc/mxsmmc.c | 2 +- > drivers/mtd/nand/mxs_nand.c | 6 +- > drivers/rtc/Makefile | 1 + > drivers/rtc/mx27rtc.c | 83 ++++++++++ > drivers/rtc/mxsrtc.c | 4 +- > drivers/spi/mxc_spi.c | 6 +- > drivers/spi/mxs_spi.c | 106 > ++++++++----- drivers/usb/host/ehci-mxs.c | > 2 +- include/configs/apx4devkit.h | 6 +- > include/configs/imx27lite-common.h | 5 + > include/configs/m28evk.h | 11 +- > include/configs/mx28evk.h | 6 +- > include/configs/{efikamx.h => mx51_efikamx.h} | 0 > include/configs/mx53evk.h | 3 + > include/configs/mx6qsabrelite.h | 6 +- > include/configs/sc_sps_1.h | 4 +- > 86 files changed, 1163 insertions(+), 585 deletions(-) > rename arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} > (100%) create mode 100644 arch/arm/cpu/armv7/imx-common/cmd_bmode.c > create mode 100644 arch/arm/include/asm/arch-mx27/gpio.h > create mode 100644 arch/arm/include/asm/arch-mx27/regs-rtc.h > create mode 100644 arch/arm/include/asm/arch-mx5/iomux-mx51.h > create mode 100644 arch/arm/include/asm/arch-mx6/iomux.h > rename arch/arm/include/asm/arch-mxs/{regs-clkctrl.h => > regs-clkctrl-mx28.h} (100%) > create mode 100644 arch/arm/include/asm/imx-common/boot_mode.h > create mode 100644 arch/arm/include/asm/imx-common/gpio.h > rename board/{efikamx => genesi/mx51_efikamx}/Makefile (100%) > rename board/{efikamx => genesi/mx51_efikamx}/efikamx-usb.c (99%) > rename board/{efikamx => genesi/mx51_efikamx}/efikamx.c (85%) > rename board/{efikamx => genesi/mx51_efikamx}/imximage_mx.cfg (71%) > rename board/{efikamx => genesi/mx51_efikamx}/imximage_sb.cfg (100%) > create mode 100644 drivers/rtc/mx27rtc.c > rename include/configs/{efikamx.h => mx51_efikamx.h} (100%) > Applied to u-boot-arm/master, thanks! Amicalement,
Hi Albert, please pull from u-boot-imx, thanks. The following changes since commit 5f50310588e87f2ff501992564d1b05df71419f4: davinci, c6x: Always use C version of reset code (2012-08-25 13:40:03 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to ff1728c902587c2dc76869a30a32013ef005b84a: mxs: Convert timeout parameter to 'unsigned int' (2012-08-27 08:28:01 +0200) ---------------------------------------------------------------- Ashok Kumar Reddy (1): mx6qarm2:Use IMX_GPIO_NR macro Benoît Thébaudeau (17): mxc_spi: Round up clock divider mx25: Enable dcache mx5: Enable dcache mx35: Fix typo on EDIO mx3: Fix typo on IPU_CONF_CSI_EN mx5/6 timer: Round up tick_to_time() value mx5: cosmetic: Clean up lowlevel_init mx35: Remove duplicate GPIO3_BASE_ADDR mx5/6: Fix cpu_mmc_init() return value mx35: Add cpu_mmc_init() mx5: Undeclare imx_decode_pll() mx35 iomux: Remove unused macro mx35: Fix broken pin definitions mx35: Remove declaration of non-existing function mx35: Move clock enums to clock.h mx35: Remove declaration of non-existing function mxc: Make gpio_get_value() use PSR Fabio Estevam (7): m28evk: Turn on caches apx4devkit: Turn on caches mx28evk: Remove unneeded 'undef' mxs: Use correct function name to initialize dram mx53loco: Use IMX_GPIO_NR macro mx51evk: Use IMX_GPIO_NR macro mx53ard: Use IMX_GPIO_NR macro Marek Vasut (7): MX28: Drop the cp15 reconfiguration from SPL MX28: Shuffle around the power management code MX28: DMA: Align the struct mxs_dma_desc MX28: DMA: Prolong the DMA timeout MX28: SPI: Supercharge the SPI driver MX28: m28evk: Align SSP clock speed MX28: m28evk: Enable SPI DMA Matt Sealey (7): spi: fix mxc_spi_slave structure allocation to clear memory spi: fix mxs_spi_slave structure allocation to clear memory mx5: add iomux-mx51.h include efikamx: move and rename Efika MX directories and config files to prepare for new boards efikamx: remove drive strength function and roll its functionality into the DCD efikamx: configure Smarttop PCBID and LED pads in DCD for convenience efikamx: update MAINTAINERS for Genesi Efika MX systems Otavio Salvador (9): mxs: Remove not required explicit iomux-mx28.h include mxs: Remove not required include of iomux-mx28.h mxs: rename regs-clkctrl.h to regs-clkctrl-mx28.h mxs: Convert sys_proto.h prefixes to 'mxs' MX28: config: Allow different target generation in elftosb call MX28: Move "regs-base.h" include after SoC type configuration mxs: Replace i.MX233 by i.MX23 on copyright header mxs: Only build internal Ethernet controller for i.MX28 mxs: Rename 'mx28_dram_init' to 'mxs_dram_init' Stefano Babic (1): MX: Set a common gpio.h for all i.MX Troy Kisky (4): iomux: move IOMUX_GPR13_xxx defines imx-common/cmd_bmode.c: add imx bmode (bootmode) command mx6qsabrelite: add boot_mode support mx53evk: add boot_mode support Vikram Narayanan (1): tx25: Use generic gpio_* calls fabio.estevam@freescale.com (1): mxs: Convert timeout parameter to 'unsigned int' trem (3): rtc: add support of mx27 rtc gpio: add gpio api support to mx27 (v4) imx27lite: update with gpio api change (v4) MAINTAINERS | 7 +- Makefile | 5 +- arch/arm/cpu/arm1136/mx35/generic.c | 19 ++- arch/arm/cpu/arm1136/mx35/iomux.c | 2 - arch/arm/cpu/arm926ejs/mx25/generic.c | 8 + arch/arm/cpu/arm926ejs/mx27/generic.c | 11 +- arch/arm/cpu/arm926ejs/mxs/mxs.c | 40 ++--- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 7 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 1 - arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 9 +- arch/arm/cpu/arm926ejs/mxs/start.S | 42 ----- arch/arm/cpu/arm926ejs/mxs/timer.c | 2 +- .../arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} | 0 arch/arm/cpu/armv7/imx-common/Makefile | 1 + arch/arm/cpu/armv7/imx-common/cmd_bmode.c | 119 ++++++++++++++ arch/arm/cpu/armv7/imx-common/cpu.c | 6 +- arch/arm/cpu/armv7/imx-common/timer.c | 2 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 46 +++--- arch/arm/cpu/armv7/mx5/soc.c | 39 +++++ arch/arm/cpu/armv7/mx6/soc.c | 36 +++++ arch/arm/include/asm/arch-mx25/gpio.h | 17 +- arch/arm/include/asm/arch-mx27/gpio.h | 55 +++++++ arch/arm/include/asm/arch-mx27/imx-regs.h | 33 ++-- arch/arm/include/asm/arch-mx27/regs-rtc.h | 40 +++++ arch/arm/include/asm/arch-mx31/gpio.h | 7 +- arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- arch/arm/include/asm/arch-mx35/clock.h | 28 +++- arch/arm/include/asm/arch-mx35/crm_regs.h | 4 +- arch/arm/include/asm/arch-mx35/gpio.h | 12 +- arch/arm/include/asm/arch-mx35/imx-regs.h | 29 +--- arch/arm/include/asm/arch-mx35/mx35_pins.h | 3 - arch/arm/include/asm/arch-mx35/sys_proto.h | 1 - arch/arm/include/asm/arch-mx5/clock.h | 2 - arch/arm/include/asm/arch-mx5/gpio.h | 7 +- arch/arm/include/asm/arch-mx5/imx-regs.h | 18 +++ arch/arm/include/asm/arch-mx5/iomux-mx51.h | 164 ++++++++++++++++++++ arch/arm/include/asm/arch-mx6/gpio.h | 7 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 23 ++- arch/arm/include/asm/arch-mx6/iomux.h | 129 +++++++++++++++ arch/arm/include/asm/arch-mxs/dma.h | 3 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 +- .../{regs-clkctrl.h => regs-clkctrl-mx28.h} | 0 arch/arm/include/asm/arch-mxs/sys_proto.h | 24 +-- arch/arm/include/asm/imx-common/boot_mode.h | 36 +++++ arch/arm/include/asm/imx-common/gpio.h | 39 +++++ arch/arm/include/asm/imx-common/iomux-v3.h | 111 ------------- board/CarMediaLab/flea3/flea3.c | 6 +- board/bluegiga/apx4devkit/apx4devkit.c | 4 +- board/denx/m28evk/m28evk.c | 6 +- board/freescale/mx28evk/mx28evk.c | 2 +- board/freescale/mx35pdk/mx35pdk.c | 2 +- board/freescale/mx51evk/mx51evk.c | 6 +- board/freescale/mx53ard/mx53ard.c | 2 +- board/freescale/mx53evk/mx53evk.c | 13 ++ board/freescale/mx53loco/mx53loco.c | 2 +- board/freescale/mx6qarm2/mx6qarm2.c | 4 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 43 +++-- board/{efikamx => genesi/mx51_efikamx}/Makefile | 0 .../{efikamx => genesi/mx51_efikamx}/efikamx-usb.c | 2 +- board/{efikamx => genesi/mx51_efikamx}/efikamx.c | 77 --------- .../mx51_efikamx}/imximage_mx.cfg | 50 +++--- .../mx51_efikamx}/imximage_sb.cfg | 0 board/karo/tx25/tx25.c | 25 ++- board/logicpd/imx27lite/imx27lite.c | 5 +- board/schulercontrol/sc_sps_1/sc_sps_1.c | 2 +- board/syteco/zmx25/zmx25.c | 26 ++-- boards.cfg | 4 +- drivers/dma/apbh_dma.c | 6 +- drivers/gpio/mxc_gpio.c | 10 +- drivers/i2c/mxs_i2c.c | 2 +- drivers/mmc/mxsmmc.c | 2 +- drivers/mtd/nand/mxs_nand.c | 6 +- drivers/rtc/Makefile | 1 + drivers/rtc/mx27rtc.c | 83 ++++++++++ drivers/rtc/mxsrtc.c | 4 +- drivers/spi/mxc_spi.c | 6 +- drivers/spi/mxs_spi.c | 106 ++++++++----- drivers/usb/host/ehci-mxs.c | 2 +- include/configs/apx4devkit.h | 6 +- include/configs/imx27lite-common.h | 5 + include/configs/m28evk.h | 11 +- include/configs/mx28evk.h | 6 +- include/configs/{efikamx.h => mx51_efikamx.h} | 0 include/configs/mx53evk.h | 3 + include/configs/mx6qsabrelite.h | 6 +- include/configs/sc_sps_1.h | 4 +- 86 files changed, 1163 insertions(+), 585 deletions(-) rename arch/arm/cpu/arm926ejs/mxs/{u-boot.bd => u-boot-imx28.bd} (100%) create mode 100644 arch/arm/cpu/armv7/imx-common/cmd_bmode.c create mode 100644 arch/arm/include/asm/arch-mx27/gpio.h create mode 100644 arch/arm/include/asm/arch-mx27/regs-rtc.h create mode 100644 arch/arm/include/asm/arch-mx5/iomux-mx51.h create mode 100644 arch/arm/include/asm/arch-mx6/iomux.h rename arch/arm/include/asm/arch-mxs/{regs-clkctrl.h => regs-clkctrl-mx28.h} (100%) create mode 100644 arch/arm/include/asm/imx-common/boot_mode.h create mode 100644 arch/arm/include/asm/imx-common/gpio.h rename board/{efikamx => genesi/mx51_efikamx}/Makefile (100%) rename board/{efikamx => genesi/mx51_efikamx}/efikamx-usb.c (99%) rename board/{efikamx => genesi/mx51_efikamx}/efikamx.c (85%) rename board/{efikamx => genesi/mx51_efikamx}/imximage_mx.cfg (71%) rename board/{efikamx => genesi/mx51_efikamx}/imximage_sb.cfg (100%) create mode 100644 drivers/rtc/mx27rtc.c rename include/configs/{efikamx.h => mx51_efikamx.h} (100%)