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

[u-boot] / configs / edison_defconfig

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index cefcfa8d1de8ee839c98e109796bef89fd73f662..54305fca6c295c666f6bd9efbdce690933d23dd9 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -1,21 +1,24 @@
 CONFIG_X86=y
+CONFIG_SYS_TEXT_BASE=0x1101000
 CONFIG_VENDOR_INTEL=y
 CONFIG_DEFAULT_DEVICE_TREE="edison"
 CONFIG_TARGET_EDISON=y
 CONFIG_SMP=y
+CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMDLINE_EDITING is not set
 CONFIG_CMD_CPU=y
-# CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_ENV_CALLBACK=y
 CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PART=y
-CONFIG_CMD_DFU=y
+# CONFIG_CMD_PCI is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_TIMER=y
 CONFIG_CMD_HASH=y
@@ -24,16 +27,17 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
-CONFIG_DM_MMC=y
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Intel"
+CONFIG_USB_GADGET_VENDOR_NUM=0x8087
+CONFIG_USB_GADGET_PRODUCT_NUM=0x0a99
 CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_G_DNL_MANUFACTURER="Intel"
-CONFIG_G_DNL_VENDOR_NUM=0x8087
-CONFIG_G_DNL_PRODUCT_NUM=0x0a99
+# CONFIG_USB_HOST_ETHER is not set
 CONFIG_FAT_WRITE=y
 CONFIG_SHA1=y