Skip to contentSkip to conversation

Pull request: u-boot-arm/master

U-Boot New Albert ARIBAUD 2 participants 3 messages Jan 14, 2013

lore
Share & tools
lore
#0 lore raw

Hello Tom,

The following changes since commit
fd70aa41468be4324275910f85578cb5be6a0439:

m68k/lib: fix serial driver relocation (2013-01-11 14:41:14 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-arm.git master

for you to fetch changes up to a17617d6553369ba72c080128ed8d0b0c33dfc89:

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-14 17:00:02 +0100)

----------------------------------------------------------------

Ajay Kumar (8):
EXYNOS5: Add support for FIMD and DP
EXYNOS5: Change parent clock of FIMD to MPLL
EXYNOS: Add dummy definition to fix compilation dependency on
CONFIG_EXYNOS_MIPI_DSIM video: Modify exynos_fimd driver to support LCD console EXYNOS5: Make all display related code dependent on CONFIG_LCD
EXYNOS5: Enable console multiplexing in u-boot
video: exynos_dp: Remove unused variable disp_info
video: exynos_fb: Make a call to draw_logo only when
CONFIG_CMD_BMP is selected

Albert ARIBAUD (2):
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Bo Shen (1):
arm: at91sam9x5: add dataflash boot support

Chander Kashyap (4):
EXYNOS: EXYNOS4X12: Populate Exynos4x12 register addresses
EXYNOS: EXYNOS4X12: Add clock structure for EXYNOS4X12
EXYNOS: EXYNOS4X12: Add gpio structure for EXYNOS4X12
EXYNOS: EXYNOS4X12: extract Exynos4x12 IPs clock frequency

Fabio Estevam (4):
mx6: Add workaround for ARM errata
mx53loco: Add support for SEIKO 4.3'' WVGA panel
mx6qsabresd: Fix booting the kernel from SDHC3
mx51evk: Add DVI output support

Hatim RV (5):
EXYNOS5: FDT: add initial dts file for EXYNOS5250, SMDK5250
fdt: exynos5: Add DT node definition for SROM and SMSC9215
exynos5: Add DT based driver for SMC911X ethernet
exynos5: config: Rename the smdk5250.h to exynos5250-dt.h
SMDK5250: config: Add configuration file for SMDK5250 board

Jaehoon Chung (2):
Exynos: clock: support get_mmc_clk for exynos
Exynos: clock: add CLK_DIV_FSYS3 at set_mmc_clk

Otavio Salvador (6):
mx6qsabrelite: Use tabs to environment setting
mx28evk: We shouldn't hardcode a rootfs filesystem type
mx28evk: Add support to dynamically choose between fdt use or not
mx53loco: Add support to dynamically choose between fdt use or not
mx6qsabrelite: Add support to dynamically choose between fdt use
or not mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not

Piotr Wilczek (1):
arm:exynos4:pinmux: Modify the gpio function for mmc

Rajeshwari Shinde (23):
EXYNOS5: FDT: Add I2C device node data EXYNOS5 : FDT: Add Aliases for I2C device
FDT: Add compatible string for I2C
EXYNOS5: FDT : Decode peripheral id
I2C: Driver changes for FDT support
SMDK5250: Initialise I2C using FDT
EXYNOS5: FDT: Add sound device node data
EXYNOS5: FDT: Add sound and codec device node
EXYNOS5: FDT: Add compatible strings for sound
Sound: Add FDT support to driver
Sound: WM8994: Add FDT support to codec
Sound: Add FDT support to CMD.
EXYNOS5: FDT: Add compatible strings for SPI EXYNOS5 : FDT: Add Aliases for SPI device
EXYNOS5: FDT: Add SPI device node data
SPI: EXYNOS: Add FDT support to driver.
EHCI: Exynos: Add fdt support
EXYNOS5: Add device node for USB.
EXYNOS5: FDT: Add compatible strings for USB
EXYNOS5: FDT: Add compatible strings for PMIC
EXYNOS5: Add device node for PMIC
PMIC: MAX77686: Add FDT Support
I2C: S3C24X0: Resolve build error for VCMA9

