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

[platform/kernel/u-boot.git] / common / cmd_ide.c

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 821dcff..97a873d 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -52,10 +52,6 @@
 # include <status_led.h>
 #endif
 
-#ifndef __PPC__
-#include <asm/io.h>
-#endif
-
 #ifdef CONFIG_IDE_8xx_DIRECT
 DECLARE_GLOBAL_DATA_PTR;
 #endif
@@ -366,10 +362,13 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        char *boot_device = NULL;
        char *ep;
        int dev, part = 0;
-       ulong addr, cnt, checksum;
+       ulong addr, cnt;
        disk_partition_t info;
        image_header_t *hdr;
        int rcode = 0;
+#if defined(CONFIG_FIT)
+       const void *fit_hdr = NULL;
+#endif
 
        show_boot_progress (41);
        switch (argc) {
@@ -446,29 +445,37 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
        show_boot_progress (48);
 
-       hdr = (image_header_t *)addr;
+       switch (genimg_get_format ((void *)addr)) {
+       case IMAGE_FORMAT_LEGACY:
+               hdr = (image_header_t *)addr;
 
-       if (ntohl(hdr->ih_magic) != IH_MAGIC) {
-               printf("\n** Bad Magic Number **\n");
-               show_boot_progress (-49);
-               return 1;
-       }
-       show_boot_progress (49);
+               show_boot_progress (49);
 
-       checksum = ntohl(hdr->ih_hcrc);
-       hdr->ih_hcrc = 0;
+               if (!image_check_hcrc (hdr)) {
+                       puts ("\n** Bad Header Checksum **\n");
+                       show_boot_progress (-50);
+                       return 1;
+               }
+               show_boot_progress (50);
 
-       if (crc32 (0, (uchar *)hdr, sizeof(image_header_t)) != checksum) {
-               puts ("\n** Bad Header Checksum **\n");
-               show_boot_progress (-50);
+               image_print_contents (hdr);
+
+               cnt = image_get_image_size (hdr);
+               break;
+#if defined(CONFIG_FIT)
+       case IMAGE_FORMAT_FIT:
+               fit_hdr = (const void *)addr;
+               puts ("Fit image detected...\n");
+
+               cnt = fit_get_size (fit_hdr);
+               break;
+#endif
+       default:
+               show_boot_progress (-49);
+               puts ("** Unknown image type\n");
                return 1;
        }
-       show_boot_progress (50);
-       hdr->ih_hcrc = htonl(checksum); /* restore checksum for later use */
 
-       print_image_hdr (hdr);
-
-       cnt = (ntohl(hdr->ih_size) + sizeof(image_header_t));
        cnt += info.blksz - 1;
        cnt /= info.blksz;
        cnt -= 1;
@@ -481,6 +488,18 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
        show_boot_progress (51);
 
+#if defined(CONFIG_FIT)
+       /* This cannot be done earlier, we need complete FIT image in RAM first */
+       if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT) {
+               if (!fit_check_format (fit_hdr)) {
+                       show_boot_progress (-140);
+                       puts ("** Bad FIT image format\n");
+                       return 1;
+               }
+               show_boot_progress (141);
+               fit_print_contents (fit_hdr);
+       }
+#endif
 
        /* Loading ok, update default load address */
 
@@ -886,7 +905,7 @@ input_swap_data(int dev, ulong *sect_buf, int words)
 #endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */
 
 
-#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH)
 static void
 output_data(int dev, ulong *sect_buf, int words)
 {
@@ -938,7 +957,7 @@ output_data(int dev, ulong *sect_buf, int words)
 }
 #endif /* __PPC__ */
 
-#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
+#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH)
 static void
 input_data(int dev, ulong *sect_buf, int words)
 {
@@ -1215,7 +1234,7 @@ static void ide_ident (block_dev_desc_t *dev_desc)
        dev_desc->blksz=ATA_BLOCKSIZE;
        dev_desc->lun=0; /* just to fill something in... */
 
-#if 0  /* only used to test the powersaving mode,
+#if 0  /* only used to test the powersaving mode,
         * if enabled, the drive goes after 5 sec
         * in standby mode */
        ide_outb (device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
@@ -1242,7 +1261,7 @@ ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
 #ifdef CONFIG_LBA48
        unsigned char lba48 = 0;
 
-       if (blknr & 0x0000fffff0000000) {
+       if (blknr & 0x0000fffff0000000ULL) {
                /* more than 28 bits used, use 48bit mode */
                lba48 = 1;
        }
@@ -1296,8 +1315,13 @@ ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
                        /* write high bits */
                        ide_outb (device, ATA_SECT_CNT, 0);
                        ide_outb (device, ATA_LBA_LOW,  (blknr >> 24) & 0xFF);
+#ifdef CFG_64BIT_LBA
                        ide_outb (device, ATA_LBA_MID,  (blknr >> 32) & 0xFF);
                        ide_outb (device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
+#else
+                       ide_outb (device, ATA_LBA_MID,  0);
+                       ide_outb (device, ATA_LBA_HIGH, 0);
+#endif
                }
 #endif
                ide_outb (device, ATA_SECT_CNT, 1);
@@ -1361,7 +1385,7 @@ ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
 #ifdef CONFIG_LBA48
        unsigned char lba48 = 0;
 
-       if (blknr & 0x0000fffff0000000) {
+       if (blknr & 0x0000fffff0000000ULL) {
                /* more than 28 bits used, use 48bit mode */
                lba48 = 1;
        }
@@ -1386,8 +1410,13 @@ ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
                        /* write high bits */
                        ide_outb (device, ATA_SECT_CNT, 0);
                        ide_outb (device, ATA_LBA_LOW,  (blknr >> 24) & 0xFF);
+#ifdef CFG_64BIT_LBA
                        ide_outb (device, ATA_LBA_MID,  (blknr >> 32) & 0xFF);
                        ide_outb (device, ATA_LBA_HIGH, (blknr >> 40) & 0xFF);
+#else
+                       ide_outb (device, ATA_LBA_MID,  0);
+                       ide_outb (device, ATA_LBA_HIGH, 0);
+#endif
                }
 #endif
                ide_outb (device, ATA_SECT_CNT, 1);
@@ -1507,6 +1536,9 @@ static void ide_reset (void)
 
        ide_set_reset (1); /* assert reset */
 
+       /* the reset signal shall be asserted for et least 25 us */
+       udelay(25);
+
        WATCHDOG_RESET();
 
 #ifdef CFG_PB_12V_ENABLE
@@ -1752,7 +1784,7 @@ unsigned char atapi_issue(int device,unsigned char* ccb,int ccblen, unsigned cha
        }
 
        output_data_shorts (device, (unsigned short *)ccb,ccblen/2); /* write command block */
-       /* ATAPI Command written wait for completition */
+       /* ATAPI Command written wait for completition */
        udelay (5000); /* device must set bsy */
 
        mask = ATA_STAT_DRQ|ATA_STAT_BUSY|ATA_STAT_ERR;
@@ -1821,7 +1853,7 @@ AI_OUT:
  * returns, an request_sense will be issued
  */
 
-#define ATAPI_DRIVE_NOT_READY  100
+#define ATAPI_DRIVE_NOT_READY  100
 #define ATAPI_UNIT_ATTN                10
 
 unsigned char atapi_issue_autoreq (int device,