Message ID | 5024B00E.1070208@denx.de |
---|---|
State | Accepted |
Delegated to: | Albert ARIBAUD |
Headers | show |
Hi Stefano, On Fri, 10 Aug 2012 08:54:06 +0200, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > an update pull request, please pull from u-boot-imx, thanks. > > The following changes since commit > 8abcd8ab962cd5fb2a4c025e7c7b62a9faf4aa08: > > DaVinci DA8xx: fix set_cpu_clk_info() (2012-08-05 22:02:40 +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 > 42abce776222a5d5cb2b355e77539cabb705b04a: > > sc_sps_1: Adjust board config to use 'mxs' SoC code (2012-08-10 > 08:48:24 +0200) > > ---------------------------------------------------------------- > Benoît Thébaudeau (1): > rtc: imxdi: Initial support > > Fabio Estevam (3): > mx28evk: Turn on caches > mx51evk: do not overwrite the console > vision2: do not overwrite the console > > Marek Vasut (9): > MX28: SPI: Refactor spi_xfer a bit > MX28: SPI: Pull out the PIO transfer function > MX28: SPI: Add DMA transfer support > MX28: Fix up the MMC driver DMA mode > MX28: Split out the PIO and DMA transfer functions > MX28: Transfer small blocks via PIO in MXS MMC > MX28: Fix MXS MMC DMA issues > MX28: Move the u-boot.bd info CPUDIR/SOCDIR > MX28: Add SchulerControl SC_SPS_1 platform > > Otavio Salvador (10): > imx: Use a clear identification of an unidentified CPU type > MX28: extend print_cpuinfo() to use chip information > MX28: use a clear name for DDR2 initialization > mxs: reorganize source directory for easy sharing of code in > i.MXS SoCs > mxs: prefix register acessor macros with 'mxs' prefix > mxs: prefix register structs with 'mxs' prefix > mxs: Reowork SPL to use 'mxs' prefix for methods > mxs: Clarify why we poweroff in case of brownout in 5v conflict > mxs: rename mx28.c to mxs.c as it is common to i.MX233 and > i.MX28 SoCs sc_sps_1: Adjust board config to use 'mxs' SoC code > > Stathis Voukelatos (1): > i.MX28: bug fixes in PMU configuration code > > Stefano Babic (1): > MX5: mx53loco: do not overwrite the console > > Veli-Pekka Peltola (1): > Add support for Bluegiga APX4 Development Kit > > MAINTAINERS | 5 + > Makefile | 2 +- > arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile | 2 +- > arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c | 40 +-- > arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c | 6 +- > arch/arm/cpu/arm926ejs/{mx28/mx28.c => mxs/mxs.c} | 72 +++-- > .../arm926ejs/{mx28/mx28_init.h => mxs/mxs_init.h} | 14 +- > arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c | 20 +- > .../cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c | 10 +- > .../arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c | 64 ++--- > .../cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c | 274 > ++++++++++---------- > arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S | 0 > arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c | 8 +- > .../arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds | 2 +- > .../arm/cpu/arm926ejs/mxs}/u-boot.bd | 0 > arch/arm/cpu/armv7/imx-common/cpu.c | 4 +- > .../include/asm/{arch-mx28 => arch-mxs}/clock.h | 0 > arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h | 0 > .../arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h | 0 > .../include/asm/{arch-mx28 => arch-mxs}/imx-regs.h | 0 > .../asm/{arch-mx28 => arch-mxs}/iomux-mx28.h | 0 > .../include/asm/{arch-mx28 => arch-mxs}/iomux.h | 0 > .../asm/{arch-mx28 => arch-mxs}/regs-apbh.h | 256 > +++++++++--------- > .../asm/{arch-mx28 => arch-mxs}/regs-base.h | 0 > .../include/asm/{arch-mx28 => arch-mxs}/regs-bch.h | 44 ++-- > .../asm/{arch-mx28 => arch-mxs}/regs-clkctrl.h | 60 ++--- > .../asm/{arch-mx28 => arch-mxs}/regs-common.h | 34 +-- > .../asm/{arch-mx28 => arch-mxs}/regs-digctl.h | 56 ++-- > .../asm/{arch-mx28 => arch-mxs}/regs-gpmi.h | 28 +- > .../include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h | 30 +-- > .../asm/{arch-mx28 => arch-mxs}/regs-lcdif.h | 66 ++--- > .../asm/{arch-mx28 => arch-mxs}/regs-lradc.h | 50 ++-- > .../asm/{arch-mx28 => arch-mxs}/regs-ocotp.h | 88 +++---- > .../asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h | 170 > ++++++------ .../asm/{arch-mx28 => arch-mxs}/regs-power.h | > 30 +-- .../include/asm/{arch-mx28 => arch-mxs}/regs-rtc.h | 30 +-- > .../include/asm/{arch-mx28 => arch-mxs}/regs-ssp.h | 42 +-- > .../asm/{arch-mx28 => arch-mxs}/regs-timrot.h | 40 +-- > .../include/asm/{arch-mx28 => arch-mxs}/regs-usb.h | 2 +- > .../asm/{arch-mx28 => arch-mxs}/regs-usbphy.h | 22 +- > .../asm/{arch-mx28 => arch-mxs}/sys_proto.h | 10 +- > board/bluegiga/apx4devkit/Makefile | 47 ++++ > board/bluegiga/apx4devkit/apx4devkit.c | 150 +++++++++++ > board/bluegiga/apx4devkit/spl_boot.c | 164 > ++++++++++++ board/denx/m28evk/m28evk.c | > 4 +- board/denx/m28evk/spl_boot.c | 2 +- > board/freescale/mx28evk/iomux.c | 2 +- > board/freescale/mx28evk/mx28evk.c | 4 +- > board/freescale/mx28evk/u-boot.bd | 14 - > board/freescale/mx51evk/mx51evk.c | 10 +- > board/freescale/mx53loco/mx53loco.c | 12 +- > board/schulercontrol/sc_sps_1/Makefile | 47 ++++ > board/schulercontrol/sc_sps_1/sc_sps_1.c | 113 ++++++++ > board/schulercontrol/sc_sps_1/spl_boot.c | 165 > ++++++++++++ board/ttcontrol/vision2/vision2.c | > 11 +- boards.cfg | 6 +- > doc/README.m28 | 4 +- > doc/README.mx28evk | 4 +- > drivers/dma/apbh_dma.c | 32 +-- > drivers/gpio/mxs_gpio.c | 16 +- > drivers/i2c/mxs_i2c.c | 12 +- > drivers/mmc/mxsmmc.c | 202 > ++++++++------- drivers/mtd/nand/mxs_nand.c > | 12 +- drivers/rtc/Makefile | 1 + > drivers/rtc/imxdi.c | 244 > +++++++++++++++++ drivers/rtc/mxsrtc.c > | 6 +- drivers/spi/mxs_spi.c | 200 > +++++++++++--- drivers/usb/host/ehci-mxs.c | > 24 +- include/configs/apx4devkit.h | 238 > +++++++++++++++++ include/configs/m28evk.h > | 4 +- include/configs/mx28evk.h | 6 +- > include/configs/mx51evk.h | 2 + > include/configs/mx53loco.h | 2 + > include/configs/sc_sps_1.h | 208 > +++++++++++++++ include/configs/vision2.h > | 2 + 75 files changed, 2569 insertions(+), 982 deletions(-) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/Makefile (97%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/clock.c (89%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/iomux.c (94%) > rename arch/arm/cpu/arm926ejs/{mx28/mx28.c => mxs/mxs.c} (79%) > rename arch/arm/cpu/arm926ejs/{mx28/mx28_init.h => mxs/mxs_init.h} > (81%) rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_boot.c (90%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_lradc_init.c (91%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_mem_init.c (83%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/spl_power_init.c (81%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/start.S (100%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/timer.c (95%) > rename arch/arm/cpu/arm926ejs/{mx28 => mxs}/u-boot-spl.lds (97%) > rename {board/denx/m28evk => arch/arm/cpu/arm926ejs/mxs}/u-boot.bd > (100%) rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/clock.h > (100%) rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/dma.h > (100%) rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/gpio.h > (100%) rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/imx-regs.h > (100%) rename arch/arm/include/asm/{arch-mx28 => > arch-mxs}/iomux-mx28.h (100%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/iomux.h (100%) rename arch/arm/include/asm/{arch-mx28 => > arch-mxs}/regs-apbh.h (77%) rename arch/arm/include/asm/{arch-mx28 => > arch-mxs}/regs-base.h (100%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/regs-bch.h (92%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/regs-clkctrl.h (88%) rename > arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-common.h (78%) > rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-digctl.h > (77%) rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-gpmi.h > (95%) rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-i2c.h > (94%) rename arch/arm/include/asm/{arch-mx28 => > arch-mxs}/regs-lcdif.h (84%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/regs-lradc.h (96%) rename > arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-ocotp.h (71%) > rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-pinctrl.h > (93%) rename arch/arm/include/asm/{arch-mx28 => > arch-mxs}/regs-power.h (97%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/regs-rtc.h (91%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/regs-ssp.h (95%) rename arch/arm/include/asm/{arch-mx28 > => arch-mxs}/regs-timrot.h (90%) rename > arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usb.h (99%) rename > arch/arm/include/asm/{arch-mx28 => arch-mxs}/regs-usbphy.h (94%) > rename arch/arm/include/asm/{arch-mx28 => arch-mxs}/sys_proto.h (89%) > create mode 100644 board/bluegiga/apx4devkit/Makefile create mode > 100644 board/bluegiga/apx4devkit/apx4devkit.c create mode 100644 > board/bluegiga/apx4devkit/spl_boot.c delete mode 100644 > board/freescale/mx28evk/u-boot.bd create mode 100644 > board/schulercontrol/sc_sps_1/Makefile create mode 100644 > board/schulercontrol/sc_sps_1/sc_sps_1.c create mode 100644 > board/schulercontrol/sc_sps_1/spl_boot.c create mode 100644 > drivers/rtc/imxdi.c create mode 100644 include/configs/apx4devkit.h > create mode 100644 include/configs/sc_sps_1.h Applied to u-boot-arm/master, thanks! Amicalement,