Hi Albert,
2012년 12월 22일 토요일에 Albert ARIBAUD님이 작성:
> Hello Tom,
>
> The following changes since commit
> 095728803eedfce850a2f85828f79500cb09979e:
>
> Merge branch 'master' of git://git.denx.de/u-boot-net (2012-12-17
> 18:39:50 -0700)
>
> are available in the git repository at:
>
>
> git://git.denx.de/u-boot-arm master
>
> for you to fetch changes up to 96764df1b47ddebfb50fadf5af72530b07b5fc89:
>
> Merge samsung, imx, tegra into u-boot-arm/master (2012-12-22 11:59:14
> +0100)
>
> This pull request is specifically to get past the big merge issues from
> u-boot-arm to u-boot which involved samsung, ixm and tegra fixes,
> thanks to all those who took part in helping untie the knot. Once this
> is in, I'll certainly have another pull request, early in the coming
> week.
>
> ----------------------------------------------------------------
>
> Albert ARIBAUD (2):
> Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
> Merge samsung, imx, tegra into u-boot-arm/master
>From this merge commit, i found "arm:exynos4:pinmux: Modify the gpio
function for mmc" commit codes are removed.
It seems to be removed by manual merge with "exynos:pinmux: Add pinmux
support for i2c" commit.
Thanks.
>
> Allen Martin (2):
> tegra: add CONSOLE_MUX support to tegra-kbc
> Merge remote-tracking branch 'u-boot/master' into
> u-boot-arm-merged
>
> Ashok Kumar Reddy (1):
> ARM: arm1176: Define arch_cpu_init() for s3c64xx
>
> Benoît Thébaudeau (17):
> arm1136: Fix enable_caches()
> mx31: Move EHCI definitions to ehci-fsl.h
> ehci-mxc: Clean up
> ehci-mx5: Clean up
> ehci-mx5: Fix OC_DIS usage
> ehci-mx5: Fix OPM usage
> ehci-mx5: Fix *PM usage for i.MX53
> ehci-mx5: Add missing OC_DIS for i.MX53
> ehci-mxc: Make EHCI power/oc polarities configurable
> ehci-mxc: Make i.MX25 EHCI configurable
> ehci-mxc: Define host offsets
> ehci-mxc: Add support for i.MX35
> mx35pdk: Add support for OTG
> ehci-mx5/6: Make board_ehci_hcd_init() optional
> ehci-mxc: Fix host power mask bit for i.MX35
> ehci-mxc: Fix host power mask bit for i.MX25
> mx5: Mark lowlevel_init board-specific code
>
> Chander Kashyap (1):
> Exynos5250: Enable PXE Support
>
> Fabio Estevam (28):
> mx25pdk: Include CONFIG_MX25
> mx25pdk: Add esdhc support
> pmic_fsl: Introduce FSL_PMIC_I2C_LENGTH
> mx25: Place common functions into sys_proto.h
> pmic: Add support for mc34704
> mx25pdk: Add Ethernet support
> mx53loco: Allow booting a zImage kernel
> mx25pdk: Allow booting a zImage kernel
> mx51evk: Allow booting a zImage kernel
> mx35pdk: Allow booting a zImage kernel
> mx6qsabre_common: Allow booting a zImage kernel
> mx5: Align SPI CS naming with i.MX53 reference manual
> mx5: Print CSPI clock in 'clock' command
> spi: mxc_spi: Fix handling of chip select
> spi: mxc_spi: Fix spi clock glitch durant reset
> mx6: clock: Only show CSPI clock if CSPI is enabled
> mx28evk: Configure CONFIG_BOOTDELAY to one second
> mx53loco: Configure CONFIG_BOOTDELAY to one second
> mx6qsabrelite: Configure CONFIG_BOOTDELAY to one second
> mx6qsabre_common: Configure CONFIG_BOOTDELAY to one second
> mx51evk: Configure CONFIG_BOOTDELAY to one second
> mx25pdk: Configure CONFIG_BOOTDELAY to one second
> mx31pdk: Configure CONFIG_BOOTDELAY to one second
> mx35pdk: Configure CONFIG_BOOTDELAY to one second
> mx25pdk: Adapt it for the new PMIC framework
> woodburn: Set gpio value in gpio_direction_output()
> mx53loco: Fix PMIC name
> mx25pdk: Allow booting a device tree kernel
>
> Hatim RV (3):
> EXYNOS: Add clock for SPI
> EXYNOS5: Add base address for SPI
> EXYNOS5: Enable SPI
>
> Marek Vasut (9):
> dm: wdt: Move s5p watchdog timer to drivers/watchdog/
> mx28: Fix typo in POWER_MINPWR_VBG_OFF
> mx28: Fix typo in POWER_DCLIMITS_NEGLIMIT_OFFSET
> mx28: Remove SET, CLR, TOG ops from PLLxCTRL1 registers
> mx28: Rename regs-power.h to regs-power-mx28.h
> mxs: Silence elftosb
> mxs: Implement common function to setup VDDx
> mxs: Properly setup VDDD in power supply setup code
> mxs: Staticize SPL functions
>
> Mayuresh Kulkarni (1):
> tegra: Enable display/lcd support on Seaboard
>
> Minkyu Kang (6):
> ARCH: EXYNOS: add support to match product id
> EXYNOS: Clock: Add common function for pll rate calculation
> s3c64xx: fix the compiler error and warning
> Merge branch 'master' of git://git.denx.de/u-boot into resolve
> universal_c210: fix compiler error and compiler warning
> universal_c210: check the NULL pointer when get the PMIC
>
> Otavio Salvador (1):
> mxs: SPL: Generalize memory initialization
>
> Piotr Wilczek (12):
> arm:exynos4:trats: Correct SDRAM configuration for trats
> arm:exynos4:trats: Fix SDRAM size
> arm:exynos4:pinmux: Modify the gpio function for mmc
> arm:exynos4:trats: Use pinmux for mmc configuration
> arm:exynos4:universal: Use pinmux for mmc configuration
> arm:exynos4:universal: Eliminated low level init
> arm: trats: Power down core 1
> exynos4: universal_C210: use software SPI
> misc:max8998 Add LDO macros
> drivers: video: Add ld9040 video driver
> drivers: video: fix image position
> exynos4: universal_C210: add display support
>
> Rajeshwari Shinde (16):
> PMIC: MAX77686: Add support for MAX77686
> SMDK5250: Config: Enable MAX77686 pmic chip
> SOUND: SAMSUNG: Add I2S driver
> SOUND: Add WM8994 codec
> Sound: Add command for audio playback
> EXYNOS: Add I2S registers
> EXYNOS: Add parameters required by I2S
> EXYNOS: Add pinmux for I2S
> EXYNOS: Add I2S base address
> EXYNOS: Add clock for I2S
> SMDK5250: Enable Sound
> EXYNOS5: Add pinmux support for SPI
> SPI: Add SPI Driver for EXYNOS.
> EXYNOS5: Enable SPI booting.
> POWER: MAX77686: Modified as per the latest Implementation
> SMDK5250: Enable pmic MAX77686
>
> Simon Glass (17):
> pxa: Disable dcache on palmld, palmtc, zipitz2
> tegra: Use const for pinmux_config_pingroup/table()
> tegra: Add display support to funcmux
> tegra: fdt: Add pwm binding and node
> tegra: fdt: Add LCD definitions for Tegra
> tegra: Add support for PWM
> tegra: Add LCD driver
> tegra: Add LCD support to Nvidia boards
> arm: Add control over cachability of memory regions
> lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment
> lcd: Add support for flushing LCD fb from dcache after update
> tegra: Align LCD frame buffer to section boundary
> tegra: Support control of cache settings for LCD
> tegra: fdt: Add LCD definitions for Seaboard
> lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console
> tegra: Remove unnecessary CONFIG_SYS_NAND_BASE
> tegra: config: seaboard: Move tegra-common-post to correct place
>
> Stefano Babic (9):
> ARM: Fix start.S when used with SPL in arm1136
> MX35: add LOW_LEVEL_SRAM_STACK to use SPL_FRAMEWORK
> MX35: Add soc_boot_mode and soc_boot_device to MX35
> SPL: Added SPL target for mx35 SOC to SPL Makefile
> ARM: Add SPL target to arm1136
> MX35: add support for woodburn board
> MX5: added CONFIG_PMIC_FSL_MC13892 to mx53evk
> Merge git://git.denx.de/u-boot
> Merge branch 'master' of git://git.denx.de/u-boot into master
>
> Stephen Warren (4):
> ARM: tegra: TrimSlice: add support for USB1 port
> mmc: tegra: support 4-bit operation too on 8-bit slots
> ARM: tegra: enable 8-bit SD slots in board files
> tegra: use generic fs commands in BOOTCOMMAND
>
> Troy Kisky (4):
> mx6: soc: update get_cpu_rev and get_imx_type for mx6solo/sololite
> mx6: use CONFIG_MX6 instead of CONFIG_MX6Q
> imx-common: cpu: add imx_ddr_size
> arch-mx6: add mx6dl_pins.h
>
> Wei Ni (1):
> tegra: Add SOC support for display/lcd
>
> Łukasz Majewski (1):
> gpio:fix: Proper handling of GPIO subsystem parts at Samsung
> devices
>
> MAINTAINERS |
> 1 + Makefile
> | 4 +-
> README |
> 16 ++-
> arch/arm/cpu/arm1136/config.mk |
> 3 + arch/arm/cpu/arm1136/cpu.c
> | 22 ++--
> arch/arm/cpu/arm1136/mx35/Makefile |
> 1 + arch/arm/cpu/arm1136/mx35/generic.c
> | 75 +++++++++++
> arch/arm/cpu/arm1136/mx35/mx35_sdram.c |
> 137 ++++++++++++++++++++
> arch/arm/cpu/arm1136/start.S |
> 31 +++--
> arch/arm/cpu/arm1136/u-boot-spl.lds |
> 62 +++++++++
> arch/arm/cpu/arm1176/s3c64xx/Makefile |
> 2 +- arch/arm/cpu/arm1176/s3c64xx/init.c
> | 26 ++++
> arch/arm/cpu/arm926ejs/mxs/spl_boot.c |
> 4 +- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
> | 38 +++---
> arch/arm/cpu/arm926ejs/mxs/spl_power_init.c |
> 305 ++++++++++++++++----------------------------
> arch/arm/cpu/armv7/cache_v7.c |
> 11 ++
> arch/arm/cpu/armv7/exynos/clock.c |
> 350 +++++++++++++++++++++++++++++++++++++++++----------
> arch/arm/cpu/armv7/exynos/pinmux.c |
> 64 ++++++++++
> arch/arm/cpu/armv7/mx5/clock.c |
> 4 +- arch/arm/cpu/armv7/mx5/lowlevel_init.S
> | 2 +-
> arch/arm/cpu/armv7/mx6/clock.c |
> 2 + arch/arm/cpu/armv7/mx6/soc.c
> | 32 +++--
> arch/arm/cpu/armv7/s5p-common/Makefile |
> 1 - arch/arm/cpu/armv7/tegra20/Makefile
> | 2 +
> arch/arm/cpu/armv7/tegra20/display.c |
> 409 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> arch/arm/cpu/armv7/tegra20/pwm.c |
> 101 +++++++++++++++
> arch/arm/cpu/tegra20-common/funcmux.c |
> 37 ++++++
> arch/arm/cpu/tegra20-common/pinmux.c |
> 4 +- arch/arm/dts/tegra20.dtsi
> | 105 ++++++++++++++++
> arch/arm/imx-common/cpu.c |
> 66 ++++++++--
> arch/arm/include/asm/arch-exynos/clk.h |
> 4 + arch/arm/include/asm/arch-exynos/clock.h
> | 29 +++++
> arch/arm/include/asm/arch-exynos/cpu.h |
> 18 +++
> arch/arm/include/asm/arch-exynos/gpio.h |
> 19 +++
> arch/arm/include/asm/arch-exynos/i2s-regs.h |
> 66 ++++++++++
> arch/arm/include/asm/arch-exynos/periph.h |
> 7 ++ arch/arm/include/asm/arch-exynos/sound.h
> | 44 +++++++
> arch/arm/include/asm/arch-exynos/spi.h |
> 78 ++++++++++++
> arch/arm/include/asm/arch-mx25/imx-regs.h |
> 5 +- arch/arm/include/asm/arch-mx25/sys_proto.h
> | 3 +
> arch/arm/include/asm/arch-mx31/imx-regs.h |
> 27 +---
> arch/arm/include/asm/arch-mx35/imx-regs.h |
> 4 + arch/arm/include/asm/arch-mx35/mmc_host_def.h
> | 31 +++++
> arch/arm/include/asm/arch-mx35/spl.h |
> 38 ++++++
> arch/arm/include/asm/arch-mx35/sys_proto.h |
> 2 + arch/arm/include/asm/arch-mx5/mx5x_pins.h
> | 6 +-
> arch/arm/include/asm/arch-mx5/sys_proto.h |
> 10 +-
> arch/arm/include/asm/arch-mx6/imx-regs.h |
> 2 + arch/arm/include/asm/arch-mx6/mx6dl_pins.h
> | 149 ++++++++++++++++++++++
> arch/arm/include/asm/arch-mx6/sys_proto.h |
> 10 +-
> arch/arm/include/asm/arch-mxs/imx-regs.h |
> 7 +- arch/arm/include/asm/arch-mxs/regs-clkctrl-mx28.h
> | 6 +- arch/arm/include/asm/arch-mxs/{regs-power.h =>
> regs-power-mx28.h} | 4 +-
> arch/arm/include/asm/arch-s5pc1xx/gpio.h |
> 7 +- arch/arm/include/asm/arch-tegra20/dc.h
> | 545
>
>
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> arch/arm/include/asm/arch-tegra20/display.h |
> 152 ++++++++++++++++++++++
> arch/arm/include/asm/arch-tegra20/pinmux.h |
> 4 +- arch/arm/include/asm/arch-tegra20/pwm.h
> | 75 +++++++++++
> arch/arm/include/asm/system.h |
> 31 +++++
> arch/arm/lib/cache-cp15.c --
> Albert.
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de <javascript:;>
> http://lists.denx.de/mailman/listinfo/u-boot
>
--
- Joonyoung Shim
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
