arm: Disable ATAGs support

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

diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index 952993f..b573bdc 100644 (file)
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -6,14 +6,7 @@
  * Common ARM Integrator configuration settings
  */
 
-#define CONFIG_SYS_MEMTEST_START       0x100000
-#define CONFIG_SYS_MEMTEST_END         0x10000000
 #define CONFIG_SYS_TIMERBASE           0x13000100      /* Timer1 */
-#define CONFIG_SYS_LOAD_ADDR           0x7fc0  /* default load address */
-#define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
-
-#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs  */
-#define CONFIG_SETUP_MEMORY_TAGS
 
 /*
  * There are various dependencies on the core module (CM) fitted
@@ -50,7 +43,6 @@
  * image to run at reset/power up
  * e.g. whether the ARM Boot Monitor runs before U-Boot
  */
-/* #define CONFIG_SKIP_LOWLEVEL_INIT */
 
 /*
  * The ARM boot monitor does not relocate U-Boot.
@@ -81,13 +73,10 @@
  * - SIB block
  * - U-Boot environment
  */
-#define CONFIG_SYS_FLASH_CFI           1
-#define CONFIG_FLASH_CFI_DRIVER                1
 #define CONFIG_SYS_FLASH_BASE          0x24000000
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 
 /* Timeout values in ticks */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    (2 * CONFIG_SYS_HZ) /* Erase Timeout */
 #define CONFIG_SYS_FLASH_WRITE_TOUT    (2 * CONFIG_SYS_HZ) /* Write Timeout */
-#define CONFIG_SYS_FLASH_PROTECTION    /* The devices have real protection */
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */