]> git.sur5r.net Git - u-boot/commitdiff
Add ATSTK1000 and ATSTK1002 board support
authorWolfgang Denk <wd@pollux.denx.de>
Tue, 24 Oct 2006 12:42:37 +0000 (14:42 +0200)
committerWolfgang Denk <wd@pollux.denx.de>
Tue, 24 Oct 2006 12:42:37 +0000 (14:42 +0200)
Patch by Haavard Skinnemoen, 06 Sep 2006

This patch adds support for the ATSTK1000 with the ATSTK1002 CPU
daughterboard.

ATSTK1000 is a full-featured development board for AT32AP CPUs. It
has two ethernet ports, a high quality QVGA LCD panel, a loudspeaker,
and connectors for USART, PS/2, VGA, USB, MMC/SD cards and
CompactFlash cards. For more information, please see this page:

http://www.atmel.com/dyn/products/tools.asp?family_id=682

The ATSTK1002 is a daughterboard for the ATSTK1000 supporting the
AT32AP7000 chip.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
MAINTAINERS
MAKEALL
README
board/atstk1000/Makefile [new file with mode: 0644]
board/atstk1000/atstk1000.c [new file with mode: 0644]
board/atstk1000/config.mk [new file with mode: 0644]
board/atstk1000/flash.c [new file with mode: 0644]
board/atstk1000/u-boot.lds.S [new file with mode: 0644]
include/configs/atstk1002.h [new file with mode: 0644]

index d7ef203e5513dea284926888da08dcc306993f3e..cff39571223253e8adc5bf1b6904e816fc02e960 100644 (file)
@@ -561,6 +561,10 @@ Zachary P. Landau <zachary.landau@labxtechnologies.com>
 #      Board                   CPU                                     #
 #########################################################################
 
+Haavard Skinnemoen <hskinnemoen@atmel.com>
+
+       ATSTK1000               AT32AP7000
+
 #########################################################################
 # End of MAINTAINERS list                                              #
 #########################################################################
diff --git a/MAKEALL b/MAKEALL
index 4409f2b3441c7cc89f77d0d73151bb3b83ef0338..879a17f9cc5703e2dfd7984d0e6a00637f4337fe 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -302,6 +302,12 @@ LIST_coldfire="    \
        r5200           M5271EVB                                        \
 "
 
+#########################################################################
+## AVR32 Systems
+#########################################################################
+
+LIST_avr32="atstk1002"
+
 #-----------------------------------------------------------------------
 
 #----- for now, just run PPC by default -----
@@ -334,7 +340,8 @@ do
        mips|mips_el| \
        nios|nios2| \
        x86|I486| \
-       coldfire)
+       coldfire| \
+       avr32)
                        for target in `eval echo '$LIST_'${arg}`
                        do
                                build_target ${target}
diff --git a/README b/README
index 69af79a4576431c39d7560cfc43ba206a7ba3975..f83d7745d3ddd9af984a95a8225351edf77778fe 100644 (file)
--- a/README
+++ b/README
@@ -330,6 +330,15 @@ The following options need to be configured:
                CONFIG_PCI5441 CONFIG_PK1C20
                CONFIG_EP1C20 CONFIG_EP1S10 CONFIG_EP1S40
 
+               AVR32 based boards:
+               -------------------
+
+               CONFIG_ATSTK1000
+
+- CPU Daughterboard Type: (if CONFIG_ATSTK1000 is defined)
+               Define exactly one of
+               CONFIG_ATSTK1002
+
 
 - CPU Module Type: (if CONFIG_COGENT is defined)
                Define exactly one of
