From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Tue, 20 Nov 2012 07:21:25 +0100 Subject: [U-Boot] pull request for u-boot-tegra/master into ARM/master In-Reply-To: References: <20121116222724.3e3050c2@lilith> <20121117003317.210abc8a@lilith> <20121117011240.7a7971b2@lilith> Message-ID: <20121120072125.6318ca8e@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Tom, On Mon, 19 Nov 2012 10:12:52 -0700, Tom Warren wrote: > Albert, please pull u-boot-tegra/master into ARM/master. Thanks! > > 'pxa' patch moved to before Simon's LCD patchset; MAKEALL -a arm AOK. > > The following changes since commit 7a5337732e3e05b2b0de1b592fa031b2c7b4f632: > Rajeshwari Shinde (1): > EXYNOS5: Enable SPI booting. > > are available in the git repository at: > > git://git.denx.de/u-boot-tegra master > > Allen Martin (1): > tegra: add CONSOLE_MUX support to tegra-kbc > > Mayuresh Kulkarni (1): > tegra: Enable display/lcd support on Seaboard > > 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 > > 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 > > Wei Ni (1): > tegra: Add SOC support for display/lcd > > README | 16 + > arch/arm/cpu/armv7/cache_v7.c | 11 + > 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/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 | 51 ++- > board/compal/paz00/paz00.c | 5 +- > board/compulab/dts/tegra20-trimslice.dts | 3 +- > board/compulab/trimslice/trimslice.c | 8 + > board/nvidia/common/board.c | 24 + > board/nvidia/dts/tegra20-seaboard.dts | 33 ++ > board/nvidia/harmony/harmony.c | 5 +- > board/nvidia/seaboard/seaboard.c | 5 +- > common/lcd.c | 89 ++++- > common/main.c | 12 +- > doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + > doc/device-tree-bindings/video/displaymode.txt | 42 ++ > doc/device-tree-bindings/video/tegra20-dc.txt | 85 ++++ > drivers/input/tegra-kbc.c | 18 +- > drivers/mmc/tegra_mmc.c | 7 +- > drivers/video/Makefile | 1 + > drivers/video/tegra.c | 379 ++++++++++++++++ > include/configs/harmony.h | 4 +- > include/configs/palmld.h | 3 + > include/configs/palmtc.h | 3 + > include/configs/paz00.h | 3 + > include/configs/seaboard.h | 20 +- > include/configs/tec.h | 1 - > include/configs/tegra-common-post.h | 39 +- > include/configs/tegra20-common.h | 3 + > include/configs/trimslice.h | 4 + > include/configs/ventana.h | 3 + > include/configs/whistler.h | 3 + > include/configs/zipitz2.h | 3 + > include/fdtdec.h | 2 + > include/lcd.h | 11 + > lib/fdtdec.c | 2 + > 45 files changed, 2303 insertions(+), 78 deletions(-) > create mode 100644 arch/arm/cpu/armv7/tegra20/display.c > create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.c > create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h > create mode 100644 arch/arm/include/asm/arch-tegra20/display.h > create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.h > create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt > create mode 100644 doc/device-tree-bindings/video/displaymode.txt > create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt > create mode 100644 drivers/video/tegra.c > > > On Mon, Nov 19, 2012 at 8:39 AM, Tom Warren wrote: > > That makes perfect sense - should have thought it through myself. > > > > I moved the pxa patch to before Simon's LCD patchset. Testing MAKEALL > > -a arm now; should have a new pull request in a few hours. > > > > Thanks, > > > > Tom > > > > On Fri, Nov 16, 2012 at 5:12 PM, Albert ARIBAUD > > wrote: > >> Hi Tom, > >> > >> On Fri, 16 Nov 2012 16:42:49 -0700, Tom Warren > >> wrote: > >> > >>> Albert, > >>> > >>> Please pull u-boot-tegra/master into ARM/master. The previously > >>> failing pxa boards are fixed with 'pxa: Disable dcache on palmld, > >>> palmtc, zipitz2'. > >> > >> Sorry to be a nuisance, but what I meant that I wanted all commits in > >> the tegra pull req to succeed building if possible; with the added > >> "disable cache" commit, the branch succeeds, but not all of its > >> commits, which can hamper git bisects. Can the dcache disable patch > >> actually appear before Simon's LCD commit? > >> > >> Amicalement, > >> -- > >> Albert. > Applied to u-boot-arm/master, thanks! Amicalement, -- Albert.