common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL

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

diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 321adfa..2b640dc 100644 (file)
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -55,6 +55,7 @@
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_PROMPT              "Nomadik> "
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
+#define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE \
                                        + sizeof(CONFIG_SYS_PROMPT) + 16)
@@ -91,10 +92,10 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 256 * 1024)
 #define CONFIG_SYS_GBL_DATA_SIZE       128     /* for initial data */
 
-#define CONFIG_MISC_INIT_R     /* call misc_init_r during start up */
+#define BOARD_LATE_INIT                /* call board_late_init during start up */
 
 /* timing informazion */
-#define CONFIG_SYS_HZ          (2400000 / 256) /* Timer0: 2.4Mhz + divider */
+#define CONFIG_SYS_HZ          1000 /* Mandatory... */
 #define CONFIG_SYS_TIMERBASE   0x101E2000
 
 /* serial port (PL011) configuration */
@@ -108,55 +109,87 @@
 #define CONFIG_PL01x_PORTS     { (void *)CFG_SERIAL0, (void *)CFG_SERIAL1 }
 #define CONFIG_PL011_CLOCK     48000000
 
+/* i2c, for the port extenders (uses gpio.c in board directory) */
+#ifndef __ASSEMBLY__
+#include <asm/arch/gpio.h>
+#define CONFIG_CMD_I2C
+#define CONFIG_SOFT_I2C
+#define CONFIG_SYS_I2C_SPEED   400000
+#define __SDA                  63
+#define __SCL                  62
+#define I2C_SDA(x)             nmk_gpio_set(__SDA, x)
+#define I2C_SCL(x)             nmk_gpio_set(__SCL, x)
+#define I2C_READ               (nmk_gpio_get(__SDA)!=0)
+#define I2C_ACTIVE             nmk_gpio_dir(__SDA, 1)
+#define I2C_TRISTATE           nmk_gpio_dir(__SDA, 0)
+#define I2C_DELAY     (udelay(2))
+#endif /* __ASSEMBLY__ */
+
 /* Ethernet */
 #define PCI_MEMORY_VADDR       0xe8000000
 #define PCI_IO_VADDR           0xee000000
 #define __io(a)                        ((void __iomem *)(PCI_IO_VADDR + (a)))
 #define __mem_isa(a)           ((a) + PCI_MEMORY_VADDR)
 
-#define CONFIG_DRIVER_SMC91111 /* Using SMC91c111*/
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111        /* Using SMC91c111*/
 #define CONFIG_SMC91111_BASE   0x34000300
 #undef  CONFIG_SMC91111_EXT_PHY        /* Internal PHY */
 #define CONFIG_SMC_USE_32_BIT
 #define CONFIG_BOOTFILE                "uImage"
 
-/* flash memory and filesystem information */
-#define CONFIG_DOS_PARTITION
+#define CONFIG_IP_DEFRAG       /* Allows faster download, TFTP and NFS */
+#define CONFIG_TFTP_BLOCKSIZE  4096
+#define CONFIG_NFS_READ_SIZE   4096
+
+/* Storage information: onenand and nand */
+#define CONFIG_CMD_ONENAND
 #define CONFIG_MTD_ONENAND_VERIFY_WRITE
 #define CONFIG_SYS_ONENAND_BASE                0x30000000
+
+#define CONFIG_CMD_NAND
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000 /* SMPS0n */
 
+/*
+ * Filesystem information
+ *
+ * Since U-Boot has been loaded to RAM by vendor code, we could use
+ * either or both OneNand and Nand. However, we need to know where the
+ * filesystem lives. Comments below report vendor-selected partitions
+ */
 #ifdef CONFIG_BOOT_ONENAND
-
-#   define CONFIG_CMD_ONENAND /* Temporary: nand and onenand can't coexist */
    /* Partition                                Size    Start
     * XloaderTOC + X-Loader            256KB   0x00000000
     * Memory init function             256KB   0x00040000
-    * U-Boot                           2MB     0x00080000
+    * U-Boot + env                     2MB     0x00080000
     * Sysimage (kernel + ramdisk)      4MB     0x00280000
     * JFFS2 Root filesystem            22MB    0x00680000
     * JFFS2 User Data                  227.5MB 0x01C80000
     */
-#   define CONFIG_JFFS2_PART_SIZE      0x400000
-#   define CONFIG_JFFS2_PART_OFFSET    0x280000
-
+#   define CONFIG_JFFS2_DEV            "onenand0"
+#   define CONFIG_JFFS2_PART_SIZE      0x01600000
+#   define CONFIG_JFFS2_PART_OFFSET    0x00680000
 #   define CONFIG_ENV_IS_IN_ONENAND
-#   define CONFIG_ENV_SIZE             (256 * 1024)
-#   define CONFIG_ENV_ADDR             0x30300000
-
-#else /* ! CONFIG_BOOT_ONENAND */
-
-#   define CONFIG_CMD_NAND /* Temporary: nand and onenand can't coexist */
+#   define CONFIG_ENV_SIZE             0x20000 /* 128 Kb - one sector */
+#   define CONFIG_ENV_ADDR             (0x00280000 - CONFIG_ENV_SIZE)
 
+#else /*  BOOT_NAND */
+   /* Partition                                Size    Start
+    * XloaderTOC + X-Loader            256KB   0x00000000
+    * Memory init function             256KB   0x00040000
+    * U-Boot + env                     2MB     0x00080000
+    * Kernel Image                     3MB     0x00280000
+    * JFFS2 Root filesystem            22MB    0x00580000
+    * JFFS2 User Data                  100.5MB 0x01b80000
+    */
 #   define CONFIG_JFFS2_DEV            "nand0"
 #   define CONFIG_JFFS2_NAND           1 /* For the jffs2 support*/
-#   define CONFIG_JFFS2_PART_SIZE      0x00300000
-#   define CONFIG_JFFS2_PART_OFFSET    0x00280000
-
+#   define CONFIG_JFFS2_PART_SIZE      0x01600000
+#   define CONFIG_JFFS2_PART_OFFSET    0x00580000
 #   define CONFIG_ENV_IS_IN_NAND
 #   define CONFIG_ENV_SIZE             0x20000 /* 128 Kb - one sector */
-#   define CONFIG_ENV_OFFSET           (0x8000000 - CONFIG_ENV_SIZE)
+#   define CONFIG_ENV_OFFSET           (0x00280000 - CONFIG_ENV_SIZE)
 
 #endif /* CONFIG_BOOT_ONENAND */