Troy Kisky (1):

      mx31/mx35/mx51/mx53/mx6: add watchdog

Vivek Gautam (1):
SMDK5250: Enable VBus for USB 2.0 controller

?ukasz Majewski (2):
spl:falcon:trats Update Trats default board configuration file to
support FALCON MODE video:cache:fix: Enable dcache flush at LCD subsystem for Exynos based boards

 arch/arm/cpu/arm1136/mx31/timer.c            |   39 ----
 arch/arm/cpu/arm1136/mx35/generic.c          |    6 -
 arch/arm/cpu/armv7/exynos/clock.c            |  272
 +++++++++++++++++++++- arch/arm/cpu/armv7/exynos/pinmux.c
 |   74 ++++++ arch/arm/cpu/armv7/mx6/lowlevel_init.S       |   10 +
 arch/arm/dts/exynos5250.dtsi                 |  154 ++++++++++++
 arch/arm/imx-common/cpu.c                    |    5 -
 arch/arm/include/asm/arch-exynos/clk.h       |    1 +
 arch/arm/include/asm/arch-exynos/clock.h     |  276
 ++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/cpu.h
 |   48 +++- arch/arm/include/asm/arch-exynos/dp_info.h   |    2 +
 arch/arm/include/asm/arch-exynos/gpio.h      |   85 +++++++
 arch/arm/include/asm/arch-exynos/mipi_dsim.h |    7 +
 arch/arm/include/asm/arch-exynos/periph.h    |   33 +--
 arch/arm/include/asm/arch-exynos/pinmux.h    |    8 +
 arch/arm/include/asm/arch-exynos/sromc.h     |   18 ++
 arch/arm/include/asm/arch-mx31/clock.h       |    2 -
 arch/arm/include/asm/arch-mx31/imx-regs.h    |   13 +-
 arch/arm/include/asm/arch-mx35/imx-regs.h    |   11 +-
 arch/arm/include/asm/arch-mx5/imx-regs.h     |   10 -
 board/davedenx/qong/qong.c                   |    9 +-
 board/freescale/mx31pdk/mx31pdk.c            |    9 +-
 board/freescale/mx51evk/mx51evk.c            |    2 -
 board/freescale/mx51evk/mx51evk_video.c      |   39 +++-
 board/freescale/mx53loco/mx53loco.c          |    2 -
 board/freescale/mx53loco/mx53loco_video.c    |   38 ++-
 board/hale/tt01/tt01.c                       |    2 +-
 board/samsung/dts/exynos5250-smdk5250.dts    |   69 ++++++
 board/samsung/smdk5250/smdk5250.c            |  237 +++++++++++++++----
 board/samsung/trats/trats.c                  |    2 +-
 boards.cfg                                   |    1 +
 common/cmd_sound.c                           |    2 +-
 doc/README.watchdog                          |   29 +++
 doc/device-tree-bindings/exynos/isp-spi.txt  |   22 ++
 doc/device-tree-bindings/exynos/sound.txt    |   27 +++
 drivers/i2c/s3c24x0_i2c.c                    |   85 ++++++-
 drivers/i2c/s3c24x0_i2c.h                    |    7 +
 drivers/power/pmic/pmic_max77686.c           |   37 ++-
 drivers/sound/sound.c                        |  171 ++++++++------
 drivers/sound/wm8994.c                       |   74 +++++-
 drivers/sound/wm8994.h                       |    6 +-
 drivers/spi/exynos_spi.c                     |   96 +++++++-
 drivers/usb/host/ehci-exynos.c               |   92 +++++++-
 drivers/video/exynos_dp.c                    |    2 -
 drivers/video/exynos_fb.c                    |    7 +
 drivers/video/exynos_fimd.c                  |   12 +-
 drivers/watchdog/Makefile                    |    3 +
 drivers/watchdog/imx_watchdog.c              |   66 ++++++
 include/configs/at91sam9x5ek.h               |   10 +
 include/configs/exynos5250-dt.h              |  321
 ++++++++++++++++++++++++++
 include/configs/mx28evk.h                    |   47 +++-
 include/configs/mx31pdk.h                    |    1 +
 include/configs/mx53loco.h                   |   44 +++-
 include/configs/mx6qsabre_common.h           |   43 +++-
 include/configs/mx6qsabreauto.h              |    1 +
 include/configs/mx6qsabrelite.h              |  101 +++++---
 include/configs/mx6qsabresd.h                |    3 +-
 include/configs/qong.h                       |    1 +
 include/configs/smdk5250.h                   |  278
 +--------------------- include/configs/trats.h
 |   45 +++- include/fdtdec.h                             |    9 +
 include/i2c.h                                |   26 +++
 include/sound.h                              |    4 +-
 include/watchdog.h                           |    1 +
 lib/fdtdec.c                                 |    9 + 65 files

