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

[oweals/u-boot.git] / include / configs / minnowmax.h

diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index aeb04b96b4b6fcbf9838407e130636908dd1eabb..95ad1287f60c4d3f063199005c5f12c0360f87b3 100644 (file)
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -19,10 +19,7 @@
 
 #define CONFIG_SMSC_LPC47M
 
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
-#define CONFIG_SYS_EARLY_PCI_INIT
 #define CONFIG_PCI_PNP
-#define CONFIG_RTL8169
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
                                        "stdout=vga,serial\0" \
                                        "stderr=vga,serial\0"
@@ -31,25 +28,18 @@
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT}
 
-#define CONFIG_SPI_FLASH_STMICRO
-
 #define CONFIG_MMC
 #define CONFIG_SDHCI
 #define CONFIG_GENERIC_MMC
 #define CONFIG_MMC_SDMA
-#define CONFIG_CMD_MMC
 
 #undef CONFIG_USB_MAX_CONTROLLER_COUNT
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                1
 
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-
-#define CONFIG_FIT_SIGNATURE
-#define CONFIG_RSA
 
 #define CONFIG_ENV_SECT_SIZE           0x1000
-#define CONFIG_ENV_OFFSET              0x007fe000
+#define CONFIG_ENV_OFFSET              0x006ef000
 
 #endif /* __CONFIG_H */