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

diff --combined include/configs/omap3_beagle.h
index a5b7a400cd18b9ad030d6853c134d5f3f37a8032,d07e52dfd3dc5998e39b903aaf6c6b9f5af2c5e9..0a7df60f2815276aec98c113a1ae8a8a99355009
--- 1/include/configs/omap3_beagle.h
--- 2/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@@ -66,16 -66,6 +66,16 @@@
  #define CONFIG_TWL4030_USB            1
  #define CONFIG_USB_ETHER
  #define CONFIG_USB_ETHER_RNDIS
 +#define CONFIG_USB_GADGET
 +#define CONFIG_USB_GADGET_VBUS_DRAW   0
 +#define CONFIG_USBDOWNLOAD_GADGET
 +#define CONFIG_G_DNL_VENDOR_NUM               0x0451
 +#define CONFIG_G_DNL_PRODUCT_NUM      0xd022
 +#define CONFIG_G_DNL_MANUFACTURER     "TI"
 +#define CONFIG_CMD_FASTBOOT
 +#define CONFIG_ANDROID_BOOT_IMAGE
 +#define CONFIG_USB_FASTBOOT_BUF_ADDR  CONFIG_SYS_LOAD_ADDR
 +#define CONFIG_USB_FASTBOOT_BUF_SIZE  0x07000000
  
  /* USB EHCI */
  #define CONFIG_CMD_USB
@@@ -180,11 -170,17 +180,17 @@@
                "if test $beaglerev = C4; then " \
                        "setenv fdtfile omap3-beagle.dtb; fi; " \
                "if test $beaglerev = xMAB; then " \
-                       "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
+                       "setenv fdtfile omap3-beagle-xm-ab.dtb; fi; " \
                "if test $beaglerev = xMC; then " \
                        "setenv fdtfile omap3-beagle-xm.dtb; fi; " \
                "if test $fdtfile = undefined; then " \
                        "echo WARNING: Could not determine device tree to use; fi; \0" \
+       "validatefdt=" \
+               "if test $beaglerev = xMAB; then " \
+                       "if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \
+                               "setenv fdtfile omap3-beagle-xm.dtb; " \
+                       "fi; " \
+               "fi; \0" \
        "bootenv=uEnv.txt\0" \
        "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
        "importbootenv=echo Importing environment from mmc ...; " \
@@@ -200,7 -196,7 +206,7 @@@
                "rootfstype=${ramrootfstype}\0" \
        "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
        "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-       "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+       "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "bootm ${loadaddr}\0" \