Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On Sat, 11 May 2013 09:30:57 +0200, Albert ARIBAUD
albert.u.b...@aribaud.net wrote:
Hi Stefano,
On Tue, 07 May 2013 09:55:08 +0200, Stefano Babic sba...@denx.de
wrote:
Hi Albert,
please pull from u-boot-imx, thanks !
The following changes since commit f2e8a87305a55652488af140adcf65b1e688f287:
exynos: fdt: Add TMU node for snow (2013-04-17 10:00:44 +0900)
are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master
for you to fetch changes up to d782c1fe7246301143ed78c0d86ea6c81f9325f9:
arm: mxs: video: Enable MXS LCDIF on M28EVK (2013-05-06 17:40:23 +0200)
Benoît Thébaudeau (40):
imx: Homogenize and fix fuse register definitions
imx: Add useful fuse definitions
Add fuse API and commands
Add fsl_iim driver
mpc: iim: Switch to common fsl_iim
mx51evk: Enable support for iim
Add mxc_ocotp driver
mx6qsabrelite: Enable support for ocotp
nitrogen6x: Enable support for ocotp
imx: Document fuse assignments for MAC addresses
imx: iomux-v3: Fix common pad control definitions
imx: iomux-v3: cosmetic: Reorganize definitions
imx: iomux-v3: Restore Linux's NEW_PAD_CTRL() macro
imx: iomux-v3: Include PKE and PUE to pad control pull definitions
imx: iomux-v3: Add iomux-mx25.h
imx: mx25pdk: Convert to iomux-v3
imx: mx25pdk: Fix GPIO assignments
imx: tx25: Convert to iomux-v3
imx: zmx25: Convert to iomux-v3
imx: mx25: Remove legacy iomux support
imx: iomux-v3: Add iomux-mx35.h
imx: flea3: Convert to iomux-v3
imx: mx35pdk: Fix WDOG_RST iomux function
imx: mx35pdk: Convert to iomux-v3
imx: woodburn: Convert to iomux-v3
imx: mx35: Remove legacy iomux support
imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27
imx: iomux-v3: Add missing definitions to iomux-mx51.h
imx: mx51evk: Convert to iomux-v3
imx: mx51_efikamx/sb: Convert to iomux-v3
imx: vision2: Convert to iomux-v3
imx: iomux-v3: Add iomux-mx53.h
imx: ima3-mx53: Convert to iomux-v3
imx: mx53ard: Convert to iomux-v3
imx: mx53evk: Convert to iomux-v3
imx: mx53loco: Convert to iomux-v3
imx: mx53smd: Convert to iomux-v3
imx: m53evk: Convert to iomux-v3
imx: mx5: Remove legacy iomux support
imx: mx35pdk: Fix MUX2_CTR GPIO
Eric Benard (1):
mx28evk: add trimffs to nand command
Fabio Estevam (22):
iomux-v3: Place pad control definitions into common file
mx6: Add solo-lite variant support
mx6sl: Add initial support for mx6slevk board
imx: mx6q_4x_mt41j128.cfg: Setup CCM_CCOSR register
nitrogen6x: Setup CCM_CCOSR register
mx51evk: Update environment in order to allow booting a dt kernel
mx51evk: Do not force the rootfs type
mx5: Define a common get_board_rev()
mx5: Select CONFIG_REVISION_TAG
mx53ard: Move register masks into imx-regs.h
mx23: Put back RAM voltage level to its original value
mx23: Fix pad voltage selection bit
mx23evk: Fix DDR pin iomux settings
mx23_olinuxino: Fix DDR pin iomux settings
mxs: spl_mem_init: Fix comment about start bit
mxs: spl_mem_init: Remove erroneous DDR setting
mxs: spl_mem_init: Skip the initialization of some DRAM_CTL registers
mxs: spl_mem_init: Change EMI port priority
mx23: Operate DDR voltage supply at 2.5V
mx23evk: Do not set voltage selection bit for SSP pads
mx23_olinuxino: Do not set voltage selection bit for SSP pads
mxs: Explain why some mx23 DDR registers are not configured
Marek Vasut (13):
tools: arm: imx: Implement BOOT_OFFSET command for imximage
imx: Align the imximage header and payload to multiples of 4k
nand: Add SPL_NAND support to mxc_nand_spl
arm: imx: Pack u-boot.bin into uImage for SPL
arm: mx5: Add SPL support code to MX5
arm: mx5: Add NAND clock handling
arm: mx5: Add support for DENX M53EVK
arm: mx23: Fix VDDMEM misconfiguration
arm: mxs: Preprocess u-boot.bd so they contain full path
arm: mxs: Add LCDIF clock configuration function
arm: mxs: Add LCDIF registers for i.MX233
arm: mxs: Add MXS LCDIF driver
arm: mxs: video: Enable MXS LCDIF on M28EVK
Otavio Salvador (9):
mx6qsabre{sd, auto}: Add update_sd_firmware support
mx6qsabresd: Return status when initializing MMC
wandboard: Use env storage info for mmcdev/mmcpart
wandboard: Add update_sd_firmware support
wandboard: Add card detection for SOM MicroSD card
wandboard: Add support for Carrier Board MicroSD card
wandboard: Add boot selection support
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On 11/05/2013 11:15, Albert ARIBAUD wrote: Hi Albert, Applied to u-boot-arm/master (with two trivial merge resolutions), thanks! Seems like the trivial merge resolution was less trivial than I thought it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c the definitions for nand_init() and nand_deselect(). For some reason I missed it in the MAKEALL -a arm I did. Rolling back and fixing this. Please make modifications on top of your current tree - after your first e-mail, I have already pulled from u-boot-arm and pushed to the server. If you go back, I had to rebase my tree. Best regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Hi Stefano, On Sat, 11 May 2013 11:39:58 +0200, Stefano Babic sba...@denx.de wrote: On 11/05/2013 11:15, Albert ARIBAUD wrote: Hi Albert, Applied to u-boot-arm/master (with two trivial merge resolutions), thanks! Seems like the trivial merge resolution was less trivial than I thought it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c the definitions for nand_init() and nand_deselect(). For some reason I missed it in the MAKEALL -a arm I did. Rolling back and fixing this. Please make modifications on top of your current tree - after your first e-mail, I have already pulled from u-boot-arm and pushed to the server. If you go back, I had to rebase my tree. Argh! I had already had rolled back and have just finished testing. I can roll forward again if you confirm that the u-boot-arm/master branch you have is commit ec7023d. Otherwise, please push the u-boot-arm/master your are based on onto the u-boot-imx repo under a new branch name, e.g. git push ssh://gu-...@git.denx.de/u-boot-imx u-boot-arm/master:master-aa Best regards, Stefano Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Hi Stefano, On Sat, 11 May 2013 11:39:58 +0200, Stefano Babic sba...@denx.de wrote: On 11/05/2013 11:15, Albert ARIBAUD wrote: Hi Albert, Applied to u-boot-arm/master (with two trivial merge resolutions), thanks! Seems like the trivial merge resolution was less trivial than I thought it was -- I accidentally removed from drivers/mtd/nand/mxc_nand_spl.c the definitions for nand_init() and nand_deselect(). For some reason I missed it in the MAKEALL -a arm I did. Rolling back and fixing this. Please make modifications on top of your current tree - after your first e-mail, I have already pulled from u-boot-arm and pushed to the server. If you go back, I had to rebase my tree. Argh! I had already had rolled back and have just finished testing. I can roll forward again if you confirm that the u-boot-arm/master branch you have is commit ec7023d. Otherwise, please push the u-boot-arm/master your are based on onto the u-boot-imx repo under a new branch name, e.g. git push ssh://gu-...@git.denx.de/u-boot-imx u-boot-arm/master:master-aa Best regards, Stefano Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On 11/05/2013 11:47, Albert ARIBAUD wrote: Hi Stefano, Hi Albert, Argh! I had already had rolled back and have just finished testing. I can roll forward again if you confirm that the u-boot-arm/master branch you have is commit ec7023d. It is ! commit ec7023db8dc95966919589541f1ca09355a3f7a5 Merge: e825b10 d782c1f Author: Albert ARIBAUD albert.u.b...@aribaud.net Date: Sat May 11 09:25:36 2013 +0200 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Best regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On 11/05/2013 12:50, Stefano Babic wrote: On 11/05/2013 11:47, Albert ARIBAUD wrote: Hi Stefano, Hi Albert, Argh! I had already had rolled back and have just finished testing. I can roll forward again if you confirm that the u-boot-arm/master branch you have is commit ec7023d. It is ! commit ec7023db8dc95966919589541f1ca09355a3f7a5 Merge: e825b10 d782c1f Author: Albert ARIBAUD albert.u.b...@aribaud.net Date: Sat May 11 09:25:36 2013 +0200 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' I have also pushed u-boot-arm as you suggest with the name uboot_arm on u-boot-imx. Best regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Hi Stefano, On Sat, 11 May 2013 12:50:24 +0200, Stefano Babic sba...@denx.de wrote: On 11/05/2013 11:47, Albert ARIBAUD wrote: Hi Stefano, Hi Albert, Argh! I had already had rolled back and have just finished testing. I can roll forward again if you confirm that the u-boot-arm/master branch you have is commit ec7023d. It is ! Ok, but just a sec. If I put a commit above this, you'll *also* have to rebase, won't you? (BTW, I thought rebasing was frowned upon and we should merge instead.) Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Hi Stefano, On Sat, 11 May 2013 12:58:56 +0200, Stefano Babic sba...@denx.de wrote: On 11/05/2013 12:50, Stefano Babic wrote: On 11/05/2013 11:47, Albert ARIBAUD wrote: Hi Stefano, Hi Albert, Argh! I had already had rolled back and have just finished testing. I can roll forward again if you confirm that the u-boot-arm/master branch you have is commit ec7023d. It is ! commit ec7023db8dc95966919589541f1ca09355a3f7a5 Merge: e825b10 d782c1f Author: Albert ARIBAUD albert.u.b...@aribaud.net Date: Sat May 11 09:25:36 2013 +0200 Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' I have also pushed u-boot-arm as you suggest with the name uboot_arm on u-boot-imx. Er... Seems like arm_master is exactly the same as u-boot-imx/master. I thought your master was rebased upon my master? Best regards, Stefano Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On 11/05/2013 13:01, Albert ARIBAUD wrote: It is ! Ok, but just a sec. If I put a commit above this, you'll *also* have to rebase, won't you? Well, I have not yet published any iMX patches after merging u-boot-arm this morning. At this point, u-boot-imx is equal to u-boot-arm at commit commit ec7023, after you pulled u-boot-imx. There is no iMX patches after that, and that is the reason why it should work. See u-boot-imx, master: last commit is ec7023. If you put a commit above, I should merge again your u-boot-arm/master (and this should go flawless) and only after that I can apply iMX patches, that I have not yet published. (BTW, I thought rebasing was frowned upon and we should merge instead.) Of course ! We should only merge Best regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On 11/05/2013 13:07, Albert ARIBAUD wrote: Hi Stefano, Hi Albert, Er... Seems like arm_master is exactly the same as u-boot-imx/master. I thought your master was rebased upon my master? I haved pulled your master this morning, and there are not new iMX patches. Best regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Hi Stefano, On Sat, 11 May 2013 13:15:37 +0200, Stefano Babic sba...@denx.de wrote: On 11/05/2013 13:01, Albert ARIBAUD wrote: It is ! Ok, but just a sec. If I put a commit above this, you'll *also* have to rebase, won't you? Well, I have not yet published any iMX patches after merging u-boot-arm this morning. At this point, u-boot-imx is equal to u-boot-arm at commit commit ec7023, after you pulled u-boot-imx. There is no iMX patches after that, and that is the reason why it should work. See u-boot-imx, master: last commit is ec7023. If you put a commit above, I should merge again your u-boot-arm/master (and this should go flawless) and only after that I can apply iMX patches, that I have not yet published. (BTW, I thought rebasing was frowned upon and we should merge instead.) Of course ! We should only merge Ok, so I prefer getting things right before I proceed: after I merged your PR, you did not rebase your master, you (fast-forward) merged my master to it. What you have rebased is your next branch, right? Best regards, Stefano Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
On 11/05/2013 13:26, Albert ARIBAUD wrote: Of course ! We should only merge Ok, so I prefer getting things right before I proceed: after I merged your PR, you did not rebase your master, Right ! Never ! you (fast-forward) merged my master to it. Correct ! What you have rebased is your next branch, right? Right ! Best regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction
Hi Stefano, On Sat, 11 May 2013 13:36:45 +0200, Stefano Babic sba...@denx.de wrote: Correct ! Ok - ARM repo rolled forward to ec7023db and patch sent to the list. Ack it and I'll apply it onto ARM repo. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PULL] : Please pull u-boot-imx - correction done
Hi Albert, On Sat, 11 May 2013 16:32:18 +0200, Albert ARIBAUD albert.u.b...@aribaud.net wrote: Hi Stefano, On Sat, 11 May 2013 13:36:45 +0200, Stefano Babic sba...@denx.de wrote: Correct ! Ok - ARM repo rolled forward to ec7023db and patch sent to the list. Ack it and I'll apply it onto ARM repo. Patch applied, ARM repo back to 100% build-clean. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
