Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / durian.h

diff --git a/include/configs/durian.h b/include/configs/durian.h
index fa48e5c..c224511 100644 (file)
--- a/include/configs/durian.h
+++ b/include/configs/durian.h
@@ -13,24 +13,9 @@
 #define PHYS_SDRAM_1_SIZE              0x7B000000
 #define CONFIG_SYS_SDRAM_BASE   PHYS_SDRAM_1
 
-#define CONFIG_SYS_LOAD_ADDR   (CONFIG_SYS_SDRAM_BASE + 0x10000000)
-
-/* Size of Malloc Pool */
-#define CONFIG_SYS_MALLOC_LEN  (1 * 1024 * 1024  + CONFIG_ENV_SIZE)
-
-#define CONFIG_SYS_INIT_SP_ADDR                (0x88000000 - 0x100000)
-
 /* PCI CONFIG */
-#define CONFIG_SYS_PCI_64BIT    1
 #define CONFIG_PCI_SCAN_SHOW
 
-/* SCSI */
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
-#define CONFIG_SYS_SCSI_MAX_LUN 1
-#define CONFIG_SYS_SCSI_MAX_DEVICE 128
-#define CONFIG_SCSI_AHCI_PLAT
-#define CONFIG_SYS_SATA_MAX_DEVICE 4
-
 /* BOOT */
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)