integratorap/cp: use cfi driver

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

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 9231e640392cfde3b84531e412d6551efa44ce67..e0e82583410516c1c0f4fca9a6da2aaf8821d3bb 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -44,7 +44,7 @@
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_MISC_INIT_R     1       /* call misc_init_r during start up */
 
-#undef CONFIG_INIT_CRITICAL
+#define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_CM_INIT         1
 #define CONFIG_CM_REMAP                1
 #undef CONFIG_CM_SPD_DETECT
@@ -122,27 +122,27 @@
 #define PHYS_SDRAM_1           0x00000000      /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE      0x02000000      /* 32 MB */
 
-#define CONFIG_SYS_FLASH_BASE          0x24000000
+#define CONFIG_SYS_FLASH_BASE  0x24000000
 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
+#define CONFIG_SYS_FLASH_CFI           1
+#define CONFIG_FLASH_CFI_DRIVER                1
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_MAX_FLASH_BANKS     1               /* max number of memory banks */
-#define PHYS_FLASH_SIZE                0x01000000      /* 16MB */
 /* timeout values are in ticks */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    (2*CONFIG_SYS_HZ)       /* Timeout for Flash Erase */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    (2*CONFIG_SYS_HZ)       /* Timeout for Flash Write */
 #define CONFIG_SYS_MAX_FLASH_SECT      128
-#define CONFIG_ENV_SIZE                32768
+#define CONFIG_ENV_SIZE                        32768
 
-#define PHYS_FLASH_1           (CONFIG_SYS_FLASH_BASE)
 
 /*-----------------------------------------------------------------------
  * PCI definitions
  */
 
-/*#define CONFIG_PCI                   /--* include pci support        */
+#ifdef CONFIG_PCI                      /* pci support  */
 #undef CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW   1       /* show pci devices on startup  */
 #define DEBUG
@@ -150,7 +150,6 @@
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */
 
-
 #define INTEGRATOR_BOOT_ROM_BASE       0x20000000
 #define INTEGRATOR_HDR0_SDRAM_BASE     0x80000000
 
@@ -278,6 +277,7 @@
 #define INTEGRATOR_SC_PCIENABLE \
                        (INTEGRATOR_SC_BASE + INTEGRATOR_SC_PCIENABLE_OFFSET)
 
+#endif /* CONFIG_PCI */
 /*-----------------------------------------------------------------------
  * There are various dependencies on the core module (CM) fitted
  * Users should refer to their CM user guide