am335x_evm: do not define usb ether gadget when Eth DM is defined

[u-boot] / include / configs / rpi-common.h

diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index dd638c485cf494075783d2fcac62fada70715436..06836cd5d8e916bd51197fdc55e9541952afcccc 100644 (file)
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -115,7 +115,6 @@
 
 /* Shell */
 #define CONFIG_SYS_MAXARGS             8
-#define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_COMMAND_HISTORY
 
 /* Commands */
@@ -164,10 +163,10 @@
  *   for the FDT/DTB to be up to 1M, which is hopefully plenty.
  */
 #define ENV_MEM_LAYOUT_SETTINGS \
-       "scriptaddr=0x00000000\0" \
+       "fdt_addr_r=0x00000100\0" \
        "pxefile_addr_r=0x00100000\0" \
        "kernel_addr_r=0x01000000\0" \
-       "fdt_addr_r=0x02000000\0" \
+       "scriptaddr=0x02000000\0" \
        "ramdisk_addr_r=0x02100000\0" \
 
 #define BOOT_TARGET_DEVICES(func) \