Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git] / include / configs / atstk1002.h
index 458ebab..e1d8f74 100644 (file)
  */
 #define CFG_PLL0_OPT                   0x04
 
-#define CFG_USART1                     1
-
-#define CFG_CONSOLE_UART_DEV           DEVICE_USART1
+#undef CONFIG_USART0
+#define CONFIG_USART1                  1
+#undef CONFIG_USART2
+#undef CONFIG_USART3
 
 /* User serviceable stuff */
+#define CONFIG_DOS_PARTITION           1
+
 #define CONFIG_CMDLINE_TAG             1
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1
 
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_BOOTARGS                                                        \
-       "console=ttyUS0 root=/dev/mtdblock1 fbmem=600k"
-
-#define CONFIG_COMMANDS                        (CFG_CMD_BDI                    \
-                                        | CFG_CMD_LOADS                \
-                                        | CFG_CMD_LOADB                \
-                                        /* | CFG_CMD_IMI */            \
-                                        /* | CFG_CMD_CACHE */          \
-                                        | CFG_CMD_FLASH                \
-                                        | CFG_CMD_MEMORY               \
-                                        /* | CFG_CMD_NET */            \
-                                        | CFG_CMD_ENV                  \
-                                        /* | CFG_CMD_IRQ */            \
-                                        | CFG_CMD_BOOTD                \
-                                        | CFG_CMD_CONSOLE              \
-                                        /* | CFG_CMD_EEPROM */         \
-                                        | CFG_CMD_ASKENV               \
-                                        | CFG_CMD_RUN                  \
-                                        | CFG_CMD_ECHO                 \
-                                        /* | CFG_CMD_I2C */            \
-                                        | CFG_CMD_REGINFO              \
-                                        /* | CFG_CMD_DATE */           \
-                                        /* | CFG_CMD_DHCP */           \
-                                        /* | CFG_CMD_AUTOSCRIPT */     \
-                                        /* | CFG_CMD_MII */            \
-                                        | CFG_CMD_MISC                 \
-                                        /* | CFG_CMD_SDRAM */          \
-                                        /* | CFG_CMD_DIAG */           \
-                                        /* | CFG_CMD_HWFLOW */         \
-                                        /* | CFG_CMD_SAVES */          \
-                                        /* | CFG_CMD_SPI */            \
-                                        /* | CFG_CMD_PING */           \
-                                        /* | CFG_CMD_MMC */            \
-                                        /* | CFG_CMD_FAT */            \
-                                        /* | CFG_CMD_IMLS */           \
-                                        /* | CFG_CMD_ITEST */          \
-                                        /* | CFG_CMD_EXT2 */           \
-               )
-
-#include <cmd_confdefs.h>
+       "console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2 fbmem=600k"
+
+#define CONFIG_BOOTCOMMAND                                             \
+       "fsload; bootm $(fileaddr)"
+
+/*
+ * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
+ * data on the serial line may interrupt the boot sequence.
+ */
+#define CONFIG_BOOTDELAY               2
+#define CONFIG_AUTOBOOT                        1
+#define CONFIG_AUTOBOOT_KEYED          1
+#define CONFIG_AUTOBOOT_PROMPT                         \
+       "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_DELAY_STR      "d"
+#define CONFIG_AUTOBOOT_STOP_STR       " "
+
+/*
+ * These are "locally administered ethernet addresses" generated by
+ * ./tools/gen_eth_addr
+ *
+ * After booting the board for the first time, new addresses should be
+ * generated and assigned to the environment variables "ethaddr" and
+ * "eth1addr".
+ */
+#define CONFIG_ETHADDR                 "6a:87:71:14:cd:cb"
+#define CONFIG_ETH1ADDR                        "ca:f8:15:e6:3e:e6"
+#define CONFIG_OVERWRITE_ETHADDR_ONCE  1
+#define CONFIG_NET_MULTI               1
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_REGINFO
+
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_SETGETDCR
+#undef CONFIG_CMD_XIMG
 
 #define CONFIG_ATMEL_USART             1
+#define CONFIG_MACB                    1
 #define CONFIG_PIO2                    1
 #define CFG_NR_PIOS                    5
 #define CFG_HSDRAMC                    1
+#define CONFIG_MMC                     1
 
 #define CFG_DCACHE_LINESZ              32
 #define CFG_ICACHE_LINESZ              32
 #define CFG_INIT_SP_ADDR               (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
 
 #define CFG_MALLOC_LEN                 (256*1024)
-#define CFG_MALLOC_END                                                 \
-       ({                                                              \
-               DECLARE_GLOBAL_DATA_PTR;                                \
-               CFG_SDRAM_BASE + gd->sdram_size;                        \
-       })
-#define CFG_MALLOC_START               (CFG_MALLOC_END - CFG_MALLOC_LEN)
-
 #define CFG_DMA_ALLOC_LEN              (16384)
-#define CFG_DMA_ALLOC_END              (CFG_MALLOC_START)
-#define CFG_DMA_ALLOC_START            (CFG_DMA_ALLOC_END - CFG_DMA_ALLOC_LEN)
+
 /* Allow 2MB for the kernel run-time image */
 #define CFG_LOAD_ADDR                  (CFG_SDRAM_BASE + 0x00200000)
 #define CFG_BOOTPARAMS_LEN             (16 * 1024)