]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 20:19:29 +0000 (22:19 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 20:19:29 +0000 (22:19 +0200)
33 files changed:
MAINTAINERS
Makefile
README
board/amcc/acadia/config.mk
board/amcc/yosemite/yosemite.c
board/qemu-mips/README
board/qemu-mips/qemu-mips.c
common/cmd_ide.c
common/image.c
common/main.c
cpu/74xx_7xx/cache.S
cpu/arm920t/s3c24x0/usb.c
cpu/mpc86xx/cache.S
cpu/ppc4xx/fdt.c
cpu/ppc4xx/speed.c
disk/part.c
doc/README.nand-boot-ppc440
include/.gitignore
include/configs/acadia.h
include/configs/bamboo.h
include/configs/bubinga.h
include/configs/ebony.h
include/configs/katmai.h
include/configs/kilauea.h
include/configs/luan.h
include/configs/ml401.h
include/configs/ocotea.h
include/configs/taihu.h
include/configs/taishan.h
include/configs/walnut.h
include/configs/xupv2p.h
include/configs/yosemite.h
include/configs/yucca.h

index 58f833c149197032f6b99931095d6e7623031975..ac7572cfc17eca3b007b73f12df681209e07bffa 100644 (file)
@@ -607,7 +607,7 @@ Thomas Lange <thomas@corelatus.se>
        dbau1x00                MIPS32 Au1000
        gth2                    MIPS32 Au1000
 
-Vlad Lungu <vlad@comsys.ro>
+Vlad Lungu <vlad.lungu@windriver.com>
        qemu_mips               MIPS32
 
 #########################################################################
index 167a71741c805eb67567fe7043325e486f192b50..6783fec407c6c270c239f9a732478b6a0277fece 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -424,7 +424,7 @@ $(obj)System.map:   $(obj)u-boot
 # This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
 # the dep file is only include in this top level makefile to determine when
 # to regenerate the autoconf.mk file.
-$(obj)include/autoconf.mk: $(obj)include/config.h $(VERSION_FILE)
+$(obj)include/autoconf.mk: $(obj)include/config.h
        @$(XECHO) Generating include/autoconf.mk ; \
        set -e ; \
        : Generate the dependancies ; \
diff --git a/README b/README
index 5e2bca41c1acd9b28ee7ded28e85b2b3048192bf..f14fb7bad2a6a0427da196528a6d17e0d642d389 100644 (file)
--- a/README
+++ b/README
@@ -623,7 +623,6 @@ The following options need to be configured:
                CONFIG_CMD_SPI          * SPI serial bus support
                CONFIG_CMD_USB          * USB support
                CONFIG_CMD_VFD          * VFD support (TRAB)
-               CONFIG_CMD_BSP          * Board SPecific functions
                CONFIG_CMD_CDP          * Cisco Discover Protocol support
                CONFIG_CMD_FSL          * Microblaze FSL support
 
index af5a46c2a5d9c86f082d4b8b8ea5b784888e86f2..290415c9d0318f13802efe17223892cfd0c57668 100644 (file)
@@ -28,7 +28,7 @@
 sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
 
 ifndef TEXT_BASE
-TEXT_BASE = 0xFFFC0000
+TEXT_BASE = 0xFFF80000
 endif
 
 ifeq ($(debug),1)
index 6ec922ab0074a74c796ea05ab052fca64d09ded7..212fab8d08edbfb938d3e15934f248108c025855 100644 (file)
@@ -26,6 +26,8 @@
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <spd_sdram.h>
+#include <libfdt.h>
+#include <fdt_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -554,3 +556,24 @@ void board_reset(void)
        /* give reset to BCSR */
        *(unsigned char *)(CFG_BCSR_BASE | 0x06) = 0x09;
 }
+
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+void ft_board_setup(void *blob, bd_t *bd)
+{
+       u32 val[4];
+       int rc;
+
+       ft_cpu_setup(blob, bd);
+
+       /* Fixup NOR mapping */
+       val[0] = 0;                             /* chip select number */
+       val[1] = 0;                             /* always 0 */
+       val[2] = gd->bd->bi_flashstart;
+       val[3] = gd->bd->bi_flashsize;
+       rc = fdt_find_and_setprop(blob, "/plb/opb/ebc", "ranges",
+                                 val, sizeof(val), 1);
+       if (rc)
+               printf("Unable to update property NOR mapping, err=%s\n",
+                      fdt_strerror(rc));
+}
+#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
index 39570b13dba61d67a8c431ab246bfa1dcd1323ef..4c1f8edc9b680337cb9e948151055afaec2449a2 100644 (file)
@@ -1,4 +1,4 @@
-By Vlad Lungu vlad@comsys.ro 2007-Oct-01
+By Vlad Lungu vlad.lungu@windriver.com 2007-Oct-01
 ----------------------------------------
 Qemu is a full system emulator. See
 
@@ -9,3 +9,7 @@ Limitations & comments
 Supports the "-m mips" configuration of qemu: serial,NE2000,IDE.
 Support is big endian only for now (or at least this is what I tested).
 Derived from au1x00 with a lot of things cut out.
+
+Supports emulated flash (patch Jean-Christophe PLAGNIOL-VILLARD) with
+recent qemu versions. When using emulated flash, launch with
+-pflash <filename> and erase mips_bios.bin.
index a6ad7b9ab35f09fae377a49a84589ef9bc0aca59..68690743d686434c7702819aa0bb43a62a04f5b5 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2007
- * Vlad Lungu vlad@comsys.ro
+ * Vlad Lungu vlad.lungu@windriver.com
  *
  * See file CREDITS for list of people who contributed to this
  * project.
index ead7e10d66b5554eb9338136778bb81523bd00f8..cac99d5fe765e866c4df2af085b21a4db6977530 100644 (file)
 # include <status_led.h>
 #endif
 
-#ifndef __PPC__
-#include <asm/io.h>
-#endif
-
 #ifdef CONFIG_IDE_8xx_DIRECT
 DECLARE_GLOBAL_DATA_PTR;
 #endif
index 4a024d4dfb34552c0c46689b04cbece9fd3aefd2..051d298050fa7d87afe8c0b0367b0bda85b97f21 100644 (file)
@@ -93,6 +93,7 @@ static table_entry_t uimage_arch[] = {
        {       IH_ARCH_MIPS64,         "mips64",       "MIPS 64 Bit",  },
        {       IH_ARCH_NIOS,           "nios",         "NIOS",         },
        {       IH_ARCH_NIOS2,          "nios2",        "NIOS II",      },
+       {       IH_ARCH_PPC,            "powerpc",      "PowerPC",      },
        {       IH_ARCH_PPC,            "ppc",          "PowerPC",      },
        {       IH_ARCH_S390,           "s390",         "IBM S390",     },
        {       IH_ARCH_SH,             "sh",           "SuperH",       },
index 21e7afab61fde2db49a1de071baafec77bc6f6c3..a17b60b3aa92cecc9b4bbcaf78c83a84af8d7a8f 100644 (file)
@@ -40,7 +40,7 @@
 
 #include <post.h>
 
-#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST)
+#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
@@ -67,11 +67,9 @@ static int abortboot(int);
 
 char        console_buffer[CFG_CBSIZE];                /* console I/O buffer   */
 
-#ifndef CONFIG_CMDLINE_EDITING
 static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
 static char erase_seq[] = "\b \b";             /* erase sequence       */
 static char   tab_seq[] = "        ";          /* used to expand TABs  */
-#endif /* CONFIG_CMDLINE_EDITING */
 
 #ifdef CONFIG_BOOT_RETRY_TIME
 static uint64_t endtime = 0;  /* must be set, default is instant timeout */
@@ -947,11 +945,26 @@ int readline_into_buffer (const char *const prompt, char * buffer)
                initted = 1;
        }
 
-       puts (prompt);
 
