Merge branch 'eth-cleanup' of git://git.denx.de/u-boot-avr32

diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c
index 52c70f72b2835d34edecc42034f5e12f3ef63bc4..7f3e48541deae21ea113d224a9a4b10412d96273 100644 (file)
--- a/board/atmel/atngw100/atngw100.c
+++ b/board/atmel/atngw100/atngw100.c
@@ -81,7 +81,7 @@ phys_size_t initdram(int board_type)
        unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
 
        if (expected_size != actual_size)
-               printf("Warning: Only %u of %u MiB SDRAM is working\n",
+               printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
                                actual_size >> 20, expected_size >> 20);
 
        return actual_size;

diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c
index 496c6a8114276338c59419d2fb86d4c613916770..915b1c35393a706c6e1f1bf7ee7e426b8088b9cb 100644 (file)
--- a/board/atmel/atstk1000/atstk1000.c
+++ b/board/atmel/atstk1000/atstk1000.c
@@ -104,7 +104,7 @@ phys_size_t initdram(int board_type)
        unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
 
        if (expected_size != actual_size)
-               printf("Warning: Only %u of %u MiB SDRAM is working\n",
+               printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
                                actual_size >> 20, expected_size >> 20);
 
        return actual_size;

diff --git a/board/atmel/atstk1000/flash.c b/board/atmel/atstk1000/flash.c
index 12537f3142ec4e1d655401c838fb5d8331cd9a52..e2bfd4aff27f79e322206b8d922bfe442497dbef 100644 (file)
--- a/board/atmel/atstk1000/flash.c
+++ b/board/atmel/atstk1000/flash.c
@@ -70,7 +70,7 @@ unsigned long flash_init(void)
 
 void flash_print_info(flash_info_t *info)
 {
-       printf("Flash: Vendor ID: 0x%02x, Product ID: 0x%02x\n",
+       printf("Flash: Vendor ID: 0x%02lx, Product ID: 0x%02lx\n",
               info->flash_id >> 16, info->flash_id & 0xffff);
        printf("Size: %ld MB in %d sectors\n",
               info->size >> 10, info->sector_count);

diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c
index 61aa1849c24a3374776eea5487f5eb630ca22f1d..a151488d12580a60aaad3cfbf2a90b934ba158d8 100644 (file)
--- a/drivers/mmc/atmel_mci.c
+++ b/drivers/mmc/atmel_mci.c
@@ -135,10 +135,10 @@ mmc_cmd(unsigned long cmd, unsigned long arg,
                status = mmci_readl(SR);
        } while (!(status & MMCI_BIT(CMDRDY)));
 
-       pr_debug("mmc: status 0x%08lx\n", status);
+       pr_debug("mmc: status 0x%08x\n", status);
 
        if (status & error_flags) {
-               printf("mmc: command %lu failed (status: 0x%08lx)\n",
+               printf("mmc: command %lu failed (status: 0x%08x)\n",
                       cmd, status);
                return -EIO;
        }
@@ -245,7 +245,7 @@ out:
 
 read_error:
        mmc_cmd(MMC_CMD_SEND_STATUS, mmc_rca << 16, &card_status, R1 | NCR);
-       printf("mmc: bread failed, status = %08x, card status = %08x\n",
+       printf("mmc: bread failed, status = %08x, card status = %08lx\n",
               status, card_status);
        goto out;
 }
@@ -284,13 +284,13 @@ static void sd_parse_cid(struct mmc_cid *cid, unsigned long *resp)
 
 static void mmc_dump_cid(const struct mmc_cid *cid)
 {
-       printf("Manufacturer ID:       %02lX\n", cid->mid);
-       printf("OEM/Application ID:    %04lX\n", cid->oid);
+       printf("Manufacturer ID:       %02X\n", cid->mid);
+       printf("OEM/Application ID:    %04X\n", cid->oid);
        printf("Product name:          %s\n", cid->pnm);
-       printf("Product Revision:      %lu.%lu\n",
+       printf("Product Revision:      %u.%u\n",
               cid->prv >> 4, cid->prv & 0x0f);
        printf("Product Serial Number: %lu\n", cid->psn);
-       printf("Manufacturing Date:    %02lu/%02lu\n",
+       printf("Manufacturing Date:    %02u/%02u\n",
               cid->mdt >> 4, cid->mdt & 0x0f);
 }
 
@@ -501,7 +501,7 @@ int mmc_init(int verbose)
        mmc_blkdev.part_type = PART_TYPE_DOS;
        mmc_blkdev.block_read = mmc_bread;
        sprintf((char *)mmc_blkdev.vendor,
-               "Man %02x%04x Snr %08x",
+               "Man %02x%04x Snr %08lx",
                cid.mid, cid.oid, cid.psn);
        strncpy((char *)mmc_blkdev.product, cid.pnm,
                sizeof(mmc_blkdev.product));

diff --git a/drivers/mtd/spi/atmel.c b/drivers/mtd/spi/atmel.c
index fb7a4a939b062530e5c565af2b4bc6e7217ab9a1..10fcf0cdde88d7d8b6d80c58d9bb0845258d1601 100644 (file)
--- a/drivers/mtd/spi/atmel.c
+++ b/drivers/mtd/spi/atmel.c
@@ -205,7 +205,7 @@ static int dataflash_write_at45(struct spi_flash *flash,
                byte_addr = 0;
        }
 
-       debug("SF: AT45: Successfully programmed %u bytes @ 0x%x\n",
+       debug("SF: AT45: Successfully programmed %zu bytes @ 0x%x\n",
                        len, offset);
        ret = 0;
 
@@ -268,7 +268,7 @@ int dataflash_erase_at45(struct spi_flash *flash, u32 offset, size_t len)
                page_addr++;
        }
 
-       debug("SF: AT45: Successfully erased %u bytes @ 0x%x\n",
+       debug("SF: AT45: Successfully erased %zu bytes @ 0x%x\n",
                        len, offset);
        ret = 0;
 
@@ -351,7 +351,7 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
                                * params->blocks_per_sector
                                * params->nr_sectors;
 
-       debug("SF: Detected %s with page size %u, total %u bytes\n",
+       debug("SF: Detected %s with page size %lu, total %u bytes\n",
                        params->name, page_size, asf->flash.size);
 
        return &asf->flash;

diff --git a/include/asm-avr32/sysreg.h b/include/asm-avr32/sysreg.h
index 72ad49e5e2d8d266f986f3b17bb1b52441a130a1..4f6970448b83a220f0e8fa31e623fd629cd96359 100644 (file)
--- a/include/asm-avr32/sysreg.h
+++ b/include/asm-avr32/sysreg.h
@@ -273,7 +273,9 @@
         | SYSREG_BF(name,value))
 
 /* Register access macros */
-#define sysreg_read(reg)               __builtin_mfsr(SYSREG_##reg)
-#define sysreg_write(reg, value)       __builtin_mtsr(SYSREG_##reg, value)
+#define sysreg_read(reg)                               \
+       ((unsigned long)__builtin_mfsr(SYSREG_##reg))
+#define sysreg_write(reg, value)                       \
+       __builtin_mtsr(SYSREG_##reg, value)
 
 #endif /* __ASM_AVR32_SYSREG_H__ */