Merge branch 'master' of git://git.denx.de/u-boot-arm

Conflicts:
	arch/arm/cpu/armv7/config.mk
	board/ti/am43xx/mux.c
	include/configs/am43xx_evm.h

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc README
Simple merge

diff --cc arch/arm/cpu/armv7/am33xx/clock_am43xx.c
Simple merge

diff --cc arch/arm/cpu/armv7/config.mk
index 247b7a5,c048531..6c82c3b
--- 1/arch/arm/cpu/armv7/config.mk
--- 2/arch/arm/cpu/armv7/config.mk
+++ b/arch/arm/cpu/armv7/config.mk
@@@ -10,6 -10,19 +10,9 @@@
  PF_CPPFLAGS_ARMV7 := $(call cc-option, -march=armv7-a, -march=armv5)
  PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_ARMV7)
  
- # SEE README.arm-unaligned-accesses
+ # On supported platforms we set the bit which causes us to trap on unaligned
+ # memory access.  This is the opposite of what the compiler expects to be
+ # the default so we must pass in -mno-unaligned-access so that it is aware
+ # of our decision.
  PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,)
- PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED)
+ PLATFORM_CPPFLAGS += $(PF_NO_UNALIGNED)
 -
 -ifneq ($(CONFIG_IMX_CONFIG),)
 -ifdef CONFIG_SPL
 -ifdef CONFIG_SPL_BUILD
 -ALL-y += $(OBJTREE)/SPL
 -endif
 -else
 -ALL-y += u-boot.imx
 -endif
 -endif

diff --cc arch/arm/include/asm/arch-am33xx/cpu.h
Simple merge

diff --cc arch/arm/lib/board.c
Simple merge

diff --cc board/ti/am43xx/mux.c
index f96c56f,51f7fd6..c330a81
--- 1/board/ti/am43xx/mux.c
--- 2/board/ti/am43xx/mux.c
+++ b/board/ti/am43xx/mux.c
@@@ -59,8 -49,7 +59,8 @@@ void enable_board_pin_mux(void
        configure_module_pin_mux(i2c0_pin_mux);
  
        if (board_is_gpevm())
-               configure_module_pin_mux(gpio0_22_pin_mux);
+               configure_module_pin_mux(gpio5_7_pin_mux);
 +      configure_module_pin_mux(qspi_pin_mux);
  }
  
  void enable_i2c0_pin_mux(void)

diff --cc boards.cfg
Simple merge

diff --cc common/Makefile
Simple merge

diff --cc common/board_f.c
Simple merge

diff --cc common/cmd_pxe.c
Simple merge

diff --cc include/configs/am43xx_evm.h
index 9a44990,9b4716f..c773a18
--- 1/include/configs/am43xx_evm.h
--- 2/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@@ -84,26 -84,12 +84,32 @@@
  #define CONFIG_OMAP_USB_PHY
  #define CONFIG_AM437X_USB2PHY2_HOST
  
 +/* SPI */
 +#undef CONFIG_OMAP3_SPI
 +#define CONFIG_TI_QSPI
 +#define CONFIG_SPI_FLASH
 +#define CONFIG_SPI_FLASH_MACRONIX
 +#define CONFIG_CMD_SF
 +#define CONFIG_CMD_SPI
 +#define CONFIG_TI_SPI_MMAP
 +#define CONFIG_QSPI_SEL_GPIO                   48
 +#define CONFIG_SF_DEFAULT_SPEED                48000000
 +#define CONFIG_DEFAULT_SPI_MODE                SPI_MODE_3
 +
 +/* SPI SPL */
 +#define CONFIG_SPL_SPI_SUPPORT
 +#define CONFIG_SPL_SPI_LOAD
 +#define CONFIG_SPL_SPI_FLASH_SUPPORT
 +#define CONFIG_SPL_SPI_BUS             0
 +#define CONFIG_SPL_SPI_CS              0
 +#define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 +
+ /* Enhance our eMMC support / experience. */
+ #define CONFIG_CMD_GPT
+ #define CONFIG_EFI_PARTITION
+ #define CONFIG_PARTITION_UUIDS
+ #define CONFIG_CMD_PART
+ 
  #ifndef CONFIG_SPL_BUILD
  #define CONFIG_EXTRA_ENV_SETTINGS \
        "loadaddr=0x80200000\0" \