Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value

[u-boot] / include / configs / MVBLM7.h

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 9835567838f2b5f9aa9a3c27cdee105ab7f72b6a..c201310f268179c8e8595f27df73806656082ac6 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -37,6 +37,8 @@
 #define CONFIG_MPC834x 1
 #define CONFIG_MPC8343 1
 
+#define        CONFIG_SYS_TEXT_BASE    0xFFF00000
+
 #define CONFIG_SYS_IMMR                0xE0000000
 
 #define CONFIG_PCI
@@ -116,15 +118,14 @@
 /*
  * U-Boot memory configuration
  */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #undef CONFIG_SYS_RAMBOOT
 
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR       0xFD000000      /* Initial RAM address */
-#define CONFIG_SYS_INIT_RAM_END        0x1000          /* End of used area in RAM*/
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000          /* Size of used area in RAM*/
 
-#define CONFIG_SYS_GBL_DATA_SIZE       0x100           /* num bytes initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /* CONFIG_SYS_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
@@ -137,7 +138,8 @@
  * External Local Bus rate is
  *  CLKIN * HRCWL_CSB_TO_CLKIN / HRCWL_LCL_BUS_TO_SCB_CLK / LCRR_CLKDIV
  */
-#define CONFIG_SYS_LCRR        (LCRR_DBYP | LCRR_CLKDIV_4)
+#define CONFIG_SYS_LCRR_DBYP   LCRR_DBYP
+#define CONFIG_SYS_LCRR_CLKDIV LCRR_CLKDIV_4
 #define CONFIG_SYS_LBC_LBCR    0x00000000
 
 /* LB sdram refresh timer, about 6us */
@@ -149,7 +151,6 @@
  * Serial Port
  */
 #define CONFIG_CONS_INDEX      1
-#undef CONFIG_SERIAL_SOFTWARE_FIFO
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
@@ -186,7 +187,7 @@
 #define CONFIG_NET_MULTI       1
 #define CONFIG_NET_RETRY_COUNT 3
 
-#define PCI_66M
+#define CONFIG_PCI_66M
 #define CONFIG_83XX_CLKIN      66666667
 #define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW
@@ -233,7 +234,11 @@
 #define CONFIG_BOOTP_SEND_HOSTNAME
 
 /* USB */
+#define CONFIG_SYS_USB_HOST
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_FSL
 #define CONFIG_HAS_FSL_DR_USB
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 /*
  * Environment
@@ -266,6 +271,8 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_FPGA
+#define CONFIG_CMD_USB
+#define CONFIG_DOS_PARTITION
 
 #undef CONFIG_WATCHDOG
 
@@ -274,6 +281,7 @@
  */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE           /* add autocompletion support   */
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
@@ -292,10 +300,10 @@
 
 /*
  * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
+ * have to be in the first 256 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CONFIG_SYS_BOOTMAPSZ   (8 << 20)       /* Initial Memory map for Linux*/
+#define CONFIG_SYS_BOOTMAPSZ   (256 << 20)     /* Initial Memory map for Linux*/
 
 #define CONFIG_SYS_HRCW_LOW    0x0
 #define CONFIG_SYS_HRCW_HIGH   0x0
@@ -315,11 +323,12 @@
 #define CONFIG_SYS_SCCR_TSEC1CM        1
 #define CONFIG_SYS_SCCR_TSEC2CM        1
 
-#define CONFIG_SYS_SICRH       0x1fff8003
+#define CONFIG_SYS_SICRH       0x1fef0003
 #define CONFIG_SYS_SICRL       (SICRL_LDP_A | SICRL_USB1 | SICRL_USB0)
 
 #define CONFIG_SYS_HID0_INIT   0x000000000
-#define CONFIG_SYS_HID0_FINAL  CONFIG_SYS_HID0_INIT
+#define CONFIG_SYS_HID0_FINAL  (CONFIG_SYS_HID0_INIT | \
+                                HID0_ENABLE_INSTRUCTION_CACHE)
 
 #define CONFIG_SYS_HID2        HID2_HBE
 #define CONFIG_HIGH_BATS       1
@@ -370,15 +379,6 @@
 #define CONFIG_SYS_DBAT7L      CONFIG_SYS_IBAT7L
 #define CONFIG_SYS_DBAT7U      CONFIG_SYS_IBAT7U
 
-/*
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01    /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02    /* Software reboot */
-
-
 /*
  * Environment Configuration
  */