mpc83xx: add h/w flash protection to board configs

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

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 168ca2a..baff03e 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -22,8 +22,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 /*
  * High Level Configuration Options
  */
@@ -170,7 +168,7 @@
 #undef CFG_RAMBOOT
 #endif
 
-/* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of CONFIG_ENV_SECT_SIZE */
 #define CFG_MONITOR_LEN                (256 * 1024) /* Reserve 256 kB for Mon */
 #define CFG_MALLOC_LEN         (128 * 1024) /* Reserved for malloc */
 
@@ -193,9 +191,11 @@
  * FLASH on the Local Bus
  */
 #define CFG_FLASH_CFI          /* use the Common Flash Interface */
-#define CFG_FLASH_CFI_DRIVER   /* use the CFI driver */
+#define CONFIG_FLASH_CFI_DRIVER        /* use the CFI driver */
 #define CFG_FLASH_BASE         0xFE000000 /* FLASH base address */
 #define CFG_FLASH_SIZE         32 /* max FLASH size is 32M */
+#define CFG_FLASH_PROTECTION   1               /* Use h/w Flash protection. */
+#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
 
 #define CFG_LBLAWBAR0_PRELIM   CFG_FLASH_BASE /* Window base at flash base */
 #define CFG_LBLAWAR0_PRELIM    0x80000018 /* 32MB window size */
@@ -204,7 +204,7 @@
                        (2 << BR_PS_SHIFT) | /* 16 bit port size */ \
                        BR_V)   /* valid */
 #define CFG_OR0_PRELIM         ((~(CFG_FLASH_SIZE - 1) << 20) | OR_UPM_XAM | \
-                               OR_GPCM_CSNT | OR_GPCM_ACS_0b11 | OR_GPCM_XACS | OR_GPCM_SCY_15 | \
+                               OR_GPCM_CSNT | OR_GPCM_ACS_DIV2 | OR_GPCM_XACS | OR_GPCM_SCY_15 | \
                                OR_GPCM_TRLX | OR_GPCM_EHTR | OR_GPCM_EAD)
 
 #define CFG_MAX_FLASH_BANKS    1 /* number of banks */
@@ -376,7 +376,7 @@
 #define CFG_PCI_MMIO_BASE      0x90000000
 #define CFG_PCI_MMIO_PHYS      CFG_PCI_MMIO_BASE
 #define CFG_PCI_MMIO_SIZE      0x10000000 /* 256M */
-#define CFG_PCI_IO_BASE                0xE0300000
+#define CFG_PCI_IO_BASE                0x00000000
 #define CFG_PCI_IO_PHYS                0xE0300000
 #define CFG_PCI_IO_SIZE                0x100000 /* 1M */
 
@@ -435,15 +435,15 @@
  */
 
 #ifndef CFG_RAMBOOT
-       #define CFG_ENV_IS_IN_FLASH     1
-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-       #define CFG_ENV_SECT_SIZE       0x20000
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_IS_IN_FLASH  1
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+       #define CONFIG_ENV_SECT_SIZE    0x20000
+       #define CONFIG_ENV_SIZE         0x2000
 #else
        #define CFG_NO_FLASH            1       /* Flash is not usable now */
-       #define CFG_ENV_IS_NOWHERE      1       /* Store ENV in memory only */
-       #define CFG_ENV_ADDR            (CFG_MONITOR_BASE - 0x1000)
-       #define CFG_ENV_SIZE            0x2000
+       #define CONFIG_ENV_IS_NOWHERE   1       /* Store ENV in memory only */
+       #define CONFIG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
+       #define CONFIG_ENV_SIZE         0x2000
 #endif
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
@@ -516,6 +516,8 @@
  * MMU Setup
  */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /* DDR: cache cacheable */
 #define CFG_IBAT0L     (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
 #define CFG_IBAT0U     (CFG_SDRAM_BASE | BATU_BL_256M | BATU_VS | BATU_VP)
@@ -606,7 +608,7 @@
 
 #define CONFIG_BAUDRATE 115200
 
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
 
 #define CONFIG_BOOTDELAY 6     /* -1 disables auto-boot */
 #undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
@@ -617,7 +619,7 @@
    "ramdiskaddr=1000000\0"                                             \
    "ramdiskfile=ramfs.83xx\0"                                          \
    "fdtaddr=400000\0"                                                  \
-   "fdtfile=mpc8360emds.dtb\0"                                         \
+   "fdtfile=mpc836x_mds.dtb\0"                                         \
    ""
 
 #define CONFIG_NFSBOOTCOMMAND                                          \