-       rc = cread_line(prompt, p, &len);
-       return rc < 0 ? rc : len;
-#else
+       /*
+        * History uses a global array which is not
+        * writable until after relocation to RAM.
+        * Revert to non-history version if still
+        * running from flash.
+        */
+       if (gd->flags & GD_FLG_RELOC) {
+               if (!initted) {
+                       hist_init();
+                       initted = 1;
+               }
+
+               puts (prompt);
+
+               rc = cread_line(prompt, p, &len);
+               return rc < 0 ? rc : len;
+
+       } else {
+#endif /* CONFIG_CMDLINE_EDITING */
        char * p_buf = p;
        int     n = 0;                          /* buffer index         */
        int     plen = 0;                       /* prompt length        */
@@ -1047,12 +1060,13 @@ int readline_into_buffer (const char *const prompt, char * buffer)
                        }
                }
        }
-#endif /* CONFIG_CMDLINE_EDITING */
+#ifdef CONFIG_CMDLINE_EDITING
+       }
+#endif
 }
 
 /****************************************************************************/
 
-#ifndef CONFIG_CMDLINE_EDITING
 static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
 {
        char *s;
@@ -1082,7 +1096,6 @@ static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen)
        (*np)--;
        return (p);
 }
-#endif /* CONFIG_CMDLINE_EDITING */
 
 /****************************************************************************/
 
index a793d799d1b755cf25f62dfacd5b5c50d52c548b..3a745cbe0312fbd385d27411b2a67c9f197df5b6 100644 (file)
@@ -329,14 +329,28 @@ _GLOBAL(dcache_status)
        blr
 
 /*
- * Invalidate L2 cache using L2I and polling L2IP
+ * Invalidate L2 cache using L2I and polling L2IP or L2I
  */
 _GLOBAL(l2cache_invalidate)
        sync
+       mfspr r3, l2cr
        oris    r3, r3, L2CR_L2I@h
        sync
        mtspr   l2cr, r3
        sync
+       mfspr r3, PVR
+       sync
+       rlwinm r3, r3, 16,16,31
+       cmpli 0,r3,0x8000  /* 7451, 7441 */
+       beq 0,inv_7450
+       cmpli 0,r3,0x8001  /* 7455, 7445 */
+       beq 0,inv_7450
+       cmpli 0,r3,0x8002  /* 7457, 7447 */
+       beq 0,inv_7450
+       cmpli 0,r3,0x8003  /* 7447A */
+       beq 0,inv_7450
+       cmpli 0,r3,0x8004  /* 7448 */
+       beq 0,inv_7450
 invl2:
        mfspr   r3, l2cr
        andi.   r3, r3, L2CR_L2IP
@@ -348,6 +362,11 @@ invl2:
        mtspr   l2cr, r3
        sync
        blr
+inv_7450:
+       mfspr   r3, l2cr
+       andis. r3, r3, L2CR_L2I@h
+       bne inv_7450
+       blr
 
 /*
  * Enable L2 cache
index ef5d5bf71b139e50e8b80d1989b5eb725f3f5ece..421ebb4373f615d5f28920739569eb408874e454 100644 (file)
@@ -69,4 +69,4 @@ int usb_cpu_init_fail (void)
 }
 
 # endif /* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */
-#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */
+#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) */
index f316b3ec13fe59ea4012714d58617b82e12f7d66..2e4ea0239f1aa08e8d50a81d09cbe185a7b09b89 100644 (file)
@@ -338,7 +338,7 @@ _GLOBAL(l2cache_invalidate)
 
 invl2:
        mfspr   r3, l2cr
-       andi  r3, r3, L2CR_L2I@h
+       andis.  r3, r3, L2CR_L2I@h
        bne     invl2
        blr
 
index 02dece0c0ff6ffdf3c99553e04e0c9327e5e1588..ccc73d5d64e6d6de50bfe98d9dc56cd759252ad6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007
+ * (C) Copyright 2007-2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -27,7 +27,7 @@
 #include <asm/cache.h>
 #include <ppc4xx.h>
 
