Merge branch 'master' of git://git.denx.de/u-boot-video

diff --git a/Makefile b/Makefile
index 090e645..9e6346f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -483,6 +483,7 @@ $(obj)include/autoconf.mk: $(obj)include/config.h
        mv $@.tmp $@
 
 sinclude $(obj)include/autoconf.mk.dep
+sinclude $(obj)include/autoconf.mk
 
 #########################################################################
 else   # !config.mk

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 32fe49b..0e3393b 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -26,7 +26,7 @@
 #include <mmc.h>
 
 #ifndef CONFIG_GENERIC_MMC
-int curr_device = -1;
+static int curr_device = -1;
 
 int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {

diff --git a/common/cmd_sata.c b/common/cmd_sata.c
index a8147e0..1693a7e 100644 (file)
--- a/common/cmd_sata.c
+++ b/common/cmd_sata.c
@@ -28,7 +28,7 @@
 #include <part.h>
 #include <sata.h>
 
-int curr_device = -1;
+int sata_curr_device = -1;
 block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 
 int __sata_initialize(void)
@@ -52,7 +52,7 @@ int __sata_initialize(void)
                if ((sata_dev_desc[i].lba > 0) && (sata_dev_desc[i].blksz > 0))
                        init_part(&sata_dev_desc[i]);
        }
-       curr_device = 0;
+       sata_curr_device = 0;
        return rc;
 }
 int sata_initialize(void) __attribute__((weak,alias("__sata_initialize")));
@@ -70,7 +70,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                return sata_initialize();
 
        /* If the user has not yet run `sata init`, do it now */
-       if (curr_device == -1)
+       if (sata_curr_device == -1)
                if (sata_initialize())
                        return 1;
 
@@ -91,12 +91,12 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        }
                        return 0;
                } else if (strncmp(argv[1],"dev", 3) == 0) {
-                       if ((curr_device < 0) || (curr_device >= CONFIG_SYS_SATA_MAX_DEVICE)) {
+                       if ((sata_curr_device < 0) || (sata_curr_device >= CONFIG_SYS_SATA_MAX_DEVICE)) {
                                puts("\nno SATA devices available\n");
                                return 1;
                        }
-                       printf("\nSATA device %d: ", curr_device);
-                       dev_print(&sata_dev_desc[curr_device]);
+                       printf("\nSATA device %d: ", sata_curr_device);
+                       dev_print(&sata_dev_desc[sata_curr_device]);
                        return 0;
                } else if (strncmp(argv[1],"part",4) == 0) {
                        int dev, ok;
@@ -131,7 +131,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        if (sata_dev_desc[dev].type == DEV_TYPE_UNKNOWN)
                                return 1;
 
-                       curr_device = dev;
+                       sata_curr_device = dev;
 
                        puts("... is now current device\n");
 
@@ -158,12 +158,12 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
 
                        printf("\nSATA read: device %d block # %ld, count %ld ... ",
-                               curr_device, blk, cnt);
+                               sata_curr_device, blk, cnt);
 
-                       n = sata_read(curr_device, blk, cnt, (u32 *)addr);
+                       n = sata_read(sata_curr_device, blk, cnt, (u32 *)addr);
 
                        /* flush cache after read */
-                       flush_cache(addr, cnt * sata_dev_desc[curr_device].blksz);
+                       flush_cache(addr, cnt * sata_dev_desc[sata_curr_device].blksz);
 
                        printf("%ld blocks read: %s\n",
                                n, (n==cnt) ? "OK" : "ERROR");
@@ -176,9 +176,9 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        lbaint_t blk = simple_strtoul(argv[3], NULL, 16);
 
                        printf("\nSATA write: device %d block # %ld, count %ld ... ",
-                               curr_device, blk, cnt);
+                               sata_curr_device, blk, cnt);
 
-                       n = sata_write(curr_device, blk, cnt, (u32 *)addr);
+                       n = sata_write(sata_curr_device, blk, cnt, (u32 *)addr);
 
                        printf("%ld blocks written: %s\n",
                                n, (n == cnt) ? "OK" : "ERROR");

diff --git a/config.mk b/config.mk
index 7fc0453..f2c2c6c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -194,10 +194,6 @@ BFD_ROOT_DIR =             /opt/powerpc
 endif
 endif
 
-ifeq ($(PCI_CLOCK),PCI_66M)
-CFLAGS := $(CFLAGS) -DPCI_66M
-endif
-
 #########################################################################
 
 export HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE \

diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c
index ec37687..549de31 100644 (file)
--- a/drivers/block/ata_piix.c
+++ b/drivers/block/ata_piix.c
@@ -36,7 +36,7 @@
 #include <ata.h>
 
 extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
-extern int curr_device;
+extern int sata_curr_device;
 
 #define DEBUG_SATA 0           /*For debug prints set DEBUG_SATA to 1 */
 
@@ -204,8 +204,8 @@ init_sata (int dev)
                                dev_print (&sata_dev_desc[devno]);
                                /* initialize partition type */
                                init_part (&sata_dev_desc[devno]);
-                               if (curr_device < 0)
-                                       curr_device =
+                               if (sata_curr_device < 0)
+                                       sata_curr_device =
                                            i * CONFIG_SYS_SATA_DEVS_PER_BUS + j;
                        }
                }

diff --git a/include/asm-microblaze/byteorder.h b/include/asm-microblaze/byteorder.h
index 51cacb0..a4a75b7 100644 (file)
--- a/include/asm-microblaze/byteorder.h
+++ b/include/asm-microblaze/byteorder.h
@@ -27,7 +27,9 @@
 
    I think this is a symptom of a bug in mb-gcc.  JW 20040303
 */
-static __inline__ __const__ __u16 ___arch__swab16 (__u16 half_word)
+
+
+static __inline__ __u16 ___arch__swab16 (__u16 half_word)
 {
        /* 32 bit temp to cast result, forcing clearing of high word */
        __u32 temp;

diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c
index 1a42640..cfed5fe 100644 (file)
--- a/lib_microblaze/board.c
+++ b/lib_microblaze/board.c
@@ -111,10 +111,6 @@ void board_init (void)
        gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET;
 #if defined(CONFIG_CMD_FLASH)
        ulong flash_size = 0;
-#endif
-#if defined(CONFIG_CMD_NET)
-       char *s, *e;
-       int i;
 #endif
        asm ("nop");    /* FIXME gd is not initialize - wait */
        memset ((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE);

diff --git a/tools/Makefile b/tools/Makefile
index 43c284c..5c764bb 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -69,9 +69,13 @@ include $(TOPDIR)/config.mk
 BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
 BIN_FILES-y += mkimage$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_EMBEDDED) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_DATAFLASH) += envcrc$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_IN_EEPROM) += envcrc$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_IN_FLASH) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_ONENAND) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_NAND) += envcrc$(SFX)
 BIN_FILES-$(CONFIG_ENV_IS_IN_NVRAM) += envcrc$(SFX)
+BIN_FILES-$(CONFIG_ENV_IS_IN_SPI_FLASH) += envcrc$(SFX)
 BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
 BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
 BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)