From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sat, 27 Oct 2012 00:30:46 +0200 Subject: [U-Boot] Pull request: u-boot-arm/master Message-ID: <20121027003046.069f89c6@lilith> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Tom, The following changes since commit 186fc4db263fc6332d6712be99a9a387087d29c7: ColdFire: Add Freescale MCF54418TWR ColdFire development board support (2012-10-24 22:27:46 +0800) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to b68d6712c379735e886ef9c01b946bc36f295273: ARM: fix u-boot.lds for -ffunction-sections/-fdata-sections (2012-10-26 23:46:21 +0200) ---------------------------------------------------------------- Albert ARIBAUD (3): Merge remote-tracking branch 'u-boot-ti/master' Merge remote-tracking branch 'u-boot-atmel/master' arm: arm925t: remove SX1 board Andrew Bradford (1): configs: Fix usage of mmc rescan Annamalai Lakshmanan (1): Origen: Add default clock settings for multimedia IPs Igor Grinberg (1): cm-t35: clean unused defines from config Joel A Fernandes (1): am33xx: Enable DDR3 for DDR3 version of beaglebone Marek Vasut (6): arm: Remove support for lpc2292 arm: Remove support for s3c4510 arm: Remove support for NETARM stdio: Remove the CLPS7111 serial driver arm720: Further clean up the arm720t directory arm720: Remove CONFIG_ARM7_REVD Pankaj Bharadiya (1): USB: musb_udc: Make musb_peri_rx_ep check for MUSB_RXCSR_RXPKTRDY Peter Korsgaard (7): omap3_spi: introduce CONFIG_OMAP3_SPI_D0_D1_SWAPPED am33xx/board.c: make wdtimer/uart_base static am33xx: move ti i2c baseboard header handling to board/ti/am335x/ am33xx/board: use cpu_mmc_init() for default mmc initialization am33xx: move generic parts of pinmux handling out from board/ti/am335x am33xx: support board specific ddr settings am33xx/ddr_defs.h: rename DDR2/DDR3 defines to their actual part numbers Stefano Babic (5): OMAP3: mt_ventoux: power on USB at startup OMAP3: updated pinmux and environment for new revision of mcx board OMAP3: mcx: updated to new hardware revision VIDEO: add macro to set LCD size for DSS driver OMAP3: add video support to the mcx board Stephen Warren (1): ARM: fix u-boot.lds for -ffunction-sections/-fdata-sections Tom Rini (2): omapimage: Add support for byteswapped SPI images am33xx: Add SPI SPL as an option Vaibhav Hiremath (1): am335x: Enable RTC 32K OSC clock Wu, Josh (3): mmc: at91: add multi block read/write support. ARM: at91sam9x5: enable MCI0 support for 9x5ek board. mmc: at91: use max timeout value. It will avoid some situation that timeout happened. Yann Vernier (1): arm: ks8695: use defined constants for UART CREDITS | 5 - Makefile | 14 - arch/arm/cpu/arm720t/cpu.c | 32 +- arch/arm/cpu/arm720t/interrupts.c | 249 +----------- arch/arm/cpu/arm720t/lpc2292/Makefile | 50 --- arch/arm/cpu/arm720t/lpc2292/flash.c | 249 ------------ arch/arm/cpu/arm720t/lpc2292/iap_entry.S | 7 - arch/arm/cpu/arm720t/lpc2292/mmc.c | 131 ------- arch/arm/cpu/arm720t/lpc2292/mmc_hw.c | 233 ------------ arch/arm/cpu/arm720t/lpc2292/mmc_hw.h | 29 -- arch/arm/cpu/arm720t/lpc2292/spi.c | 40 -- arch/arm/cpu/arm720t/s3c4510b/Makefile | 45 --- arch/arm/cpu/arm720t/s3c4510b/cache.c | 86 ----- arch/arm/cpu/arm720t/start.S | 185 +-------- arch/arm/cpu/arm920t/ks8695/lowlevel_init.S | 6 +- arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c | 15 + arch/arm/cpu/armv7/am33xx/Makefile | 1 + arch/arm/cpu/armv7/am33xx/board.c | 239 +----------- arch/arm/cpu/armv7/am33xx/clock.c | 6 + arch/arm/cpu/armv7/am33xx/config.mk | 1 + arch/arm/cpu/armv7/am33xx/emif4.c | 114 +----- arch/arm/cpu/armv7/am33xx/mux.c | 33 ++ arch/arm/cpu/u-boot.lds | 8 +- arch/arm/include/asm/arch-am33xx/cpu.h | 15 + arch/arm/include/asm/arch-am33xx/ddr_defs.h | 69 ++-- arch/arm/include/asm/arch-am33xx/hardware.h | 4 + arch/arm/include/asm/arch-am33xx/mux.h | 261 +++++++++++++ arch/arm/include/asm/arch-am33xx/spl.h | 1 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 27 -- arch/arm/include/asm/arch-arm720t/hardware.h | 4 +- .../include/asm/arch-arm720t/netarm_dma_module.h | 182 --------- .../include/asm/arch-arm720t/netarm_eni_module.h | 121 ------ .../include/asm/arch-arm720t/netarm_eth_module.h | 160 -------- .../include/asm/arch-arm720t/netarm_gen_module.h | 186 --------- .../include/asm/arch-arm720t/netarm_mem_module.h | 184 --------- .../include/asm/arch-arm720t/netarm_registers.h | 96 ----- .../include/asm/arch-arm720t/netarm_ser_module.h | 347 ----------------- arch/arm/include/asm/arch-lpc2292/hardware.h | 33 -- .../include/asm/arch-lpc2292/lpc2292_registers.h | 225 ----------- arch/arm/include/asm/arch-lpc2292/spi.h | 82 ---- arch/arm/include/asm/arch-omap3/dss.h | 1 + arch/arm/include/asm/arch-s3c4510b/hardware.h | 272 -------------- board/atmel/at91sam9x5ek/at91sam9x5ek.c | 10 + board/htkw/mcx/mcx.c | 48 ++- board/htkw/mcx/mcx.h | 30 +- board/samsung/origen/lowlevel_init.S | 37 +- board/samsung/origen/origen_setup.h | 74 ++++ board/sx1/Makefile | 45 --- board/sx1/config.mk | 19 - board/sx1/lowlevel_init.S | 397 -------------------- board/sx1/sx1.c | 123 ------ board/teejet/mt_ventoux/mt_ventoux.c | 8 + board/ti/am335x/Makefile | 1 + board/ti/am335x/board.c | 376 ++++++++++++++++++ board/ti/am335x/board.h | 49 +++ board/ti/am335x/mux.c | 250 +----------- doc/README.scrapyard | 3 +- doc/driver-model/UDM-serial.txt | 30 +- drivers/i2c/soft_i2c.c | 3 - drivers/mmc/gen_atmel_mci.c | 15 +- drivers/net/Makefile | 1 - drivers/net/netarm_eth.c | 352 ----------------- drivers/net/netarm_eth.h | 42 --- drivers/serial/Makefile | 4 - drivers/serial/s3c4510b_uart.c | 231 ------------ drivers/serial/s3c4510b_uart.h | 109 ------ drivers/serial/serial.c | 6 - drivers/serial/serial_clps7111.c | 134 ------- drivers/serial/serial_lpc2292.c | 117 ------ drivers/serial/serial_netarm.c | 204 ---------- drivers/spi/omap3_spi.c | 11 +- drivers/usb/musb/musb_udc.c | 11 +- include/atmel_mci.h | 7 +- include/clps7111.h | 276 -------------- include/configs/SX1.h | 189 ---------- include/configs/am335x_evm.h | 9 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/at91sam9x5ek.h | 10 + include/configs/cm_t35.h | 14 +- include/configs/devkit8000.h | 2 +- include/configs/igep00x0.h | 2 +- include/configs/mcx.h | 31 +- include/configs/mx28evk.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53ard.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/mx53loco.h | 2 +- include/configs/mx53smd.h | 2 +- include/configs/mx6qarm2.h | 2 +- include/configs/mx6qsabrelite.h | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omap3_overo.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/omap4_common.h | 2 +- include/configs/omap5_evm.h | 2 +- include/configs/tricorder.h | 2 +- include/flash.h | 1 - spl/Makefile | 9 +- tools/omapimage.c | 83 +++- 102 files changed, 1193 insertions(+), 6264 deletions(-) delete mode 100644 arch/arm/cpu/arm720t/lpc2292/Makefile delete mode 100644 arch/arm/cpu/arm720t/lpc2292/flash.c delete mode 100644 arch/arm/cpu/arm720t/lpc2292/iap_entry.S delete mode 100644 arch/arm/cpu/arm720t/lpc2292/mmc.c delete mode 100644 arch/arm/cpu/arm720t/lpc2292/mmc_hw.c delete mode 100644 arch/arm/cpu/arm720t/lpc2292/mmc_hw.h delete mode 100644 arch/arm/cpu/arm720t/lpc2292/spi.c delete mode 100644 arch/arm/cpu/arm720t/s3c4510b/Makefile delete mode 100644 arch/arm/cpu/arm720t/s3c4510b/cache.c create mode 100644 arch/arm/cpu/armv7/am33xx/mux.c create mode 100644 arch/arm/include/asm/arch-am33xx/mux.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_dma_module.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_eni_module.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_eth_module.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_gen_module.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_mem_module.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_registers.h delete mode 100644 arch/arm/include/asm/arch-arm720t/netarm_ser_module.h delete mode 100644 arch/arm/include/asm/arch-lpc2292/hardware.h delete mode 100644 arch/arm/include/asm/arch-lpc2292/lpc2292_registers.h delete mode 100644 arch/arm/include/asm/arch-lpc2292/spi.h delete mode 100644 arch/arm/include/asm/arch-s3c4510b/hardware.h delete mode 100644 board/sx1/Makefile delete mode 100644 board/sx1/config.mk delete mode 100644 board/sx1/lowlevel_init.S delete mode 100644 board/sx1/sx1.c create mode 100644 board/ti/am335x/board.c create mode 100644 board/ti/am335x/board.h delete mode 100644 drivers/net/netarm_eth.c delete mode 100644 drivers/net/netarm_eth.h delete mode 100644 drivers/serial/s3c4510b_uart.c delete mode 100644 drivers/serial/s3c4510b_uart.h delete mode 100644 drivers/serial/serial_clps7111.c delete mode 100644 drivers/serial/serial_lpc2292.c delete mode 100644 drivers/serial/serial_netarm.c delete mode 100644 include/clps7111.h delete mode 100644 include/configs/SX1.h Amicalement, -- Albert.