author | Somnath Mukherjee <somnath@ti.com> | |
Tue, 13 Aug 2013 13:06:10 +0000 (18:36 +0530) | ||
committer | Somnath Mukherjee <somnath@ti.com> | |
Tue, 13 Aug 2013 13:10:41 +0000 (18:40 +0530) |
Conflicts:
arch/arm/cpu/armv7/omap5/hw_data.c
boards.cfg
Following files are modified as a result of merge:
modified: README
modified: arch/arm/cpu/armv7/omap-common/hwinit-common.c
modified: arch/arm/cpu/armv7/omap5/hw_data.c
modified: arch/arm/include/asm/arch-omap5/spl.h
modified: arch/arm/include/asm/arch-omap5/sys_proto.h
modified: board/ti/dra7xx/evm.c
modified: board/ti/dra7xx/mux_data.h
modified: boards.cfg
renamed: README.dra_qspi_test -> doc/README.ti_qspi_dra_test
renamed: README.dra_qspi_flash -> doc/README.ti_qspi_flash
modified: drivers/mtd/spi/spansion.c
modified: drivers/mtd/spi/spi_flash.c
modified: drivers/mtd/spi/spi_flash_internal.h
modified: drivers/mtd/spi/stmicro.c
modified: drivers/spi/ti_qspi.c
modified: include/configs/dra7xx_evm.h
modified: include/configs/omap5_common.h
modified: include/spi.h
modified: include/spi_flash.h
Signed-off-by: Somnath Mukherjee <somnath@ti.com>
arch/arm/cpu/armv7/omap5/hw_data.c
boards.cfg
Following files are modified as a result of merge:
modified: README
modified: arch/arm/cpu/armv7/omap-common/hwinit-common.c
modified: arch/arm/cpu/armv7/omap5/hw_data.c
modified: arch/arm/include/asm/arch-omap5/spl.h
modified: arch/arm/include/asm/arch-omap5/sys_proto.h
modified: board/ti/dra7xx/evm.c
modified: board/ti/dra7xx/mux_data.h
modified: boards.cfg
renamed: README.dra_qspi_test -> doc/README.ti_qspi_dra_test
renamed: README.dra_qspi_flash -> doc/README.ti_qspi_flash
modified: drivers/mtd/spi/spansion.c
modified: drivers/mtd/spi/spi_flash.c
modified: drivers/mtd/spi/spi_flash_internal.h
modified: drivers/mtd/spi/stmicro.c
modified: drivers/spi/ti_qspi.c
modified: include/configs/dra7xx_evm.h
modified: include/configs/omap5_common.h
modified: include/spi.h
modified: include/spi_flash.h
Signed-off-by: Somnath Mukherjee <somnath@ti.com>
1 | 2 | |||
---|---|---|---|---|
arch/arm/cpu/armv7/omap5/hw_data.c | patch | | diff1 | | diff2 | | blob | history |
boards.cfg | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/cpu/armv7/omap5/hw_data.c
Simple merge
diff --cc boards.cfg
index 25388b9ac650aba3b56b777c0c19ee31810e5ba6,7cc59d32f08edd43ebb3f0bdbfb345e60273da3a..977b0f837c4db483d5eb3c82aa2f544aba179f6b
--- 1/boards.cfg
--- 2/boards.cfg
+++ b/boards.cfg
omap4_panda arm armv7 panda ti omap4
omap4_sdp4430 arm armv7 sdp4430 ti omap4
omap5_uevm arm armv7 omap5_uevm ti omap5
++<<<<<<< HEAD
+omap5_earlyboot_uevm arm armv7 omap5_uevm ti omap5
+dra7xx_evm arm armv7 dra7xx ti omap5
++=======
+ dra7xx_evm arm armv7 dra7xx ti omap5 dra7xx_evm:CONS_INDEX=1
+ dra7xx_evm_uart3 arm armv7 dra7xx ti omap5 dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT
++>>>>>>> master
s5p_goni arm armv7 goni samsung s5pc1xx
smdkc100 arm armv7 smdkc100 samsung s5pc1xx
origen arm armv7 origen samsung exynos