OMAP: rename timer divisor

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

diff --git a/include/configs/nmdk8815.h b/include/configs/nmdk8815.h
index 01de08fab70ddb5301290a77e8abc0630c44e836..6d7b94f9c9e9f6d925455f6e4f23df541781d1fb 100644 (file)
--- a/include/configs/nmdk8815.h
+++ b/include/configs/nmdk8815.h
@@ -25,6 +25,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <nomadik.h>
+
 #define CONFIG_ARM926EJS
 #define CONFIG_NOMADIK
 #define CONFIG_NOMADIK_8815
@@ -35,12 +37,18 @@
 
 /* commands */
 #include <config_cmd_default.h>
+
+#define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-/* At this point there is no flash driver, so remove some commands */
-#undef CONFIG_CMD_ENV
+#define CONFIG_CMD_NFS
+/* There is no NOR flash, so undefine these commands */
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_IMLS
+#define CONFIG_SYS_NO_FLASH
+/* There is NAND storage */
+#define CONFIG_NAND_NOMADIK
+#define CONFIG_CMD_JFFS2
 
 /* user interface */
 #define CONFIG_SYS_LONGHELP
@@ -88,7 +96,6 @@
 /* timing informazion */
 #define CONFIG_SYS_HZ          (2400000 / 256) /* Timer0: 2.4Mhz + divider */
 #define CONFIG_SYS_TIMERBASE   0x101E2000
-#undef CONFIG_SYS_CLKS_IN_HZ
 
 /* serial port (PL011) configuration */
 #define CONFIG_PL011_SERIAL
@@ -118,13 +125,11 @@
 #define CONFIG_MTD_ONENAND_VERIFY_WRITE
 #define CONFIG_SYS_ONENAND_BASE                0x30000000
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_NAND_BASE           0x40000000
-
-#define CONFIG_SYS_NO_FLASH
+#define CONFIG_SYS_NAND_BASE           0x40000000 /* SMPS0n */
 
 #ifdef CONFIG_BOOT_ONENAND
 
-#   undef CONFIG_CMD_NAND /* Temporary: nand and onenand can't coexist */
+#   define CONFIG_CMD_ONENAND /* Temporary: nand and onenand can't coexist */
    /* Partition                                Size    Start
     * XloaderTOC + X-Loader            256KB   0x00000000
     * Memory init function             256KB   0x00040000
@@ -142,7 +147,7 @@
 
 #else /* ! CONFIG_BOOT_ONENAND */
 
-#   undef CONFIG_CMD_ONENAND /* Temporary: nand and onenand can't coexist */
+#   define CONFIG_CMD_NAND /* Temporary: nand and onenand can't coexist */
 
 #   define CONFIG_JFFS2_DEV            "nand0"
 #   define CONFIG_JFFS2_NAND           1 /* For the jffs2 support*/
@@ -150,39 +155,13 @@
 #   define CONFIG_JFFS2_PART_OFFSET    0x00280000
 
 #   define CONFIG_ENV_IS_IN_NAND
-#   define CONFIG_ENV_SIZE             0x20000 /*128 Kb*/
+#   define CONFIG_ENV_SIZE             0x20000 /* 128 Kb - one sector */
 #   define CONFIG_ENV_OFFSET           (0x8000000 - CONFIG_ENV_SIZE)
 
 #endif /* CONFIG_BOOT_ONENAND */
 
-/* Temporarily, until we have no driver, env is not in nand */
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_NOWHERE
-
 /* this is needed to make hello_world.c and other stuff happy */
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 
-/* base addresses of our peripherals */
-#define NOMADIK_SRC_BASE       0x101E0000      /* System and Reset Cnt */
-#define NOMADIK_PMU_BASE       0x101E9000      /* Power Management Unit */
-#define NOMADIK_MPMC_BASE      0x10110000      /* SDRAM Controller */
-#define NOMADIK_FSMC_BASE      0x10100000      /* FSMC Controller */
-#define NOMADIK_1NAND_BASE     0x30000000
-#define NOMADIK_GPIO0_BASE     0x101E4000
-#define NOMADIK_GPIO1_BASE     0x101E5000
-#define NOMADIK_GPIO2_BASE     0x101E6000
-#define NOMADIK_GPIO3_BASE     0x101E7000
-#define NOMADIK_CPLD_BASE      0x36000000
-#define NOMADIK_UART0_BASE     0x101FD000
-#define NOMADIK_UART1_BASE     0x101FB000
-#define NOMADIK_UART2_BASE     0x101F2000
-
-#define NOMADIK_I2C1_BASE      0x101F7000      /* I2C1 interface */
-#define NOMADIK_I2C0_BASE      0x101F8000      /* I2C0 interface */
-
-#define NOMADIK_RTC_BASE       0x101E8000
-#define NOMADIK_ETH0_BASE      0x36800300
-#define NOMADIK_CPLD_UART_BASE 0x36480000
-
 #endif /* __CONFIG_H */