Merge branch 'evk1100-prep'

[karo-tx-uboot.git] / include / configs / sh7785lcr.h

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 1b59059451a6126a821f2ad28ffe27d631692cc4..21c3f70f5c9244d52bda79d8fb2532cb8ffad5f1 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -40,7 +40,7 @@
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_RUN
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
@@ -61,11 +61,20 @@
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
 /* MEMORY */
+#if defined(CONFIG_SH_32BIT)
+#define SH7785LCR_SDRAM_PHYS_BASE      (0x48000000)
+#define SH7785LCR_SDRAM_BASE           (0x88000000)
+#define SH7785LCR_SDRAM_SIZE           (384 * 1024 * 1024)
+#define SH7785LCR_FLASH_BASE_1         (0xa0000000)
+#define SH7785LCR_FLASH_BANK_SIZE      (64 * 1024 * 1024)
+#define SH7785LCR_USB_BASE             (0xa6000000)
+#else
 #define SH7785LCR_SDRAM_BASE           (0x08000000)
 #define SH7785LCR_SDRAM_SIZE           (128 * 1024 * 1024)
 #define SH7785LCR_FLASH_BASE_1         (0xa0000000)
 #define SH7785LCR_FLASH_BANK_SIZE      (64 * 1024 * 1024)
 #define SH7785LCR_USB_BASE             (0xb4000000)
+#endif
 
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT              "=> "
@@ -123,7 +132,6 @@
 #undef CONFIG_SYS_DIRECT_FLASH_TFTP
 
 /* R8A66597 */
-#define LITTLEENDIAN                   /* for include/usb.h */
 #define CONFIG_USB_R8A66597_HCD
 #define CONFIG_R8A66597_BASE_ADDR      SH7785LCR_USB_BASE
 #define CONFIG_R8A66597_XTAL           0x0000  /* 12MHz */
@@ -134,6 +142,15 @@
 #define CONFIG_PCI
 #define CONFIG_SH4_PCI
 #define CONFIG_SH7780_PCI
+#if defined(CONFIG_SH_32BIT)
+#define CONFIG_SH7780_PCI_LSR  0x1ff00001
+#define CONFIG_SH7780_PCI_LAR  0x5f000000
+#define CONFIG_SH7780_PCI_BAR  0x5f000000
+#else
+#define CONFIG_SH7780_PCI_LSR  0x07f00001
+#define CONFIG_SH7780_PCI_LAR  CONFIG_SYS_SDRAM_SIZE
+#define CONFIG_SH7780_PCI_BAR  CONFIG_SYS_SDRAM_SIZE
+#endif
 #define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW   1
 
@@ -145,6 +162,14 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x00200000      /* Size of IO window */
 
+#if defined(CONFIG_SH_32BIT)
+#define CONFIG_PCI_SYS_PHYS    SH7785LCR_SDRAM_PHYS_BASE
+#else
+#define CONFIG_PCI_SYS_PHYS    CONFIG_SYS_SDRAM_BASE
+#endif
+#define CONFIG_PCI_SYS_BUS     CONFIG_SYS_SDRAM_BASE
+#define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
+
 /* Network device (RTL8169) support */
 #define CONFIG_NET_MULTI
 #define CONFIG_RTL8169