Merge tag 'u-boot-amlogic-20190423' of git://git.denx.de/u-boot-amlogic

[oweals/u-boot.git] / configs / edison_defconfig

diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index 0aa7a45a9159418a0cbb9a90e5b55411eb9833aa..abfa02d682fb787879427ea7127a8eb0b2834f22 100644 (file)
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -1,11 +1,13 @@
 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_NR_DRAM_BANKS=3
+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
@@ -23,17 +25,19 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="edison"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CPU=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DM_PCI_COMPAT=y
+CONFIG_RTC_MC146818=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