| Message ID | 514327FE.5050809@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Stefano, On Fri, 15 Mar 2013 14:54:06 +0100, Stefano Babic <sbabic@denx.de> wrote: > Hi Albert, > > here an update pull request after applying Fabio's fixes. > > The following changes since commit 4cfc611b4a4ce009cfad46804bec2a1caad8e329: > > ARM: ns9750dev: remove remainders of dead board (2013-02-28 14:49:24 > +0100) > > are available in the git repository at: > > git://www.denx.de/git/u-boot-imx.git master > > for you to fetch changes up to 19a0f7fa271de0345bb2df90d443c547c41e8037: > > nitrogen: Use unsigned long to specify the total RAM size (2013-03-15 > 14:39:44 +0100) > > ---------------------------------------------------------------- > Benoît Thébaudeau (6): > imx: mx6q DDR3 init: Fix tMRD > imx: mx6q DDR3 init: Fix tXPR > imx: mx6q DDR3 init: Fix SDE_to_RST > imx: mx6q DDR3 init: Fix RST_to_CKE > imx: mx6q DDR3 init: Fix MR0.PPD > imx: mx6q DDR3 init: Benefit from available CL = 7 > > Eric Nelson (8): > i.MX6Q: mx6qsabre*: Configure to allow CONFIG_SYS_ALT_MEMTEST > i.MX6: mx6qsabrelite: indent with tabs > i.MX6: consolidate pad names for multi-CPU boards > i.MX6: crm_regs: define CCM_CCGRx for use in board config files > i.MX6: crm_regs: define IOMUXC_GPR4/6/7 > i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO > i.MX6: Add DDR controller registers > Add Boundary Devices Nitrogen6X boards > > Fabio Estevam (6): > mx6: Disable Power Down Bit of watchdog > mx23evk: Remove CONFIG_SYS_BAUDRATE_TABLE > mx23evk: Turn on caches > common: cmd_sata: Fix usage text for 'sata init' > mx6: Provide a structure for accessing HDMI registers > nitrogen6x: Fix RAM size variable > > Fadil Berisha (2): > mxs: timrot: Add support to i.MX23 > mxs: timrot: Rename local macros > > Marek Vasut (7): > mxs: Reset the EMI block on mx23 > mxs: mmc: spi: dma: Better wrap the MXS differences > mxs: spi: Fix the MXS SPI for mx23 > mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE > mxs: Squash the header file usage in ehci-mxs > mxs: Make ehci-mxs multiport capable > mxs: m28: Enable power to USB port 0 > > Otavio Salvador (11): > build: imx: Fix 'u-boot.imx' build without full OBJTREE reference > mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to > CONFIG_SPL_MXS_PSWITCH_WAIT > mx23: Document the tRAS lockout setting in memory initialization > mx23evk: Adjust DRAM control register to use full 128MB of RAM > led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set > mxs: Fix iomux.h to not break build during assembly stage > mx23_olinuxino: Add support for status LED > mx23evk: Enable USB support > mx23_olinuxino: Enable USB support > mx23_olinuxino: Add ethernet support > mx23_olinuxino: Fix warning for implicit declaration > > Stefano Babic (3): > Merge branch 'master' of git://git.denx.de/u-boot-arm > Merge branch 'master' of git://git.denx.de/u-boot-arm > USB: drop unneeded header in ehci-mx6 > > Stephen Warren (1): > ARM: mx6: use common CPU errata config options > > fabio.estevam@freescale.com (1): > nitrogen: Use unsigned long to specify the total RAM size > > MAINTAINERS | 8 + > Makefile | 4 +- > arch/arm/cpu/arm926ejs/config.mk | 2 +- > arch/arm/cpu/arm926ejs/mxs/clock.c | 3 +- > arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- > arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 16 +- > arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- > arch/arm/cpu/arm926ejs/mxs/timer.c | 39 +- > arch/arm/cpu/armv7/Makefile | 2 +- > arch/arm/cpu/armv7/config.mk | 2 +- > arch/arm/cpu/armv7/mx6/Makefile | 1 - > arch/arm/cpu/armv7/mx6/lowlevel_init.S | 35 - > arch/arm/cpu/armv7/mx6/soc.c | 16 + > arch/arm/include/asm/arch-mx6/crm_regs.h | 12 + > arch/arm/include/asm/arch-mx6/imx-regs.h | 8 + > arch/arm/include/asm/arch-mx6/iomux.h | 5 + > arch/arm/include/asm/arch-mx6/mx6-ddr.h | 85 + > arch/arm/include/asm/arch-mx6/mx6-pins.h | 31 + > arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 71 + > arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 193 +-- > arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 69 + > arch/arm/include/asm/arch-mx6/mx6q_pins.h | 1671 > ++++++++++++++++++++ > arch/arm/include/asm/arch-mx6/mx6x_pins.h | 1671 > -------------------- > arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 1083 ++++++------- > arch/arm/include/asm/arch-mxs/dma.h | 19 +- > arch/arm/include/asm/arch-mxs/imx-regs.h | 2 + > arch/arm/include/asm/arch-mxs/iomux.h | 5 + > arch/arm/include/asm/arch-mxs/regs-ssp.h | 26 + > arch/arm/include/asm/arch-mxs/regs-timrot.h | 101 ++ > board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 58 + > board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 58 + > board/boundary/nitrogen6x/6x_bootscript.txt | 63 + > .../boundary/nitrogen6x/6x_bootscript_android.txt | 64 + > .../nitrogen6x/6x_bootscript_android_recovery.txt | 64 + > board/boundary/nitrogen6x/6x_upgrade.txt | 45 + > board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 58 + > board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 58 + > board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 57 + > board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 58 + > board/boundary/nitrogen6x/Makefile | 41 + > board/boundary/nitrogen6x/README | 92 ++ > board/boundary/nitrogen6x/clocks.cfg | 46 + > board/boundary/nitrogen6x/ddr-setup.cfg | 112 ++ > board/boundary/nitrogen6x/nitrogen6dl.cfg | 45 + > board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 45 + > board/boundary/nitrogen6x/nitrogen6q.cfg | 45 + > board/boundary/nitrogen6x/nitrogen6q2g.cfg | 45 + > board/boundary/nitrogen6x/nitrogen6s.cfg | 45 + > board/boundary/nitrogen6x/nitrogen6s1g.cfg | 45 + > board/boundary/nitrogen6x/nitrogen6x.c | 895 +++++++++++ > board/denx/m28evk/m28evk.c | 4 + > board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg | 10 +- > board/freescale/mx23evk/spl_boot.c | 10 + > board/freescale/mx6qarm2/mx6qarm2.c | 78 +- > board/freescale/mx6qsabreauto/mx6qsabreauto.c | 60 +- > board/freescale/mx6qsabrelite/mx6qsabrelite.c | 292 ++-- > board/freescale/mx6qsabresd/mx6qsabresd.c | 102 +- > board/olimex/mx23_olinuxino/mx23_olinuxino.c | 13 + > board/olimex/mx23_olinuxino/spl_boot.c | 8 + > boards.cfg | 6 + > common/cmd_led.c | 6 +- > common/cmd_sata.c | 2 +- > drivers/mmc/mxsmmc.c | 20 +- > drivers/spi/mxs_spi.c | 39 +- > drivers/usb/host/ehci-mx6.c | 1 - > drivers/usb/host/ehci-mxs.c | 155 +- > include/configs/apx4devkit.h | 3 +- > include/configs/m28evk.h | 5 +- > include/configs/mx23_olinuxino.h | 64 +- > include/configs/mx23evk.h | 14 +- > include/configs/mx28evk.h | 4 +- > include/configs/mx6_common.h | 23 + > include/configs/mx6qarm2.h | 3 + > include/configs/mx6qsabre_common.h | 4 + > include/configs/mx6qsabrelite.h | 4 + > include/configs/nitrogen6x.h | 285 ++++ > include/configs/sc_sps_1.h | 3 +- > 77 files changed, 5683 insertions(+), 2758 deletions(-) > delete mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S > create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h > create mode 100644 arch/arm/include/asm/arch-mx6/mx6-pins.h > create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h > create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h > create mode 100644 arch/arm/include/asm/arch-mx6/mx6q_pins.h > delete mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h > create mode 100644 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg > create mode 100644 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg > create mode 100644 board/boundary/nitrogen6x/6x_bootscript.txt > create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android.txt > create mode 100644 > board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt > create mode 100644 board/boundary/nitrogen6x/6x_upgrade.txt > create mode 100644 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg > create mode 100644 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg > create mode 100644 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg > create mode 100644 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg > create mode 100644 board/boundary/nitrogen6x/Makefile > create mode 100644 board/boundary/nitrogen6x/README > create mode 100644 board/boundary/nitrogen6x/clocks.cfg > create mode 100644 board/boundary/nitrogen6x/ddr-setup.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6dl.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6dl2g.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6q.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6q2g.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6s.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6s1g.cfg > create mode 100644 board/boundary/nitrogen6x/nitrogen6x.c > create mode 100644 include/configs/mx6_common.h > create mode 100644 include/configs/nitrogen6x.h > > > Best regards, > Stefano > Applied to u-boot-arm/master, thanks! Amicalement,
Hi Stefano,
On Fri, Mar 15, 2013 at 3:51 PM, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:
> Applied to u-boot-arm/master, thanks!
Could you please merge u-boot-arm/master back into u-boot-imx/master?
On 15/03/2013 21:16, Otavio Salvador wrote: > Hi Stefano, > Hi Otavio, > On Fri, Mar 15, 2013 at 3:51 PM, Albert ARIBAUD > <albert.u.boot@aribaud.net> wrote: >> Applied to u-boot-arm/master, thanks! > > Could you please merge u-boot-arm/master back into u-boot-imx/master? > Done ! Regards, Stefano
Hi Albert, here an update pull request after applying Fabio's fixes. The following changes since commit 4cfc611b4a4ce009cfad46804bec2a1caad8e329: ARM: ns9750dev: remove remainders of dead board (2013-02-28 14:49:24 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 19a0f7fa271de0345bb2df90d443c547c41e8037: nitrogen: Use unsigned long to specify the total RAM size (2013-03-15 14:39:44 +0100) ---------------------------------------------------------------- Benoît Thébaudeau (6): imx: mx6q DDR3 init: Fix tMRD imx: mx6q DDR3 init: Fix tXPR imx: mx6q DDR3 init: Fix SDE_to_RST imx: mx6q DDR3 init: Fix RST_to_CKE imx: mx6q DDR3 init: Fix MR0.PPD imx: mx6q DDR3 init: Benefit from available CL = 7 Eric Nelson (8): i.MX6Q: mx6qsabre*: Configure to allow CONFIG_SYS_ALT_MEMTEST i.MX6: mx6qsabrelite: indent with tabs i.MX6: consolidate pad names for multi-CPU boards i.MX6: crm_regs: define CCM_CCGRx for use in board config files i.MX6: crm_regs: define IOMUXC_GPR4/6/7 i.MX6DL: define IOMUX pads NANDF_CS1-3 for use as GPIO i.MX6: Add DDR controller registers Add Boundary Devices Nitrogen6X boards Fabio Estevam (6): mx6: Disable Power Down Bit of watchdog mx23evk: Remove CONFIG_SYS_BAUDRATE_TABLE mx23evk: Turn on caches common: cmd_sata: Fix usage text for 'sata init' mx6: Provide a structure for accessing HDMI registers nitrogen6x: Fix RAM size variable Fadil Berisha (2): mxs: timrot: Add support to i.MX23 mxs: timrot: Rename local macros Marek Vasut (7): mxs: Reset the EMI block on mx23 mxs: mmc: spi: dma: Better wrap the MXS differences mxs: spi: Fix the MXS SPI for mx23 mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE mxs: Squash the header file usage in ehci-mxs mxs: Make ehci-mxs multiport capable mxs: m28: Enable power to USB port 0 Otavio Salvador (11): build: imx: Fix 'u-boot.imx' build without full OBJTREE reference mxs: Rename CONFIG_SPL_MX28_PSWITCH_WAIT to CONFIG_SPL_MXS_PSWITCH_WAIT mx23: Document the tRAS lockout setting in memory initialization mx23evk: Adjust DRAM control register to use full 128MB of RAM led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set mxs: Fix iomux.h to not break build during assembly stage mx23_olinuxino: Add support for status LED mx23evk: Enable USB support mx23_olinuxino: Enable USB support mx23_olinuxino: Add ethernet support mx23_olinuxino: Fix warning for implicit declaration Stefano Babic (3): Merge branch 'master' of git://git.denx.de/u-boot-arm Merge branch 'master' of git://git.denx.de/u-boot-arm USB: drop unneeded header in ehci-mx6 Stephen Warren (1): ARM: mx6: use common CPU errata config options fabio.estevam@freescale.com (1): nitrogen: Use unsigned long to specify the total RAM size MAINTAINERS | 8 + Makefile | 4 +- arch/arm/cpu/arm926ejs/config.mk | 2 +- arch/arm/cpu/arm926ejs/mxs/clock.c | 3 +- arch/arm/cpu/arm926ejs/mxs/mxs_init.h | 2 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 16 +- arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 2 +- arch/arm/cpu/arm926ejs/mxs/timer.c | 39 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/config.mk | 2 +- arch/arm/cpu/armv7/mx6/Makefile | 1 - arch/arm/cpu/armv7/mx6/lowlevel_init.S | 35 - arch/arm/cpu/armv7/mx6/soc.c | 16 + arch/arm/include/asm/arch-mx6/crm_regs.h | 12 + arch/arm/include/asm/arch-mx6/imx-regs.h | 8 + arch/arm/include/asm/arch-mx6/iomux.h | 5 + arch/arm/include/asm/arch-mx6/mx6-ddr.h | 85 + arch/arm/include/asm/arch-mx6/mx6-pins.h | 31 + arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 71 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 193 +-- arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 69 + arch/arm/include/asm/arch-mx6/mx6q_pins.h | 1671 ++++++++++++++++++++ arch/arm/include/asm/arch-mx6/mx6x_pins.h | 1671 -------------------- arch/arm/include/asm/arch-mx6/mxc_hdmi.h | 1083 ++++++------- arch/arm/include/asm/arch-mxs/dma.h | 19 +- arch/arm/include/asm/arch-mxs/imx-regs.h | 2 + arch/arm/include/asm/arch-mxs/iomux.h | 5 + arch/arm/include/asm/arch-mxs/regs-ssp.h | 26 + arch/arm/include/asm/arch-mxs/regs-timrot.h | 101 ++ board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg | 58 + board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg | 58 + board/boundary/nitrogen6x/6x_bootscript.txt | 63 + .../boundary/nitrogen6x/6x_bootscript_android.txt | 64 + .../nitrogen6x/6x_bootscript_android_recovery.txt | 64 + board/boundary/nitrogen6x/6x_upgrade.txt | 45 + board/boundary/nitrogen6x/800mhz_2x128mx16.cfg | 58 + board/boundary/nitrogen6x/800mhz_2x256mx16.cfg | 58 + board/boundary/nitrogen6x/800mhz_4x128mx16.cfg | 57 + board/boundary/nitrogen6x/800mhz_4x256mx16.cfg | 58 + board/boundary/nitrogen6x/Makefile | 41 + board/boundary/nitrogen6x/README | 92 ++ board/boundary/nitrogen6x/clocks.cfg | 46 + board/boundary/nitrogen6x/ddr-setup.cfg | 112 ++ board/boundary/nitrogen6x/nitrogen6dl.cfg | 45 + board/boundary/nitrogen6x/nitrogen6dl2g.cfg | 45 + board/boundary/nitrogen6x/nitrogen6q.cfg | 45 + board/boundary/nitrogen6x/nitrogen6q2g.cfg | 45 + board/boundary/nitrogen6x/nitrogen6s.cfg | 45 + board/boundary/nitrogen6x/nitrogen6s1g.cfg | 45 + board/boundary/nitrogen6x/nitrogen6x.c | 895 +++++++++++ board/denx/m28evk/m28evk.c | 4 + board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg | 10 +- board/freescale/mx23evk/spl_boot.c | 10 + board/freescale/mx6qarm2/mx6qarm2.c | 78 +- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 60 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 292 ++-- board/freescale/mx6qsabresd/mx6qsabresd.c | 102 +- board/olimex/mx23_olinuxino/mx23_olinuxino.c | 13 + board/olimex/mx23_olinuxino/spl_boot.c | 8 + boards.cfg | 6 + common/cmd_led.c | 6 +- common/cmd_sata.c | 2 +- drivers/mmc/mxsmmc.c | 20 +- drivers/spi/mxs_spi.c | 39 +- drivers/usb/host/ehci-mx6.c | 1 - drivers/usb/host/ehci-mxs.c | 155 +- include/configs/apx4devkit.h | 3 +- include/configs/m28evk.h | 5 +- include/configs/mx23_olinuxino.h | 64 +- include/configs/mx23evk.h | 14 +- include/configs/mx28evk.h | 4 +- include/configs/mx6_common.h | 23 + include/configs/mx6qarm2.h | 3 + include/configs/mx6qsabre_common.h | 4 + include/configs/mx6qsabrelite.h | 4 + include/configs/nitrogen6x.h | 285 ++++ include/configs/sc_sps_1.h | 3 +- 77 files changed, 5683 insertions(+), 2758 deletions(-) delete mode 100644 arch/arm/cpu/armv7/mx6/lowlevel_init.S create mode 100644 arch/arm/include/asm/arch-mx6/mx6-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6-pins.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6dl-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q-ddr.h create mode 100644 arch/arm/include/asm/arch-mx6/mx6q_pins.h delete mode 100644 arch/arm/include/asm/arch-mx6/mx6x_pins.h create mode 100644 board/boundary/nitrogen6x/1066mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/1066mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/6x_bootscript.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android.txt create mode 100644 board/boundary/nitrogen6x/6x_bootscript_android_recovery.txt create mode 100644 board/boundary/nitrogen6x/6x_upgrade.txt create mode 100644 board/boundary/nitrogen6x/800mhz_2x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_2x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x128mx16.cfg create mode 100644 board/boundary/nitrogen6x/800mhz_4x256mx16.cfg create mode 100644 board/boundary/nitrogen6x/Makefile create mode 100644 board/boundary/nitrogen6x/README create mode 100644 board/boundary/nitrogen6x/clocks.cfg create mode 100644 board/boundary/nitrogen6x/ddr-setup.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6dl2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6q2g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6s1g.cfg create mode 100644 board/boundary/nitrogen6x/nitrogen6x.c create mode 100644 include/configs/mx6_common.h create mode 100644 include/configs/nitrogen6x.h Best regards, Stefano