Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

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

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 015eeab..f958ceb 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -26,7 +26,6 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK     18432000
 
 #define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9261"
-#define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_MACH_TYPE       MACH_TYPE_PM9261
 
@@ -154,7 +153,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE      1
 
 /* SDRAM */
-#define CONFIG_NR_DRAM_BANKS                   1
 #define PHYS_SDRAM                             0x20000000
 #define PHYS_SDRAM_SIZE                                0x04000000      /* 64 megs */
 
@@ -170,8 +168,6 @@
 #define CONFIG_SYS_NAND_READY_PIN              GPIO_PIN_PA(16)
 
 /* NOR flash */
-#define CONFIG_SYS_FLASH_CFI                   1
-#define CONFIG_FLASH_CFI_DRIVER                        1
 #define PHYS_FLASH_1                           0x10000000
 #define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
 #define CONFIG_SYS_MAX_FLASH_SECT              256
@@ -207,10 +203,6 @@
 #ifdef CONFIG_SYS_USE_DATAFLASH_CS0
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_ENV_OFFSET      0x4200
-#define CONFIG_ENV_SIZE                0x4200
-#define CONFIG_ENV_SECT_SIZE   0x210
-#define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x210000; " \
                                "bootm 0x22000000"
@@ -218,16 +210,10 @@
 #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_OFFSET              0x60000
-#define CONFIG_ENV_OFFSET_REDUND       0x80000
-#define CONFIG_ENV_SIZE                        0x20000         /* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
 
 #elif defined (CONFIG_SYS_USE_FLASH)
 
-#define CONFIG_ENV_OFFSET      0x40000
-#define CONFIG_ENV_SECT_SIZE   0x10000
-#define        CONFIG_ENV_SIZE         0x10000
 #define CONFIG_ENV_OVERWRITE   1
 
 /* JFFS Partition offset set */