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

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

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 591fb5cd158d0c3c40ea401235360bb4d9ec38bf..1e71bcc3effb4b6c767d1f3bacc2ac8c040f09ad 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -41,6 +41,7 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_RUN
 #define CONFIG_CMD_SAVEENV
+#define CONFIG_CMD_SH_ZIMAGEBOOT
 
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
@@ -62,6 +63,7 @@
 
 /* MEMORY */
 #if defined(CONFIG_SH_32BIT)
+#define CONFIG_SYS_TEXT_BASE           0x8FF80000
 /* 0x40000000 - 0x47FFFFFF does not use */
 #define CONFIG_SH_SDRAM_OFFSET         (0x8000000)
 #define SH7785LCR_SDRAM_PHYS_BASE      (0x40000000 + CONFIG_SH_SDRAM_OFFSET)
@@ -71,6 +73,7 @@
 #define SH7785LCR_FLASH_BANK_SIZE      (64 * 1024 * 1024)
 #define SH7785LCR_USB_BASE             (0xa6000000)
 #else
+#define CONFIG_SYS_TEXT_BASE           0x0FF80000
 #define SH7785LCR_SDRAM_BASE           (0x08000000)
 #define SH7785LCR_SDRAM_SIZE           (128 * 1024 * 1024)
 #define SH7785LCR_FLASH_BASE_1         (0xa0000000)
@@ -172,7 +175,6 @@
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
 /* Network device (RTL8169) support */
-#define CONFIG_NET_MULTI
 #define CONFIG_RTL8169
 
 /* ENV setting */