diff --git a/board/atstk1000/Makefile b/board/atstk1000/Makefile
new file mode 100644 (file)
index 0000000..22ac02a
--- /dev/null
@@ -0,0 +1,44 @@
+#
+# (C) Copyright 2001-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# Copyright (C) 2005-2006 Atmel Corporation
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+
+include $(TOPDIR)/config.mk
+
+LIB    := $(obj)lib$(BOARD).a
+
+COBJS  := $(BOARD).o flash.o
+
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+$(LIB): $(obj).depend $(OBJS)
+       $(AR) crv $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/atstk1000/atstk1000.c b/board/atstk1000/atstk1000.c
new file mode 100644 (file)
index 0000000..4d737d2
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2006 Atmel Corporation
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <common.h>
+
+#include <asm/io.h>
+#include <asm/sdram.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static const struct sdram_info sdram = {
+       .phys_addr      = CFG_SDRAM_BASE,
+       .row_bits       = 11,
+       .col_bits       = 8,
+       .bank_bits      = 2,
+       .cas            = 3,
+       .twr            = 2,
+       .trc            = 7,
+       .trp            = 2,
+       .trcd           = 2,
+       .tras           = 5,
+       .txsr           = 5,
+};
+
+void board_init_memories(void)
+{
+       gd->sdram_size = sdram_init(&sdram);
+}
+
+void board_init_info(void)
+{
+       gd->bd->bi_phy_id[0] = 0x10;
+       gd->bd->bi_phy_id[1] = 0x11;
+}
diff --git a/board/atstk1000/config.mk b/board/atstk1000/config.mk
new file mode 100644 (file)
index 0000000..a72c80e
--- /dev/null
@@ -0,0 +1,4 @@
+PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
+PLATFORM_LDFLAGS       += --gc-sections
+TEXT_BASE              = 0x00000000
+LDSCRIPT               = $(obj)board/atstk1000/u-boot.lds
diff --git a/board/atstk1000/flash.c b/board/atstk1000/flash.c
new file mode 100644 (file)
index 0000000..3aebf66
--- /dev/null
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2005-2006 Atmel Corporation
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <common.h>
+
+#ifdef CONFIG_ATSTK1000_EXT_FLASH
+#include <asm/cacheflush.h>
+#include <asm/io.h>
+#include <asm/sections.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+flash_info_t flash_info[1];
+
+static void __flashprog flash_identify(uint16_t *flash, flash_info_t *info)
+{
+       unsigned long flags;
+
+       flags = disable_interrupts();
+
+       dcache_flush_unlocked();
+
+       writew(0xaa, flash + 0x555);
+       writew(0x55, flash + 0xaaa);
+       writew(0x90, flash + 0x555);
+       info->flash_id = readl(flash);
+       writew(0xff, flash);
+
+       readw(flash);
+
+       if (flags)
+               enable_interrupts();
+}
+
+unsigned long flash_init(void)
+{
+       unsigned long addr;
+       unsigned int i;
+
+       gd->bd->bi_flashstart = CFG_FLASH_BASE;
+       gd->bd->bi_flashsize = CFG_FLASH_SIZE;
+       gd->bd->bi_flashoffset = __edata_lma - _text;
+
+       flash_info[0].size = CFG_FLASH_SIZE;
+       flash_info[0].sector_count = 135;
+
+       flash_identify(uncached((void *)CFG_FLASH_BASE), &flash_info[0]);
+
+       for (i = 0, addr = 0; i < 8; i++, addr += 0x2000)
+               flash_info[0].start[i] = addr;
+       for (; i < flash_info[0].sector_count; i++, addr += 0x10000)
+               flash_info[0].start[i] = addr;
+
+       return CFG_FLASH_SIZE;
+}
+
+void flash_print_info(flash_info_t *info)
+{
+       printf("Flash: Vendor ID: 0x%02x, Product ID: 0x%02x\n",
+              info->flash_id >> 16, info->flash_id & 0xffff);
+       printf("Size: %ld MB in %d sectors\n",
+              info->size >> 10, info->sector_count);
+}
+
+int __flashprog flash_erase(flash_info_t *info, int s_first, int s_last)
+{
+       unsigned long flags;
+       unsigned long start_time;
+       uint16_t *fb, *sb;
+       unsigned int i;
+       int ret;
+       uint16_t status;
+
+       if ((s_first < 0) || (s_first > s_last)
+           || (s_last >= info->sector_count)) {
+               puts("Error: first and/or last sector out of range\n");
+               return ERR_INVAL;
+       }
+
+       for (i = s_first; i < s_last; i++)
+               if (info->protect[i]) {
+                       printf("Error: sector %d is protected\n", i);
+                       return ERR_PROTECTED;
+               }
+
+       fb = (uint16_t *)uncached(info->start[0]);
+
+       dcache_flush_unlocked();
+
+       for (i = s_first; (i <= s_last) && !ctrlc(); i++) {
+               printf("Erasing sector %3d...", i);
+
+               sb = (uint16_t *)uncached(info->start[i]);
+
+               flags = disable_interrupts();
+
+               start_time = get_timer(0);
+
+               /* Unlock sector */
+               writew(0xaa, fb + 0x555);
+               writew(0x70, sb);
+
+               /* Erase sector */
+               writew(0xaa, fb + 0x555);
+               writew(0x55, fb + 0xaaa);
+               writew(0x80, fb + 0x555);
+               writew(0xaa, fb + 0x555);
+               writew(0x55, fb + 0xaaa);
+               writew(0x30, sb);
+
+               /* Wait for completion */
+               ret = ERR_OK;
+               do {
+                       /* TODO: Timeout */
+                       status = readw(sb);
+               } while ((status != 0xffff) && !(status & 0x28));
+
+               writew(0xf0, fb);
+
+               /*
+                * Make sure the command actually makes it to the bus
+                * before we re-enable interrupts.
+                */
+               readw(fb);
+
+               if (flags)
+                       enable_interrupts();
+
+               if (status != 0xffff) {
+                       printf("Flash erase error at address 0x%p: 0x%02x\n",
+                              sb, status);
+                       ret = ERR_PROG_ERROR;
+                       break;
+               }
+       }
+
+       if (ctrlc())
+               printf("User interrupt!\n");
+
+       return ERR_OK;
+}
+
+int __flashprog write_buff(flash_info_t *info, uchar *src,
+                          ulong addr, ulong count)
+{
+       unsigned long flags;
+       uint16_t *base, *p, *s, *end;
+       uint16_t word, status;
+       int ret = ERR_OK;
+
+       if (addr < info->start[0]
+           || (addr + count) > (info->start[0] + info->size)
+           || (addr + count) < addr) {
+               puts("Error: invalid address range\n");
+               return ERR_INVAL;
+       }
+
+       if (addr & 1 || count & 1 || (unsigned int)src & 1) {
+               puts("Error: misaligned source, destination or count\n");
+               return ERR_ALIGN;
+       }
+
+       base = (uint16_t *)uncached(info->start[0]);
+       end = (uint16_t *)uncached(addr + count);
+
+       flags = disable_interrupts();
+
+       dcache_flush_unlocked();
+       sync_write_buffer();
+
+       for (p = (uint16_t *)uncached(addr), s = (uint16_t *)src;
+            p < end && !ctrlc(); p++, s++) {
+               word = *s;
+
+               writew(0xaa, base + 0x555);
+               writew(0x55, base + 0xaaa);
+               writew(0xa0, base + 0x555);
+               writew(word, p);
+
+               sync_write_buffer();
+
+               /* Wait for completion */
+               do {
+                       /* TODO: Timeout */
+                       status = readw(p);
+               } while ((status != word) && !(status & 0x28));
+
+               writew(0xf0, base);
+               readw(base);
+
+               if (status != word) {
+                       printf("Flash write error at address 0x%p: 0x%02x\n",
+                              p, status);
+                       ret = ERR_PROG_ERROR;
+                       break;
+               }
+       }
+
+       if (flags)
+               enable_interrupts();
+
+       return ret;
+}
+
+#endif /* CONFIG_ATSTK1000_EXT_FLASH */
diff --git a/board/atstk1000/u-boot.lds.S b/board/atstk1000/u-boot.lds.S
new file mode 100644 (file)
index 0000000..d46b82c
--- /dev/null
@@ -0,0 +1,79 @@
+/* -*- Fundamental -*-
+ *
+ * Copyright (C) 2005-2006 Atmel Corporation
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <config.h>
+
+OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
+OUTPUT_ARCH(avr32)
+ENTRY(_start)
+
+SECTIONS
+{
+       . = CFG_FLASH_BASE;
+       _text = .;
+       .text : {
+               *(.text)
+               *(.text.*)
+       }
+
+       . = ALIGN(CFG_ICACHE_LINESZ);
+       __flashprog_start = .;
+       .flashprog : {
+               *(.flashprog)
+       }
+       . = ALIGN(CFG_ICACHE_LINESZ);
+       __flashprog_end = .;
+
+       . = ALIGN(8);
+       .rodata : {
+               *(.rodata)
+               *(.rodata.*)
+       }
+       _etext = .;
+
+       __data_lma = ALIGN(8);
+       . = CFG_INTRAM_BASE;
+       _data = .;
+       .data : AT(__data_lma) {
+               *(.data)
+               *(.data.*)
+       }
+
+       . = ALIGN(4);
+       __u_boot_cmd_start = .;
+       __u_boot_cmd_lma = __data_lma + (__u_boot_cmd_start - _data);
+       .u_boot_cmd : AT(__u_boot_cmd_lma) {
+               KEEP(*(.u_boot_cmd))
+       }
+       __u_boot_cmd_end = .;
+
+       . = ALIGN(8);
+       _edata = .;
+       __edata_lma = __u_boot_cmd_lma + (_edata - __u_boot_cmd_start);
+
+       .bss : AT(__edata_lma) {
+               *(.bss)
+               *(.bss.*)
+       }
+       . = ALIGN(8);
+       _end = .;
+}
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
new file mode 100644 (file)
index 0000000..458ebab
--- /dev/null
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2005-2006 Atmel Corporation
+ *
+ * Configuration settings for the ATSTK1002 CPU daughterboard
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_AVR32                   1
+#define CONFIG_AT32AP                  1
+#define CONFIG_AT32AP7000              1
+#define CONFIG_ATSTK1002               1
+#define CONFIG_ATSTK1000               1
+
+#define CONFIG_ATSTK1000_EXT_FLASH     1
+
+/*
+ * Timer clock frequency. We're using the CPU-internal COUNT register
+ * for this, so this is equivalent to the CPU core clock frequency
+ */
+#define CFG_HZ                         1000
+
+/*
+ * Set up the PLL to run at 199.5 MHz, the CPU to run at 1/2 the PLL
+ * frequency and the peripherals to run at 1/4 the PLL frequency.
+ */
+#define CONFIG_PLL                     1
+#define CFG_POWER_MANAGER              1
+#define CFG_OSC0_HZ                    20000000
+#define CFG_PLL0_DIV                   1
+#define CFG_PLL0_MUL                   7
+#define CFG_PLL0_SUPPRESS_CYCLES       16
+#define CFG_CLKDIV_CPU                 0
+#define CFG_CLKDIV_HSB                 1
+#define CFG_CLKDIV_PBA                 2
+#define CFG_CLKDIV_PBB                 1
+
+/*
+ * The PLLOPT register controls the PLL like this:
+ *   icp = PLLOPT<2>
+ *   ivco = PLLOPT<1:0>
+ *
+ * We want icp=1 (default) and ivco=0 (80-160 MHz) or ivco=2 (150-240MHz).
+ */
+#define CFG_PLL0_OPT                   0x04
+
+#define CFG_USART1                     1
+
+#define CFG_CONSOLE_UART_DEV           DEVICE_USART1
+
+/* User serviceable stuff */
+#define CONFIG_CMDLINE_TAG             1
+#define CONFIG_SETUP_MEMORY_TAGS       1
+#define CONFIG_INITRD_TAG              1
+
+#define CONFIG_STACKSIZE               (2048)
+
+#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>
+
+#define CONFIG_ATMEL_USART             1
+#define CONFIG_PIO2                    1
+#define CFG_NR_PIOS                    5
+#define CFG_HSDRAMC                    1
+
+#define CFG_DCACHE_LINESZ              32
+#define CFG_ICACHE_LINESZ              32
+
+#define CONFIG_NR_DRAM_BANKS           1
+
+/* External flash on STK1000 */
+#if 0
+#define CFG_FLASH_CFI                  1
+#define CFG_FLASH_CFI_DRIVER           1
+#endif
+
+#define CFG_FLASH_BASE                 0x00000000
+#define CFG_FLASH_SIZE                 0x800000
+#define CFG_MAX_FLASH_BANKS            1
+#define CFG_MAX_FLASH_SECT             135
+
+#define CFG_MONITOR_BASE               CFG_FLASH_BASE
+
+#define CFG_INTRAM_BASE                        0x24000000
+#define CFG_INTRAM_SIZE                        0x8000
+
+#define CFG_SDRAM_BASE                 0x10000000
+
+#define CFG_ENV_IS_IN_FLASH            1
+#define CFG_ENV_SIZE                   65536
+#define CFG_ENV_ADDR                   (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
+
+#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)
+
+/* Other configuration settings that shouldn't have to change all that often */
+#define CFG_PROMPT                     "Uboot> "
+#define CFG_CBSIZE                     256
+#define CFG_MAXARGS                    8
+#define CFG_PBSIZE                     (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
+#define CFG_LONGHELP                   1
+
+#define CFG_MEMTEST_START                                              \
+       ({ DECLARE_GLOBAL_DATA_PTR; gd->bd->bi_dram[0].start; })
+#define CFG_MEMTEST_END                                                        \
+       ({                                                              \
+               DECLARE_GLOBAL_DATA_PTR;                                \
+               gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;     \
+       })
+#define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }
+
+#endif /* __CONFIG_H */