rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 7df7280..4b75e15 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -43,7 +43,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN     (CFG_ENV_SIZE + 256*1024)
+#define CFG_MALLOC_LEN     (CONFIG_ENV_SIZE + 256*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 /*
@@ -89,6 +89,15 @@
 
 
 /*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
@@ -109,6 +118,20 @@
 
 #endif
 
+/* USB */
+#define CONFIG_USB_OHCI_NEW    1
+#define CONFIG_USB_STORAGE      1
+#define CONFIG_DOS_PARTITION    1
+
+#include <asm/arch/pxa-regs.h> /* for OHCI_REGS_BASE */
+
+#undef CFG_USB_OHCI_BOARD_INIT
+#define CFG_USB_OHCI_CPU_INIT  1
+#define CFG_USB_OHCI_REGS_BASE OHCI_REGS_BASE
+#define CFG_USB_OHCI_SLOT_NAME "delta"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS    3
+
+#define LITTLEENDIAN            1       /* used by usb_ohci.c  */
 
 #define CONFIG_BOOTDELAY       -1
 #define CONFIG_ETHADDR         08:00:3e:26:0a:5b
@@ -194,7 +217,7 @@
 /*
  * NAND Flash
  */
-#undef CFG_NAND_LEGACY
+#undef CONFIG_NAND_LEGACY
 
 #define CFG_NAND0_BASE         0x0 /* 0x43100040 */ /* 0x10000000 */
 #undef CFG_NAND1_BASE
@@ -239,9 +262,9 @@
 
 #define CFG_NO_FLASH           1
 
-#define CFG_ENV_IS_IN_NAND     1
-#define CFG_ENV_OFFSET         0x40000
-#define CFG_ENV_OFFSET_REDUND  0x44000
-#define CFG_ENV_SIZE           0x4000
+#define CONFIG_ENV_IS_IN_NAND  1
+#define CONFIG_ENV_OFFSET              0x40000
+#define CONFIG_ENV_OFFSET_REDUND       0x44000
+#define CONFIG_ENV_SIZE                0x4000
 
 #endif /* __CONFIG_H */