-#if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 #include <libfdt.h>
 #include <libfdt_env.h>
 #include <fdt_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+void __ft_board_setup(void *blob, bd_t *bd)
+{
+       u32 val[4];
+       int rc;
+
+       ft_cpu_setup(blob, bd);
+
+       /* Fixup NOR mapping */
+       val[0] = 0;                             /* chip select number */
+       val[1] = 0;                             /* always 0 */
+       val[2] = gd->bd->bi_flashstart;
+       val[3] = gd->bd->bi_flashsize;
+       rc = fdt_find_and_setprop(blob, "/plb/opb/ebc", "ranges",
+                                 val, sizeof(val), 1);
+       if (rc)
+               printf("Unable to update property NOR mapping, err=%s\n",
+                      fdt_strerror(rc));
+}
+void ft_board_setup(void *blob, bd_t *bd) __attribute__((weak, alias("__ft_board_setup")));
+
 /*
  * Fixup all PCIe nodes by setting the device_type property
  * to "pci-endpoint" instead is "pci" for endpoint ports.
@@ -109,4 +129,4 @@ void ft_cpu_setup(void *blob, bd_t *bd)
         */
        fdt_pcie_setup(blob);
 }
-#endif /* CONFIG_OF_LIBFDT */
+#endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */
index 05b42fec97702e82ede6ec363d526c923e0d41df..8b4e64a19cb039a38be9120df055ae219d0c9f46 100644 (file)
@@ -238,7 +238,7 @@ static u8 pll_fbdv_multi_bits[] = {
        /* values for:  101 - 200 */
        0x78, 0xf1, 0x62, 0xc5, 0x0a, 0x94, 0x28, 0xd0, 0x21, 0xc3,
        0x06, 0x8c, 0x18, 0xb0, 0x60, 0xc1, 0x02, 0x84, 0x08, 0x90,
-       0x20, 0xc0, 0x01, 0x83, 0x77, 0xff, 0x1f, 0xbf, 0x7f, 0xfe,
+       0x20, 0xc0, 0x01, 0x83, 0x07, 0x8f, 0x1f, 0xbf, 0x7f, 0xfe,
        0x7d, 0xfa, 0x75, 0xea, 0x55, 0xaa, 0x54, 0xa9, 0x53, 0xa6,
        0x4c, 0x99, 0x33, 0xe7, 0x4e, 0x9d, 0x3b, 0xf7, 0x6e, 0xdd,
        0x3a, 0xf4, 0x69, 0xd2, 0x25, 0xcb, 0x16, 0xac, 0x58, 0xb1,
index 3c71208a12bb0e05cbb9e3e112bc83e114ceaa69..316e2547399c002c2bdc0c765ee5ae53d3f2fea6 100644 (file)
@@ -109,44 +109,45 @@ void dev_print (block_dev_desc_t *dev_desc)
        lbaint_t lba512;
 #endif
 
-       if (dev_desc->type==DEV_TYPE_UNKNOWN) {
-               puts ("not available\n");
-               return;
-       }
-       if (dev_desc->if_type==IF_TYPE_SCSI)  {
-               printf ("(%d:%d) ", dev_desc->target,dev_desc->lun);
-       }
-       if (dev_desc->if_type==IF_TYPE_IDE) {
-               printf ("Model: %s Firm: %s Ser#: %s\n",
+       switch (dev_desc->type) {
+       case IF_TYPE_SCSI:
+               printf ("(%d:%d) Vendor: %s Prod.: %s Rev: %s\n",
+                       dev_desc->target,dev_desc->lun,
                        dev_desc->vendor,
-                       dev_desc->revision,
-                       dev_desc->product);
-       }
-       if (dev_desc->if_type==IF_TYPE_SATA) {
+                       dev_desc->product,
+                       dev_desc->revision);
+               break;
+       case IF_TYPE_IDE:
+       case IF_TYPE_SATA:
                printf ("Model: %s Firm: %s Ser#: %s\n",
                        dev_desc->vendor,
                        dev_desc->revision,
                        dev_desc->product);
-       } else {
-               printf ("Vendor: %s Prod.: %s Rev: %s\n",
-                       dev_desc->vendor,
-                       dev_desc->product,
-                       dev_desc->revision);
+               break;
+       case DEV_TYPE_UNKNOWN:
+       default:
+               puts ("not available\n");
+               return;
        }
        puts ("            Type: ");
        if (dev_desc->removable)
                puts ("Removable ");
        switch (dev_desc->type & 0x1F) {
-               case DEV_TYPE_HARDDISK: puts ("Hard Disk");
-                                       break;
-               case DEV_TYPE_CDROM:    puts ("CD ROM");
-                                       break;
-               case DEV_TYPE_OPDISK:   puts ("Optical Device");
-                                       break;
-               case DEV_TYPE_TAPE:     puts ("Tape");
-                                       break;
-               default:                printf ("# %02X #", dev_desc->type & 0x1F);
-                                       break;
+       case DEV_TYPE_HARDDISK:
+               puts ("Hard Disk");
+               break;
+       case DEV_TYPE_CDROM:
+               puts ("CD ROM");
+               break;
+       case DEV_TYPE_OPDISK:
+               puts ("Optical Device");
+               break;
+       case DEV_TYPE_TAPE:
+               puts ("Tape");
+               break;
+       default:
+               printf ("# %02X #", dev_desc->type & 0x1F);
+               break;
        }
        puts ("\n");
        if ((dev_desc->lba * dev_desc->blksz)>0L) {
@@ -281,20 +282,27 @@ static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
 {
        puts ("\nPartition Map for ");
        switch (dev_desc->if_type) {
-               case IF_TYPE_IDE:       puts ("IDE");
-                                       break;
-               case IF_TYPE_SATA:      puts ("SATA");
-                                       break;
-               case IF_TYPE_SCSI:      puts ("SCSI");
-                                       break;
-               case IF_TYPE_ATAPI:     puts ("ATAPI");
-                                       break;
-               case IF_TYPE_USB:       puts ("USB");
-                                       break;
-               case IF_TYPE_DOC:       puts ("DOC");
-                                       break;
-               default:                puts ("UNKNOWN");
-                                       break;
+       case IF_TYPE_IDE:
+               puts ("IDE");
+               break;
+       case IF_TYPE_SATA:
+               puts ("SATA");
+               break;
+       case IF_TYPE_SCSI:
+               puts ("SCSI");
+               break;
+       case IF_TYPE_ATAPI:
+               puts ("ATAPI");
+               break;
+       case IF_TYPE_USB:
+               puts ("USB");
+               break;
+       case IF_TYPE_DOC:
+               puts ("DOC");
+               break;
+       default:
+               puts ("UNKNOWN");
+               break;
        }
        printf (" device %d  --   Partition Type: %s\n\n",
                        dev_desc->dev, type);
index a1c1d8c4447abac7bb5590aa3065504e87bacf43..1e9c102644b2a671bf6be70e5d13b5d6e80909ae 100644 (file)
@@ -9,7 +9,7 @@ The PPC440EP(x)/GR(x) cpu's can boot directly from NAND FLASH,
 completely without NOR FLASH. This can be done by using the NAND
 boot feature of the 440 NAND flash controller (NDFC).
 
-Here a short desciption of the different boot stages:
+Here a short description of the different boot stages:
 
 a) IPL (Initial Program Loader, integrated inside CPU)
 ------------------------------------------------------
index 03a533ced4c57e91869bbdeb8eacf3602e62a974..ef7dd5fc8a29443faa1e2e3d7b4d1e1612752b0c 100644 (file)
@@ -1,7 +1,7 @@
 /autoconf.mk*
 /asm
-/asm-blackfin/arch
-/asm-ppc/arch
+/asm-*/arch
+/asm-*/proc
 /bmp_logo.h
 /config.h
 /config.mk
index 3cd5ad62c02aafab1ae9ea321bcbd5a258125ece..bbf726dc62549ce59dd799c60b061b2160f771c5 100644 (file)
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
-#define CFG_MONITOR_LEN                (256 * 1024)/* Reserve 256 kB for Monitor       */
-#define CFG_MALLOC_LEN         (512 * 1024)/* Reserve 512 kB for malloc()      */
-
 #define CFG_SDRAM_BASE         0x00000000
 #define CFG_FLASH_BASE         0xfe000000
-#define CFG_MONITOR_BASE       TEXT_BASE
 #define CFG_CPLD_BASE          0x80000000
 #define CFG_NAND_ADDR          0xd0000000
 #define CFG_USB_HOST           0xef603000      /* USB OHCI 1.1 controller      */
 
+#define CFG_MONITOR_BASE       TEXT_BASE
+#define CFG_MONITOR_LEN                (0xFFFFFFFF - CFG_MONITOR_BASE + 1)
+#define CFG_MALLOC_LEN         (512 * 1024)/* Reserve 512 kB for malloc()      */
+
 /*-----------------------------------------------------------------------
  * Initial RAM & stack pointer
  *----------------------------------------------------------------------*/
 #define        CONFIG_PHY_ADDR         0       /* PHY address                  */
 #define CONFIG_NET_MULTI       1
 #define CFG_RX_ETH_BUFFER      16      /* # of rx buffers & descriptors*/
+#define CONFIG_HAS_ETH0                1
 
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
 
 
 #undef CONFIG_BOOTARGS
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "hostname=acadia\0"                                             \
        "ramdisk_addr=fff20000\0"                                       \
        "initrd_high=30000000\0"                                        \
        "load=tftp 200000 acadia/u-boot.bin\0"                          \
-       "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"   \
-               "cp.b ${fileaddr} fffc0000 ${filesize};"                \
+       "update=protect off " xstr(CFG_MONITOR_BASE) " FFFFFFFF;"       \
+               "era " xstr(CFG_MONITOR_BASE) " FFFFFFFF;"              \
+               "cp.b ${fileaddr} " xstr(CFG_MONITOR_BASE) " ${filesize};" \
                "setenv filesize;saveenv\0"                             \
        "upd=run load update\0"                                         \
        "nload=tftp 200000 acadia/u-boot-nand.bin\0"                    \
   #define CONFIG_KGDB_SER_INDEX        2       /* which serial port to use */
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 4ea040bc2288a148a4e108564b27fa5e7e728d0d..2f0df8ad2d02f5b8e8b8866c6ee978fef1928338 100644 (file)
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
 
+#define CONFIG_HAS_ETH0
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address, See schematics  */
 #define CONFIG_PHY1_ADDR        1
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 784e7c0f8b33f3cc4bf617985dcea9d3efa66296..cbd74a0d8dbe250dba1f04d59e7be8ce1016334b 100644 (file)
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #define        CONFIG_PHY_ADDR         1       /* PHY address                  */
+#define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       2       /* EMAC1 PHY address            */
 #define CONFIG_NET_MULTI       1
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 88fd7caa7a3babb645efa6e9a999137f71a15dfd..ba68fd4b9674a48678e18056d4ed1a6a49607fc5 100644 (file)
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                8       /* PHY address                  */
+#define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       9       /* EMAC1 PHY address            */
 #define CONFIG_NET_MULTI       1
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index d2f6b1021a353366012b337e101759ec8fa5bfa2..cce883fd85ff344c03511dcc26148cfaf80bbded 100644 (file)
@@ -79,7 +79,7 @@
 #define CFG_ACE_BASE           0xfe000000      /* Xilinx ACE controller - Compact Flash */
 
 #define CFG_MONITOR_BASE       TEXT_BASE
-#define CFG_MONITOR_LEN                (0xFFFFFFFF - CFG_MONITOR_LEN + 1)
+#define CFG_MONITOR_LEN                (0xFFFFFFFF - CFG_MONITOR_BASE + 1)
 #define CFG_MALLOC_LEN         (512 * 1024)    /* Reserve 512 kB for malloc */
 
 /*-----------------------------------------------------------------------
index f4cf42c311655d8a803ac54399b4afea8a29ebcf..57cc90a6de75bf0fc4aad95a18b8670401aa8bc7 100644 (file)
  * Some Kilauea stuff..., mainly fpga registers
  */
 #define CFG_FPGA_REG_BASE              CFG_FPGA_BASE
-#define CFG_FPGA_FIFO_BASE             (in32(CFG_FPGA_BASE) | (1 << 11))
+#define CFG_FPGA_FIFO_BASE             (in32(CFG_FPGA_BASE) | (1 << 10))
 
 /* interrupt */
 #define CFG_FPGA_SLIC0_R_DPRAM_INT     0x80000000
index af237d9be0bd4b713f0afe86f50dfd95b051f24f..37151d31fdd2fe03056f42afe3ee6c6a5ff36621 100644 (file)
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CFG_LOADS_BAUD_CHANGE  1       /* allow baudrate change        */
 
+#define CONFIG_HAS_ETH0
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1
 #define CONFIG_CIS8201_PHY     1       /* Enable 'special' RGMII mode for Cicada phy */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 360e2e11d2afe31b9c9b2a6c73a3320fdf63d6aa..7e0df870191871e690f31053a437d56473658311 100644 (file)
 /* ethernet */
 #ifdef XILINX_EMAC_BASEADDR
 #define CONFIG_XILINX_EMAC     1
+#define CFG_ENET
 #else
 #ifdef XILINX_EMACLITE_BASEADDR
 #define CONFIG_XILINX_EMACLITE 1
+#define CFG_ENET
 #endif
 #endif
 #undef ET_DEBUG
 #endif
 
 /* interrupt controller */
+#ifdef XILINX_INTC_BASEADDR
 #define        CFG_INTC_0              1
 #define        CFG_INTC_0_ADDR         XILINX_INTC_BASEADDR
 #define        CFG_INTC_0_NUM          XILINX_INTC_NUM_INTR_INPUTS
+#endif
 
 /* timer */
+#ifdef XILINX_TIMER_BASEADDR
+#if (XILINX_TIMER_IRQ != -1)
 #define        CFG_TIMER_0             1
 #define        CFG_TIMER_0_ADDR        XILINX_TIMER_BASEADDR
 #define        CFG_TIMER_0_IRQ         XILINX_TIMER_IRQ
 #define        FREQUENCE               XILINX_CLOCK_FREQ
 #define        CFG_TIMER_0_PRELOAD     ( FREQUENCE/1000 )
+#endif
+#else
+#ifdef XILINX_CLOCK_FREQ
 #define        CONFIG_XILINX_CLOCK_FREQ        XILINX_CLOCK_FREQ
-
+#else
+#error BAD CLOCK FREQ
+#endif
+#endif
 /* FSL */
 /* #define     CFG_FSL_2 */
 /* #define     FSL_INTR_2      1 */
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MFSL
-#define CONFIG_CMD_PING
+
+#ifndef CFG_ENET
+       #undef CONFIG_CMD_NET
+#else
+       #define CONFIG_CMD_PING
+#endif
 
 #if defined(CONFIG_SYSTEMACE)
        #define CONFIG_CMD_EXT2
index 5a6eb4a37d41dbb03cb1c3e15aebacfa124086f3..be2b3ec7efd55fe55066f4ddd1ea2310c73cea72 100644 (file)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 7db973676ba1cae0b421f9b316b43e574b09fdb2..8a1ff1acba43a220880a5dc3d32ae211d256d0dc 100644 (file)
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0x14    /* PHY address                  */
+#define CONFIG_HAS_ETH0
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       0x10    /* EMAC1 PHY address            */
 #define CONFIG_NET_MULTI       1
@@ -433,4 +434,8 @@ unsigned char spi_read(void);
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 851a7ad40aed2b7f724a55cf81fc37d7e4b3dfd7..1879d38522099ed3d7be6eed1a1cccc6a9d49cff 100644 (file)
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index f6e99aca777b9de497771ed577b59d9ba8611e6b..adc420b9ade46063212829eea0543f89ed92391a 100644 (file)
@@ -92,6 +92,7 @@
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 
 #define CFG_RX_ETH_BUFFER      16      /* use 16 rx buffer on 405 emac */
+#define CONFIG_HAS_ETH0                1
 
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
 #define CONFIG_NET_MULTI               /* needed for NetConsole        */
 #define CONFIG_KGDB_BAUDRATE   230400  /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 30fb303c9613c01a8167e12fb6dbaea19574d735..c738567a5f4c034ea6cc0d0f4a0d0ee5b3b4b007 100644 (file)
 /* ethernet */
 #ifdef XILINX_EMAC_BASEADDR
 #define CONFIG_XILINX_EMAC     1
+#define CFG_ENET
 #else
 #ifdef XILINX_EMACLITE_BASEADDR
 #define CONFIG_XILINX_EMACLITE 1
+#define CFG_ENET
 #endif
 #endif
 #undef ET_DEBUG
 #endif
 
 /* interrupt controller */
+#ifdef XILINX_INTC_BASEADDR
 #define        CFG_INTC_0              1
 #define        CFG_INTC_0_ADDR         XILINX_INTC_BASEADDR
 #define        CFG_INTC_0_NUM          XILINX_INTC_NUM_INTR_INPUTS
+#endif
 
 /* timer */
+#ifdef XILINX_TIMER_BASEADDR
+#if (XILINX_TIMER_IRQ != -1)
 #define        CFG_TIMER_0             1
 #define        CFG_TIMER_0_ADDR        XILINX_TIMER_BASEADDR
 #define        CFG_TIMER_0_IRQ         XILINX_TIMER_IRQ
 #define        FREQUENCE               XILINX_CLOCK_FREQ
 #define        CFG_TIMER_0_PRELOAD     ( FREQUENCE/1000 )
+#endif
+#else
+#ifdef XILINX_CLOCK_FREQ
 #define        CONFIG_XILINX_CLOCK_FREQ        XILINX_CLOCK_FREQ
-
+#else
+#error BAD CLOCK FREQ
+#endif
+#endif
 /*
  * memory layout - Example
  * TEXT_BASE = 0x3600_0000;
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_PING
+
+#ifndef CFG_ENET
+       #undef CONFIG_CMD_NET
+#else
+       #define CONFIG_CMD_PING
+#endif
 
 #ifdef XILINX_SYSACE_BASEADDR
 #define CONFIG_CMD_EXT2
index c9323f607403686ebd9d37adf341746b8d053a89..f22e79824cd0e5774239c349b46bc35f411bbad5 100644 (file)
 #define CFG_KBYTES_SDRAM        (128 * 1024)    /* 128MB                   */
 #define CFG_SDRAM_BANKS                (2)
 
-
 /*-----------------------------------------------------------------------
  * I2C
  *----------------------------------------------------------------------*/
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_NET_MULTI        1      /* required for netconsole      */
 #define CONFIG_PHY1_ADDR        3
+#define CONFIG_HAS_ETH0                1       /* add support for "ethaddr"    */
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */
 #define CONFIG_PHY_ADDR                1       /* PHY address, See schematics  */
 
 #define CONFIG_KGDB_SER_INDEX  2       /* which serial port to use */
 #endif
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */
index 1e3571eb4dcc7dc95b0e2e9d686e1eadd2b2abb5..6f9d3e3c6f3477f56c06a4ef6dbc0b17b8eb616e 100644 (file)
 
 /*---------------------------------------------------------------------------*/
 
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT       1
+#define CONFIG_OF_BOARD_SETUP  1
+
 #endif /* __CONFIG_H */