Pull request: u-boot-imx
Hi Albert,
please pull from u-boot-imx, thanks.
The following changes since commit 5d250e52ffd5554834a45ac8d53762fbbf36933c:
tegra2: Enable data cache (2012-01-18 15:54:07 -0700)
are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master
Dirk Behme (4):
imximage: Add MX53 to the documentation
imximage: Add support for i.MX6
imximage: Sort bootops alphabetically
i.mx6q: configs: Add fdt_high and initrd_high variables
Fabio Estevam (2):
sdhc_boot: Introduce CONFIG_FSL_FIXED_MMC_LOCATION option
configs: Remove CONFIG_NET_MULTI from board files
Helmut Raiger (1):
mmc: access mxcmmc from mx31 boards
Jason Liu (1):
i.mx6q: mx6qsabrelite: Add the ethernet function support
Stefano Babic (1):
imx6: mx6qarm2: updated board_mmc_getcd() to the new prototype
Troy Kisky (2):
i.mx6: mx6x_pins: Fix uart txd definitions
i.mx6q: mx6qsabrelite: Setup uart1 pinmux
arch/arm/cpu/arm1136/mx31/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/generic.c | 35 ++++++-- arch/arm/include/asm/arch-mx27/clock.h | 22 ++--- arch/arm/include/asm/arch-mx31/clock.h | 3 +- arch/arm/include/asm/arch-mx31/imx-regs.h | 11 +++ arch/arm/include/asm/arch-mx31/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 36 +++----- board/freescale/common/Makefile | 2 +- board/freescale/mx6qarm2/mx6qarm2.c | 9 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 114 +++++++++++++++++++++++++ doc/README.imximage | 13 ++-- drivers/mmc/mxcmmc.c | 8 +- include/configs/MPC8536DS.h | 1 + include/configs/P1010RDB.h | 5 +- include/configs/P1_P2_RDB.h | 1 + include/configs/P2020COME.h | 1 + include/configs/P2020DS.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/PM826.h | 2 - include/configs/PM828.h | 2 - include/configs/cam_enc_4xx.h | 1 - include/configs/coreboot.h | 6 -- include/configs/corenet_ds.h | 1 + include/configs/ecovec.h | 1 - include/configs/efikamx.h | 1 - include/configs/enbw_cmc.h | 1 - include/configs/ethernut5.h | 1 - include/configs/flea3.h | 1 - include/configs/m28evk.h | 1 - include/configs/mx6qarm2.h | 2 + include/configs/mx6qsabrelite.h | 15 +++- include/configs/omap3_evm_common.h | 1 - include/configs/omap3_mvblx.h | 1 - include/configs/p1_p2_rdb_pc.h | 7 +-- include/configs/tam3517-common.h | 1 - tools/imximage.c | 8 +- tools/imximage.h | 2 + 37 files changed, 222 insertions(+), 99 deletions(-)
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
Hi Stefano,
Le 22/01/2012 14:06, Stefano Babic a ?crit :
Quoted 10 lines
Hi Albert,
please pull from u-boot-imx, thanks.
The following changes since commit
5d250e52ffd5554834a45ac8d53762fbbf36933c:tegra2: Enable data cache (2012-01-18 15:54:07 -0700)are available in the git repository at:
git://www.denx.de/git/u-boot-imx.gitmaster
This branch has moved since the pull request and now includes, in addition to the 11 commits mentioned in your request, the following 5 new commits:
Fabio Estevam (1):
mx28: Show CPU frequency
Helmut Raiger (2):
mc13783.h: create and add regulator mode 0 and 1
tt01: add MMC support
Jason Liu (1):
i.mx: i.mx5: update imx_get_mac_from_fuse function
Matthias Fuchs (1):
mx28: fix i.MX28 spi driver
Do you want me to ignore these and honor the initial 11-commit pull request, or would you prefer to issue an [UPDATE] pull req for the whole 16 commits?
Amicalement,
Signature · 1 line
Albert.
Quoted 2 lines · Albert ARIBAUD
Hi Stefano,
Hi Albert,
Quoted 3 lines
Do you want me to ignore these and honor the initial 11-commit pull request, or would you prefer to issue an [UPDATE] pull req for the whole 16 commits?
I send yaou an update pull req, thanks.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
Hi Albert,
I have updated my pull request:
The following changes since commit 778a2c5f846b1d0b78152747af96bcd0ca04e562:
arm, davinci: cam_enc_4xx board updates (2012-02-02 10:54:37 -0700)
are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master
Dirk Behme (4):
imximage: Add MX53 to the documentation
imximage: Add support for i.MX6
imximage: Sort bootops alphabetically
i.mx6q: configs: Add fdt_high and initrd_high variables
Fabio Estevam (3):
sdhc_boot: Introduce CONFIG_FSL_FIXED_MMC_LOCATION option
configs: Remove CONFIG_NET_MULTI from board files
mx28: Show CPU frequency
Helmut Raiger (3):
mmc: access mxcmmc from mx31 boards mc13783.h: create and add regulator mode 0 and 1
tt01: add MMC support
Jason Liu (2):
i.mx6q: mx6qsabrelite: Add the ethernet function support i.mx: i.mx5: update imx_get_mac_from_fuse function
Matthias Fuchs (1):
mx28: fix i.MX28 spi driver
Stefano Babic (1):
imx6: mx6qarm2: updated board_mmc_getcd() to the new prototype
Troy Kisky (2):
i.mx6: mx6x_pins: Fix uart txd definitions
i.mx6q: mx6qsabrelite: Setup uart1 pinmux
arch/arm/cpu/arm1136/mx31/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/generic.c | 35 ++++++-- arch/arm/cpu/arm926ejs/mx28/mx28.c | 3 +- arch/arm/cpu/armv7/mx5/soc.c | 2 +- arch/arm/include/asm/arch-mx27/clock.h | 22 ++--- arch/arm/include/asm/arch-mx31/clock.h | 3 +- arch/arm/include/asm/arch-mx31/imx-regs.h | 11 +++ arch/arm/include/asm/arch-mx31/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 36 +++----- board/freescale/common/Makefile | 2 +- board/freescale/mx6qarm2/mx6qarm2.c | 9 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 114 +++++++++++++++++++++++++ board/hale/tt01/tt01.c | 34 +++++++- doc/README.imximage | 13 ++-- drivers/mmc/mxcmmc.c | 8 +- drivers/spi/mxs_spi.c | 12 ++- include/configs/MPC8536DS.h | 1 + include/configs/P1010RDB.h | 5 +- include/configs/P1_P2_RDB.h | 1 + include/configs/P2020COME.h | 1 + include/configs/P2020DS.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/PM826.h | 2 - include/configs/PM828.h | 2 - include/configs/cam_enc_4xx.h | 1 - include/configs/coreboot.h | 6 -- include/configs/corenet_ds.h | 1 + include/configs/ecovec.h | 1 - include/configs/efikamx.h | 1 - include/configs/enbw_cmc.h | 1 - include/configs/ethernut5.h | 1 - include/configs/flea3.h | 1 - include/configs/m28evk.h | 1 - include/configs/mx6qarm2.h | 2 + include/configs/mx6qsabrelite.h | 15 +++- include/configs/omap3_evm_common.h | 1 - include/configs/omap3_mvblx.h | 1 - include/configs/p1_p2_rdb_pc.h | 7 +-- include/configs/tam3517-common.h | 1 - include/configs/tt01.h | 12 +++ include/mc13783.h | 80 +++++++++++++++++ tools/imximage.c | 8 +- tools/imximage.h | 2 + 43 files changed, 358 insertions(+), 106 deletions(-) create mode 100644 include/mc13783.h
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
Hi Stefano,
Le 05/02/2012 14:35, Stefano Babic a ?crit :
Quoted 86 lines
Hi Albert,
I have updated my pull request:
The following changes since commit
778a2c5f846b1d0b78152747af96bcd0ca04e562:arm, davinci: cam_enc_4xx board updates (2012-02-02 10:54:37 -0700)are available in the git repository at:
git://www.denx.de/git/u-boot-imx.gitmasterDirk Behme (4):
imximage: Add MX53 to the documentation
imximage: Add support for i.MX6
imximage: Sort bootops alphabetically
i.mx6q: configs: Addfdt_highandinitrd_highvariablesFabio Estevam (3):
sdhc_boot: IntroduceCONFIG_FSL_FIXED_MMC_LOCATIONoption
configs: RemoveCONFIG_NET_MULTIfrom board files
mx28: Show CPU frequencyHelmut Raiger (3):
mmc: access mxcmmc from mx31 boardsmc13783.h: create and add regulator mode 0 and 1
tt01: add MMC supportJason Liu (2):
i.mx6q: mx6qsabrelite: Add the ethernet function support i.mx: i.mx5: updateimx_get_mac_from_fusefunctionMatthias Fuchs (1):
mx28: fix i.MX28 spi driverStefano Babic (1):
imx6: mx6qarm2: updatedboard_mmc_getcd()to the new prototypeTroy Kisky (2):
i.mx6:mx6x_pins: Fix uart txd definitions
i.mx6q: mx6qsabrelite: Setup uart1 pinmuxarch/arm/cpu/arm1136/mx31/generic.c | 1 + arch/arm/cpu/arm926ejs/mx27/generic.c | 35 ++++++-- arch/arm/cpu/arm926ejs/mx28/mx28.c | 3 +- arch/arm/cpu/armv7/mx5/soc.c | 2 +- arch/arm/include/asm/arch-mx27/clock.h | 22 ++--- arch/arm/include/asm/arch-mx31/clock.h | 3 +- arch/arm/include/asm/arch-mx31/imx-regs.h | 11 +++ arch/arm/include/asm/arch-mx31/sys_proto.h | 2 +- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 36 +++----- board/freescale/common/Makefile | 2 +- board/freescale/mx6qarm2/mx6qarm2.c | 9 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 114 +++++++++++++++++++++++++ board/hale/tt01/tt01.c | 34 +++++++- doc/README.imximage | 13 ++-- drivers/mmc/mxcmmc.c | 8 +- drivers/spi/mxs_spi.c | 12 ++- include/configs/MPC8536DS.h | 1 + include/configs/P1010RDB.h | 5 +- include/configs/P1_P2_RDB.h | 1 + include/configs/P2020COME.h | 1 + include/configs/P2020DS.h | 1 + include/configs/P2041RDB.h | 1 + include/configs/PM826.h | 2 - include/configs/PM828.h | 2 - include/configs/cam_enc_4xx.h | 1 - include/configs/coreboot.h | 6 -- include/configs/corenet_ds.h | 1 + include/configs/ecovec.h | 1 - include/configs/efikamx.h | 1 - include/configs/enbw_cmc.h | 1 - include/configs/ethernut5.h | 1 - include/configs/flea3.h | 1 - include/configs/m28evk.h | 1 - include/configs/mx6qarm2.h | 2 + include/configs/mx6qsabrelite.h | 15 +++- include/configs/omap3_evm_common.h | 1 - include/configs/omap3_mvblx.h | 1 - include/configs/p1_p2_rdb_pc.h | 7 +-- include/configs/tam3517-common.h | 1 - include/configs/tt01.h | 12 +++ include/mc13783.h | 80 +++++++++++++++++ tools/imximage.c | 8 +- tools/imximage.h | 2 + 43 files changed, 358 insertions(+), 106 deletions(-)
Quoted 1 line
create mode 100644
include/mc13783.h
Applied to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.