Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[oweals/u-boot.git] / include / configs / davinci_sonata.h

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index b2c0d7d175d67d7077e33d4ce76b5af32096f3df..ba68605a0557edc6a1d43599398f41674956e655 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -60,24 +60,6 @@
 #define CFG_TIMERBASE          0x01c21400      /* use timer 0 */
 #define CFG_HZ_CLOCK           27000000        /* Timer Input clock freq */
 #define CFG_HZ                 1000
-#define CFG_DAVINCI_PINMUX_0   0x00000c1f
-#define CFG_DAVINCI_WAITCFG    0x00000000
-#define CFG_DAVINCI_ACFG2      0x3ffffffd      /* CE configs */
-#define CFG_DAVINCI_ACFG3      0x3ffffffd
-#define CFG_DAVINCI_ACFG4      0x3ffffffd
-#define CFG_DAVINCI_ACFG5      0x3ffffffd
-#undef  CFG_DAVINCI_NANDCE             /* When using NAND, define 2,3 or 4 */
-#define CFG_DAVINCI_DDRCTL     0x50006405      /* DDR timing config */
-#define CFG_DAVINCI_SDREF      0x000005c3
-#define CFG_DAVINCI_SDCFG      0x00178632      /* 8 banks */
-#define CFG_DAVINCI_SDTIM0     0x28923211
-#define CFG_DAVINCI_SDTIM1     0x0016c722
-#define CFG_DAVINCI_MMARG_BRF0 0x00444400
-/* DM6446 = 0x15, DM6441 = 0x12, DM6441_LV = 0x0e */
-#define CFG_DAVINCI_PLL1_PLLM  0x15
-#define CFG_DAVINCI_PLL2_PLLM  0x17            /* 162 MHz */
-#define CFG_DAVINCI_PLL2_DIV1  0x0b            /* 54 MHz */
-#define CFG_DAVINCI_PLL2_DIV2  0x01
 /*====================================================*/
 /* EEPROM definitions for Atmel 24C256BN SEEPROM chip */
 /* on Sonata/DV_EVM board. No EEPROM on schmoogie.    */
@@ -158,16 +140,16 @@
 #define CFG_MAX_FLASH_BANKS    1               /* max number of flash banks */
 #define CFG_FLASH_SECT_SZ      0x20000         /* 128KB sect size AMD Flash */
 #define CFG_ENV_OFFSET         (CFG_FLASH_SECT_SZ*2)
-#define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
+#define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
 #define CFG_FLASH_BASE         PHYS_FLASH_1    /* Flash Base for U-Boot */
-#define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */
+#define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */
 #define CFG_MAX_FLASH_SECT     (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
 #define CFG_ENV_SECT_SIZE      CFG_FLASH_SECT_SZ       /* Env sector Size */
 #endif
 /*==============================*/
 /* U-Boot general configuration */
 /*==============================*/
-#undef         CONFIG_USE_IRQ                  /* No IRQ/FIQ in U-Boot */
+#undef CONFIG_USE_IRQ                  /* No IRQ/FIQ in U-Boot */
 #define CONFIG_MISC_INIT_R
 #undef CONFIG_BOOTDELAY
 #define CONFIG_BOOTFILE                "uImage"        /* Boot file name */