changed, 2558 insertions(+), 608 deletions(-) create mode 100644 arch/arm/dts/exynos5250.dtsi create mode 100644 board/samsung/dts/exynos5250-smdk5250.dts create mode 100644 doc/README.watchdog create mode 100644 doc/device-tree-bindings/exynos/isp-spi.txt create mode 100644 doc/device-tree-bindings/exynos/sound.txt create mode 100644 drivers/watchdog/imx_watchdog.c create mode 100644 include/configs/exynos5250-dt.h

Amicalement,

Signature · 1 line
Albert.
#1 lore raw

PATCH 1/1 watchdog.h: Move hw_watchdog_init prototype to end, guard

In commit abbab70 we added a prototype for hw_watchdog_init, in a Freescale i.MX watchdog driver. We did not however guard it with an __ASSEMBLY__ check and broke some platforms. Move this to the end of the file with other prototypes and guard it.

---
 include/watchdog.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/watchdog.h +4 -1
index 328a30b..8c92a0b 100644
@@ -35,7 +35,6 @@
  * Hardware watchdog
  */
 #ifdef CONFIG_HW_WATCHDOG
-	void hw_watchdog_init(void);
 	#if defined(__ASSEMBLY__)
 		#define WATCHDOG_RESET bl hw_watchdog_reset
 	#else
@@ -91,4 +90,8 @@
 	void reset_4xx_watchdog(void);
 #endif
 
+/* Freescale i.MX */
+#if defined(CONFIG_IMX_WATCHDOG) && !defined(__ASSEMBLY__)
+	void hw_watchdog_init(void);
+#endif
 #endif /* _WATCHDOG_H_ */
Signature · 1 line
1.7.9.5
#2 lore raw
In reply to Albert ARIBAUD
Quoted 173 lines · Albert ARIBAUD

Hello Tom,

The following changes since commit
fd70aa41468be4324275910f85578cb5be6a0439:

