From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Tue, 18 Feb 2014 19:47:59 +0100 Subject: [U-Boot] Pull request: u-boot-arm/master In-Reply-To: <20140218175040.GH19081@bill-the-cat> References: <20140213184341.3364b092@lilith> <20140218175040.GH19081@bill-the-cat> Message-ID: <20140218194759.47cb913a@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 Tue, 18 Feb 2014 12:50:40 -0500, Tom Rini wrote: > On Thu, Feb 13, 2014 at 06:43:41PM +0100, Albert ARIBAUD wrote: > > > Hi Tom, > > > > The following changes since commit > > 0876703cf2ee107372b56037d4eeeb7604c56796: > > > > boards.cfg: Keep the entries sorted (2014-01-27 08:28:35 -0500) > > > > are available in the git repository at: > > > > git://git.denx.de/u-boot-arm master > > > > for you to fetch changes up to 9c134e189a95c976dab94d4f28444a5398627188: > > > > arm/km: introduce kmsugp1 target (2014-02-13 17:45:36 +0100) > > > > ---------------------------------------------------------------- > > Albert ARIBAUD (3): > > Merge branch 'u-boot-arm/next' into 'u-boot-arm/master' > > Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' > > Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' > > > > Enric Balletb? i Serra (7): > > ARM: OMAP4: Rename to ti_omap4_common.h > > ARM: OMAP5: Rename to ti_omap5_common.h > > TI: armv7: Move ELM support to SoC configuration file. > > TI: armv7: Do not define the number DRAM banks if is already > > defined. ARM: OMAP3: Rename OMAP3_PUBLIC_SRAM_* to NON_SECURE_SRAM_* > > TI: OMAP3: Create common config files for TI OMAP3 platforms. > > OMAP3: igep00x0: Convert to ti_omap3_common.h. > > > > Gerlando Falauto (3): > > arm/km: enable FDT for km_kirwkood > > arm/km: define fdt_high env variable and allow backwards > > compatibility arm/km: introduce kmsugp1 target > > > > Holger Brunck (5): > > arm/km: drop unneeded define > > arm/km: make local function startup_allowed static > > arm/km/suv31: switch to 256MB RAM > > arm/km: add CONFIG_KM_BOARD_EXTRA_ENV to default environment > > arm/km: fix wrong error handling > > > > Inha Song (3): > > serial: s5p: set automatically clears after resetting Rx FIFO > > exynos: clock: fixed that cfg is set to wrong value. > > exynos: clock: use the clear and set bits macros. > > > > Jassi Brar (2): > > ARM: OMAP4/5: Remove dead code against > > CONFIG_SYS_CLOCKS_ENABLE_ALL ARM: OMAP4/5: Remove dead code against > > CONFIG_SYS_ENABLE_PADS_ALL > > > > Jim Lin (1): > > ARM: tegra: fix "bootp" issue for Tegra124 too > > > > Jimmy Zhang (1): > > ARM: tegra: don't exceed AVP limits when configuring PLLP > > > > Linus Walleij (2): > > ARM: versatile: pass correct machine type for Versatile AB > > ARM: versatile: pass console setting to the kernel > > > > Lokesh Vutla (1): > > ARM: AM43xx: Enable DDR dynamic IO power down for DDR3 > > > > Masahiro Yamada (1): > > relocate-rela: replace a magic number with sizeof(Elf64_Rela) > > > > Michal Simek (2): > > zynq: Use full tftpboot command instead of shortcut tftp > > zynq: Fix elf header generation > > > > Minkyu Kang (3): > > exynos: pinmux: sort the list of peripherals > > exynos: pinmux: remove unnecessary define > > exynos: pinmux: remove unnecessary routine > > > > Nishanth Menon (2): > > DRA7: Add support for ES1.1 silicon ID code > > DRA7: add ABB setup for MPU voltage domain > > > > Piotr Wilczek (8): > > arm:exynos: add cpu revision > > arm:s5pc110: add cpu revision > > board:samsung:common: set envs with board unified information > > board:samsung:goni: add env variables describing platform > > board:samsung:universal: add env variables describing platform > > board:samsung:trats: add env variables describing platform > > board:samsung:trats2: add env variables describing platform > > board:samsung:trats/trats2: enable boot with appended and > > separated DTB > > > > Przemyslaw Marczak (12): > > s5p: gpio: change gpio coding method for s5p gpio. > > trats2: Code cleanup. > > samsung: common: Add file for common functions, draw_logo() > > cleanup. common: lcd.c: fix data abort exception when try to access bmp > > header lib: tizen: change Tizen logo with the new one. > > video: exynos: fimd: add support for various display color modes > > samsung: boards: update display configs with 16bpp mode. > > samsung: misc: Add LCD download menu. > > trats: add LCD download menu support > > trats2: add LCD download menu support > > universal: add LCD download menu support > > config: trats: trats2: extend dfu_alt_info by env update settings > > > > Satyanarayana, Sandhya (1): > > ARM: AM335x: Enable DDR dynamic IO power down > > > > Stephen Warren (16): > > ARM: tegra: accept any SKU ID for most chips > > ARM: tegra: set env vars to indicate Cardhu A04 support > > ARM: tegra: clear $usb_need_init each boot > > ARM: tegra: rename MASK_BITS_29_28 to MASK_BITS_31_28 > > ARM: tegra: rename OUT_CLK_SOURCE_* > > ARM: tegra: use MASK_BITS_* macros everywhere > > ARM: tegra: MASK_BITS_ no longer needs specific values > > ARM: tegra: amend pmc.h for Tegra114+ > > mmc: tegra: support Tegra124 > > ARM: tegra: misc cleanups triggered by Tegra124 review > > ARM: tegra: pass just partition ID to power_partition() > > ARM: tegra: enable PLLX only once it's been fully configured > > ARM: tegra: remove a conditional for CSITE rate > > ARM: tegra: fix a typo in the tegra114.dtsi > > ARM: rpi_b: set $fdtfile in default environment > > ARM: bcm2835: config.mk isn't needed > > > > Tom Rini (2): > > feature-removal-schedule.txt: Drop > > CONFIG_SYS_ENABLE_PADS_ALL/CLOCKS_ENABLE_ALL am43xx_evm.h: Correct SPL > > max size > > > > Tom Warren (9): > > ARM: tegra: deduplicate MASK_BITS_xxx clock mux enum > > ARM: tegra: implement MASK_BITS_31_29 > > ARM: tegra: only build __pinmux_nand() when it's needed > > ARM: tegra: add/edit headers for Tegra124 > > ARM: tegra: add SPL/AVP (arm720t) CPU files for Tegra124 > > ARM: tegra: Add CPU (armv7) files for Tegra124 > > ARM: tegra: add common (shared) CPU files > > ARM: tegra: add DT files for Tegra124 and Venice2 > > ARM: tegra: add Venice2 (Tegra124) board > > > > Vivek Gautam (2): > > exynos5250: usb: Fix VBus gpio numbers for ehci and xhci > > controllers smdk5250: Remove 'board_usb_vbus_init()' function > > > > arch/arm/cpu/arm1176/bcm2835/config.mk | 19 - > > arch/arm/cpu/arm720t/tegra-common/cpu.c | 75 +- > > arch/arm/cpu/arm720t/tegra-common/cpu.h | 12 +- > > arch/arm/cpu/arm720t/tegra114/cpu.c | 48 +- > > arch/arm/cpu/arm720t/tegra124/Makefile | 8 + > > arch/arm/cpu/arm720t/tegra124/config.mk | 7 + > > arch/arm/cpu/arm720t/tegra124/cpu.c | 265 +++ > > arch/arm/cpu/arm720t/tegra30/cpu.c | 14 +- > > arch/arm/cpu/armv7/exynos/clock.c | 84 +- > > arch/arm/cpu/armv7/exynos/pinmux.c | 7 +- > > arch/arm/cpu/armv7/omap-common/clocks-common.c | 53 - > > arch/arm/cpu/armv7/omap-common/emif-common.c | 5 +- > > arch/arm/cpu/armv7/omap-common/hwinit-common.c | 6 - > > arch/arm/cpu/armv7/omap4/hw_data.c | 85 - > > arch/arm/cpu/armv7/omap5/abb.c | 13 +- > > arch/arm/cpu/armv7/omap5/hw_data.c | 90 +- > > arch/arm/cpu/armv7/omap5/hwinit.c | 3 + > > arch/arm/cpu/armv7/omap5/prcm-regs.c | 8 + > > arch/arm/cpu/armv7/omap5/sdram.c | 4 + > > arch/arm/cpu/armv7/tegra124/Makefile | 6 + > > arch/arm/cpu/armv7/tegra124/config.mk | 10 + > > arch/arm/cpu/armv7/zynq/u-boot.lds | 99 ++ > > arch/arm/cpu/tegra-common/ap.c | 18 +- > > arch/arm/cpu/tegra-common/board.c | 10 +- > > arch/arm/cpu/tegra-common/cache.c | 10 +- > > arch/arm/cpu/tegra-common/clock.c | 128 +- > > arch/arm/cpu/tegra114-common/clock.c | 16 +- > > arch/arm/cpu/tegra124-common/Makefile | 10 + > > arch/arm/cpu/tegra124-common/clock.c | 826 +++++++++ > > arch/arm/cpu/tegra124-common/funcmux.c | 69 + > > arch/arm/cpu/tegra124-common/pinmux.c | 730 ++++++++ > > arch/arm/cpu/tegra20-common/clock.c | 4 +- > > arch/arm/cpu/tegra30-common/clock.c | 39 +- > > arch/arm/dts/tegra114.dtsi | 2 +- > > arch/arm/dts/tegra124.dtsi | 250 +++ > > arch/arm/include/asm/arch-am33xx/ddr_defs.h | 8 +- > > arch/arm/include/asm/arch-exynos/cpu.h | 8 +- > > arch/arm/include/asm/arch-exynos/gpio.h | 245 +-- > > arch/arm/include/asm/arch-exynos/periph.h | 3 +- > > arch/arm/include/asm/arch-omap3/omap3.h | 6 +- > > arch/arm/include/asm/arch-omap4/sys_proto.h | 1 - > > arch/arm/include/asm/arch-omap5/omap.h | 3 + > > arch/arm/include/asm/arch-omap5/sys_proto.h | 1 - > > arch/arm/include/asm/arch-s5pc1xx/cpu.h | 7 + > > arch/arm/include/asm/arch-s5pc1xx/gpio.h | 47 +- > > arch/arm/include/asm/arch-tegra/clk_rst.h | 187 ++- > > arch/arm/include/asm/arch-tegra/clock.h | 17 + > > arch/arm/include/asm/arch-tegra/gp_padctrl.h | 1 + > > arch/arm/include/asm/arch-tegra/pmc.h | 270 ++- > > arch/arm/include/asm/arch-tegra/tegra.h | 2 + > > arch/arm/include/asm/arch-tegra124/ahb.h | 91 + > > arch/arm/include/asm/arch-tegra124/clock-tables.h | 496 ++++++ > > arch/arm/include/asm/arch-tegra124/clock.h | 19 + > > arch/arm/include/asm/arch-tegra124/flow.h | 40 + > > arch/arm/include/asm/arch-tegra124/funcmux.h | 23 + > > arch/arm/include/asm/arch-tegra124/gp_padctrl.h | 74 + > > arch/arm/include/asm/arch-tegra124/gpio.h | 303 ++++ > > arch/arm/include/asm/arch-tegra124/hardware.h | 16 + > > arch/arm/include/asm/arch-tegra124/pinmux.h | 620 +++++++ > > arch/arm/include/asm/arch-tegra124/pmu.h | 14 + > > arch/arm/include/asm/arch-tegra124/spl.h | 13 + > > arch/arm/include/asm/arch-tegra124/sysctr.h | 26 + > > arch/arm/include/asm/arch-tegra124/tegra.h | 30 + > > arch/arm/include/asm/arch-tegra124/usb.h | 268 +++ > > arch/arm/include/asm/omap_common.h | 2 +- > > board/armltd/versatile/versatile.c | 4 + > > board/keymile/km_arm/fpga_config.c | 26 + > > board/keymile/km_arm/km_arm.c | 20 +- > > board/keymile/scripts/develop-arm.txt | 1 - > > board/keymile/scripts/develop-common.txt | 1 + > > board/keymile/scripts/develop-ppc_82xx.txt | 1 - > > board/keymile/scripts/develop-ppc_8xx.txt | 1 - > > board/keymile/scripts/ramfs-arm.txt | 1 - > > board/keymile/scripts/ramfs-common.txt | 1 + > > board/keymile/scripts/ramfs-ppc_82xx.txt | 1 - > > board/keymile/scripts/ramfs-ppc_8xx.txt | 1 - > > board/nvidia/common/board.c | 2 + > > board/nvidia/dts/tegra124-venice2.dts | 84 + > > board/nvidia/venice2/Makefile | 9 + > > board/nvidia/venice2/as3722_init.c | 91 + > > board/nvidia/venice2/as3722_init.h | 38 + > > board/nvidia/venice2/pinmux-config-venice2.h | 339 ++++ > > board/nvidia/venice2/venice2.c | 33 + > > board/samsung/common/Makefile | 1 + > > board/samsung/common/dfu_sample_env.txt | 9 + > > board/samsung/common/misc.c | 411 +++++ > > board/samsung/dts/exynos5250-smdk5250.dts | 2 +- > > board/samsung/dts/exynos5250-snow.dts | 4 +- > > board/samsung/goni/goni.c | 17 + > > board/samsung/smdk5250/smdk5250.c | 19 - > > board/samsung/trats/trats.c | 21 +- > > board/samsung/trats2/trats2.c | 34 +- > > board/samsung/universal_c210/universal.c | 21 +- > > board/ti/am43xx/board.c | 2 +- > > board/ti/omap5_uevm/evm.c | 13 - > > board/ti/omap5_uevm/mux_data.h | 234 --- > > board/ti/panda/panda.c | 30 - > > board/ti/panda/panda_mux_data.h | 186 --- > > board/ti/sdp4430/sdp.c | 20 - > > board/ti/sdp4430/sdp4430_mux_data.h | 197 --- > > boards.cfg | 2 + > > common/lcd.c | 27 +- > > doc/feature-removal-schedule.txt | 16 - > > drivers/gpio/s5p_gpio.c | 15 +- > > drivers/mmc/tegra_mmc.c | 9 + > > drivers/power/battery/bat_trats2.c | 2 +- > > drivers/serial/serial_s5p.c | 4 +- > > drivers/video/exynos_fb.c | 28 - > > drivers/video/exynos_fimd.c | 15 +- > > include/configs/am43xx_evm.h | 2 +- > > include/configs/cardhu.h | 4 + > > include/configs/dra7xx_evm.h | 4 +- > > include/configs/km/keymile-common.h | 9 +- > > include/configs/km/km-powerpc.h | 6 +- > > include/configs/km/km_arm.h | 14 +- > > include/configs/km/kmp204x-common.h | 1 + > > include/configs/km_kirkwood.h | 15 +- > > include/configs/omap3_igep00x0.h | 189 +-- > > include/configs/omap4_panda.h | 4 +- > > include/configs/omap4_sdp4430.h | 4 +- > > include/configs/omap5_uevm.h | 4 +- > > include/configs/rpi_b.h | 1 + > > include/configs/s5p_goni.h | 10 +- > > include/configs/s5pc210_universal.h | 46 +- > > include/configs/tegra-common-post.h | 8 +- > > include/configs/tegra124-common.h | 83 + > > include/configs/ti_am335x_common.h | 4 + > > include/configs/ti_armv7_common.h | 11 +- > > include/configs/ti_omap3_common.h | 73 + > > include/configs/{omap4_common.h => ti_omap4_common.h} | 10 +- > > include/configs/{omap5_common.h => ti_omap5_common.h} | 10 +- > > include/configs/trats.h | 50 +- > > include/configs/trats2.h | 47 +- > > include/configs/venice2.h | 79 + > > include/configs/versatile.h | 3 +- > > include/configs/zynq-common.h | 4 +- > > include/fdtdec.h | 1 + > > include/lcd.h | 2 + > > include/power/max77686_pmic.h | 2 + > > include/power/pmic.h | 1 - > > include/samsung/misc.h | 29 + > > lib/fdtdec.c | 1 + > > lib/tizen/tizen.c | 21 +- > > lib/tizen/tizen_hd_logo.h | 5057 > > ------------------------------------------------------- > > lib/tizen/tizen_hd_logo_data.h | 15 - > > lib/tizen/tizen_logo_16bpp.h | 10025 > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > lib/tizen/tizen_logo_16bpp_gzip.h | 727 ++++++++ > > tools/relocate-rela.c | 2 +- 148 > > files changed, 17595 insertions(+), 6850 deletions(-) delete mode > > 100644 arch/arm/cpu/arm1176/bcm2835/config.mk create mode 100644 > > arch/arm/cpu/arm720t/tegra124/Makefile create mode 100644 > > arch/arm/cpu/arm720t/tegra124/config.mk create mode 100644 > > arch/arm/cpu/arm720t/tegra124/cpu.c create mode 100644 > > arch/arm/cpu/armv7/tegra124/Makefile create mode 100644 > > arch/arm/cpu/armv7/tegra124/config.mk create mode 100644 > > arch/arm/cpu/armv7/zynq/u-boot.lds create mode 100644 > > arch/arm/cpu/tegra124-common/Makefile create mode 100644 > > arch/arm/cpu/tegra124-common/clock.c create mode 100644 > > arch/arm/cpu/tegra124-common/funcmux.c create mode 100644 > > arch/arm/cpu/tegra124-common/pinmux.c create mode 100644 > > arch/arm/dts/tegra124.dtsi create mode 100644 > > arch/arm/include/asm/arch-tegra124/ahb.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/clock-tables.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/clock.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/flow.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/funcmux.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/gp_padctrl.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/gpio.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/hardware.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/pinmux.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/pmu.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/spl.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/sysctr.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/tegra.h create mode 100644 > > arch/arm/include/asm/arch-tegra124/usb.h create mode 100644 > > board/nvidia/dts/tegra124-venice2.dts create mode 100644 > > board/nvidia/venice2/Makefile create mode 100644 > > board/nvidia/venice2/as3722_init.c create mode 100644 > > board/nvidia/venice2/as3722_init.h create mode 100644 > > board/nvidia/venice2/pinmux-config-venice2.h create mode 100644 > > board/nvidia/venice2/venice2.c create mode 100644 > > board/samsung/common/dfu_sample_env.txt create mode 100644 > > board/samsung/common/misc.c create mode 100644 > > include/configs/tegra124-common.h create mode 100644 > > include/configs/ti_omap3_common.h rename > > include/configs/{omap4_common.h => ti_omap4_common.h} (95%) rename > > include/configs/{omap5_common.h => ti_omap5_common.h} (95%) create > > mode 100644 include/configs/venice2.h create mode 100644 > > include/samsung/misc.h delete mode 100644 lib/tizen/tizen_hd_logo.h > > delete mode 100644 lib/tizen/tizen_hd_logo_data.h create mode 100644 > > lib/tizen/tizen_logo_16bpp.h create mode 100644 > > lib/tizen/tizen_logo_16bpp_gzip.h > > Applied to u-boot/master, thanks! Thanks! I will now rebase and handle Marex' PXA and Michal's Zynq PRs. Amicalement, -- Albert.