m68k/lib: fix serial driver relocation (2013-01-11 14:41:14 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-arm.git master

for you to fetch changes up to a17617d6553369ba72c080128ed8d0b0c33dfc89:

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' (2013-01-14 17:00:02 +0100)

----------------------------------------------------------------

Ajay Kumar (8):
EXYNOS5: Add support for FIMD and DP
EXYNOS5: Change parent clock of FIMD to MPLL
EXYNOS: Add dummy definition to fix compilation dependency on
CONFIG_EXYNOS_MIPI_DSIM video: Modify exynos_fimd driver to support LCD console EXYNOS5: Make all display related code dependent on CONFIG_LCD
EXYNOS5: Enable console multiplexing in u-boot
video: exynos_dp: Remove unused variable disp_info
video: exynos_fb: Make a call to draw_logo only when
CONFIG_CMD_BMP is selected

Albert ARIBAUD (2):
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Bo Shen (1):
arm: at91sam9x5: add dataflash boot support

Chander Kashyap (4):
EXYNOS: EXYNOS4X12: Populate Exynos4x12 register addresses
EXYNOS: EXYNOS4X12: Add clock structure for EXYNOS4X12
EXYNOS: EXYNOS4X12: Add gpio structure for EXYNOS4X12
EXYNOS: EXYNOS4X12: extract Exynos4x12 IPs clock frequency

Fabio Estevam (4):
mx6: Add workaround for ARM errata
mx53loco: Add support for SEIKO 4.3'' WVGA panel
mx6qsabresd: Fix booting the kernel from SDHC3
mx51evk: Add DVI output support

Hatim RV (5):
EXYNOS5: FDT: add initial dts file for EXYNOS5250, SMDK5250
fdt: exynos5: Add DT node definition for SROM and SMSC9215
exynos5: Add DT based driver for SMC911X ethernet
exynos5: config: Rename the smdk5250.h to exynos5250-dt.h
SMDK5250: config: Add configuration file for SMDK5250 board

Jaehoon Chung (2):
Exynos: clock: support get_mmc_clk for exynos
Exynos: clock: add CLK_DIV_FSYS3 at set_mmc_clk

Otavio Salvador (6):
mx6qsabrelite: Use tabs to environment setting
mx28evk: We shouldn't hardcode a rootfs filesystem type
mx28evk: Add support to dynamically choose between fdt use or not
mx53loco: Add support to dynamically choose between fdt use or not
mx6qsabrelite: Add support to dynamically choose between fdt use
or not mx6qsabre{auto, sd}: Add support to dynamically choose between fdt use or not

Piotr Wilczek (1):
arm:exynos4:pinmux: Modify the gpio function for mmc

Rajeshwari Shinde (23):
EXYNOS5: FDT: Add I2C device node data EXYNOS5 : FDT: Add Aliases for I2C device
FDT: Add compatible string for I2C
EXYNOS5: FDT : Decode peripheral id
I2C: Driver changes for FDT support
SMDK5250: Initialise I2C using FDT
EXYNOS5: FDT: Add sound device node data
EXYNOS5: FDT: Add sound and codec device node
EXYNOS5: FDT: Add compatible strings for sound
Sound: Add FDT support to driver
Sound: WM8994: Add FDT support to codec
Sound: Add FDT support to CMD.
EXYNOS5: FDT: Add compatible strings for SPI EXYNOS5 : FDT: Add Aliases for SPI device
EXYNOS5: FDT: Add SPI device node data
SPI: EXYNOS: Add FDT support to driver.
EHCI: Exynos: Add fdt support
EXYNOS5: Add device node for USB.
EXYNOS5: FDT: Add compatible strings for USB
EXYNOS5: FDT: Add compatible strings for PMIC
EXYNOS5: Add device node for PMIC
PMIC: MAX77686: Add FDT Support
I2C: S3C24X0: Resolve build error for VCMA9

Troy Kisky (1):

      mx31/mx35/mx51/mx53/mx6: add watchdog

Vivek Gautam (1):
SMDK5250: Enable VBus for USB 2.0 controller

??ukasz Majewski (2):
spl:falcon:trats Update Trats default board configuration file to
support FALCON MODE video:cache:fix: Enable dcache flush at LCD subsystem for Exynos based boards

 arch/arm/cpu/arm1136/mx31/timer.c            |   39 ----
 arch/arm/cpu/arm1136/mx35/generic.c          |    6 -
 arch/arm/cpu/armv7/exynos/clock.c            |  272
 +++++++++++++++++++++- arch/arm/cpu/armv7/exynos/pinmux.c
 |   74 ++++++ arch/arm/cpu/armv7/mx6/lowlevel_init.S       |   10 +
 arch/arm/dts/exynos5250.dtsi                 |  154 ++++++++++++
 arch/arm/imx-common/cpu.c                    |    5 -
 arch/arm/include/asm/arch-exynos/clk.h       |    1 +
 arch/arm/include/asm/arch-exynos/clock.h     |  276
 ++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/cpu.h
 |   48 +++- arch/arm/include/asm/arch-exynos/dp_info.h   |    2 +
 arch/arm/include/asm/arch-exynos/gpio.h      |   85 +++++++
 arch/arm/include/asm/arch-exynos/mipi_dsim.h |    7 +
 arch/arm/include/asm/arch-exynos/periph.h    |   33 +--
 arch/arm/include/asm/arch-exynos/pinmux.h    |    8 +
 arch/arm/include/asm/arch-exynos/sromc.h     |   18 ++
 arch/arm/include/asm/arch-mx31/clock.h       |    2 -
 arch/arm/include/asm/arch-mx31/imx-regs.h    |   13 +-
 arch/arm/include/asm/arch-mx35/imx-regs.h    |   11 +-
 arch/arm/include/asm/arch-mx5/imx-regs.h     |   10 -
 board/davedenx/qong/qong.c                   |    9 +-
 board/freescale/mx31pdk/mx31pdk.c            |    9 +-
 board/freescale/mx51evk/mx51evk.c            |    2 -
 board/freescale/mx51evk/mx51evk_video.c      |   39 +++-
 board/freescale/mx53loco/mx53loco.c          |    2 -
 board/freescale/mx53loco/mx53loco_video.c    |   38 ++-
 board/hale/tt01/tt01.c                       |    2 +-
 board/samsung/dts/exynos5250-smdk5250.dts    |   69 ++++++
 board/samsung/smdk5250/smdk5250.c            |  237 +++++++++++++++----
 board/samsung/trats/trats.c                  |    2 +-
 boards.cfg                                   |    1 +
 common/cmd_sound.c                           |    2 +-
 doc/README.watchdog                          |   29 +++
 doc/device-tree-bindings/exynos/isp-spi.txt  |   22 ++
 doc/device-tree-bindings/exynos/sound.txt    |   27 +++
 drivers/i2c/s3c24x0_i2c.c                    |   85 ++++++-
 drivers/i2c/s3c24x0_i2c.h                    |    7 +
 drivers/power/pmic/pmic_max77686.c           |   37 ++-
 drivers/sound/sound.c                        |  171 ++++++++------
 drivers/sound/wm8994.c                       |   74 +++++-
 drivers/sound/wm8994.h                       |    6 +-
 drivers/spi/exynos_spi.c                     |   96 +++++++-
 drivers/usb/host/ehci-exynos.c               |   92 +++++++-
 drivers/video/exynos_dp.c                    |    2 -
 drivers/video/exynos_fb.c                    |    7 +
 drivers/video/exynos_fimd.c                  |   12 +-
 drivers/watchdog/Makefile                    |    3 +
 drivers/watchdog/imx_watchdog.c              |   66 ++++++
 include/configs/at91sam9x5ek.h               |   10 +
 include/configs/exynos5250-dt.h              |  321
 ++++++++++++++++++++++++++
 include/configs/mx28evk.h                    |   47 +++-
 include/configs/mx31pdk.h                    |    1 +
 include/configs/mx53loco.h                   |   44 +++-
 include/configs/mx6qsabre_common.h           |   43 +++-
 include/configs/mx6qsabreauto.h              |    1 +
 include/configs/mx6qsabrelite.h              |  101 +++++---
 include/configs/mx6qsabresd.h                |    3 +-
 include/configs/qong.h                       |    1 +
 include/configs/smdk5250.h                   |  278
 +--------------------- include/configs/trats.h
 |   45 +++- include/fdtdec.h                             |    9 +
 include/i2c.h                                |   26 +++
 include/sound.h                              |    4 +-
 include/watchdog.h                           |    1 +
 lib/fdtdec.c                                 |    9 + 65 files
Quoted 8 lines

changed, 2558 insertions(+), 608 deletions(-) create mode 100644 arch/arm/dts/exynos5250.dtsi create mode 100644 board/samsung/dts/exynos5250-smdk5250.dts create mode 100644 doc/README.watchdog create mode 100644 doc/device-tree-bindings/exynos/isp-spi.txt create mode 100644 doc/device-tree-bindings/exynos/sound.txt create mode 100644 drivers/watchdog/imx_watchdog.c create mode 100644 include/configs/exynos5250-dt.h

Along with the patch I posted, applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130114/0e7e7c21/attachment.pgp>