* Patch by Thomas Frieden, 13 Nov 2002:

  Add code for AmigaOne board
  (preliminary merge to U-Boot, still WIP)

* Patch by Jon Diekema, 12 Nov 2002:
  - Adding URL for IEEE OUI lookup
  - Making the autoboot #defines dependent on CONFIG_AUTOBOOT_KEYED
    being defined.
  - In the CONFIG_EXTRA_ENV_SETTINGS #define, the root-on-initrd and
    root-on-nfs macros are designed to switch how the default boot
    method gets defined.

7 files changed, 594 insertions, 2 deletions

diff --git a/disk/Makefile b/disk/Makefile
index 7b80174f5b3..39677f1e2e0 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= libdisk.a
 
-OBJS	= part.o part_mac.o part_dos.o part_iso.o
+OBJS	= part.o part_mac.o part_dos.o part_iso.o part_amiga.o
 
 all:	$(LIB)
 
diff --git a/disk/part.c b/disk/part.c
index 99fe0db9fa7..70511ca0654 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -106,7 +106,8 @@ void dev_print (block_dev_desc_t *dev_desc)
 
 #if defined(CONFIG_MAC_PARTITION) || \
     defined(CONFIG_DOS_PARTITION) || \
-    defined(CONFIG_ISO_PARTITION)
+    defined(CONFIG_ISO_PARTITION) || \
+    defined(CONFIG_AMIGA_PARTITION) 
 
 void init_part (block_dev_desc_t * dev_desc)
 {
@@ -130,6 +131,13 @@ void init_part (block_dev_desc_t * dev_desc)
 		return;
 	}
 #endif
+
+#ifdef CONFIG_AMIGA_PARTITION
+	if (test_part_amiga(dev_desc) == 0) {
+	    dev_desc->part_type = PART_TYPE_AMIGA;
+	    return;
+	}
+#endif
 }
 
 
@@ -162,6 +170,16 @@ int get_partition_info (block_dev_desc_t *dev_desc, int part, disk_partition_t *
 		}
 		break;
 #endif
+
+#ifdef CONFIG_AMIGA_PARTITION
+	case PART_TYPE_AMIGA:
+	    if (get_partition_info_amiga(dev_desc, part, info) == 0)
+	    {
+		PRINTF ("## Valid Amiga partition found ##\n");
+		return (0);
+	    }
+	    break;
+#endif
 	default:
 		break;
 	}
@@ -215,6 +233,14 @@ void print_part (block_dev_desc_t * dev_desc)
 		print_part_iso (dev_desc);
 		return;
 #endif
+
+#ifdef CONFIG_AMIGA_PARTITION
+	case PART_TYPE_AMIGA:
+	    PRINTF ("## Testing for a valid Amiga partition ##\n");
+	    print_part_header ("AMIGA", dev_desc);
+	    print_part_amiga (dev_desc);
+	    return;
+#endif
 	}
 	puts ("## Unknown partition table\n");
 }
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
new file mode 100644
index 00000000000..aafbcd84cc4
--- /dev/null
+++ b/disk/part_amiga.c
@@ -0,0 +1,399 @@
+/*
+ * (C) Copyright 2001
+ * Hans-Joerg Frieden, Hyperion Entertainment 
+ * Hans-JoergF@hyperion-entertainment.com
+ *
+ * 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 <command.h>
+#include <ide.h>
+#include <cmd_disk.h>
+#include "part_amiga.h"
+
+#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI)) && defined(CONFIG_AMIGA_PARTITION)
+
+#undef AMIGA_DEBUG
+
+#ifdef AMIGA_DEBUG
+#define PRINTF(fmt, args...) printf(fmt ,##args)
+#else
+#define PRINTF(fmt, args...)
+#endif
+
+struct block_header
+{
+    u32 id;
+    u32 summed_longs;
+    s32 chk_sum;
+};
+
+static unsigned char block_buffer[DEFAULT_SECTOR_SIZE];
+static struct rigid_disk_block rdb = {0};
+static struct bootcode_block bootcode = {0};
+
+/*
+ * Copy a bcpl to a c string
+ */
+static void bcpl_strcpy(char *to, char *from)
+{
+    int len = *from++;
+
+    while (len)
+    {
+	*to++ = *from++;
+	len--;
+    }
+    *to = 0;
+}
+
+/*
+ * Print a BCPL String. BCPL strings start with a byte with the length
+ * of the string, and don't contain a terminating nul character
+ */
+static void bstr_print(char *string)
+{
+    int len = *string++;
+    char buffer[256];
+    int i;
+    
+    i = 0;
+    while (len)
+    {
+	buffer[i++] = *string++;
+	len--;
+    }
+
+    buffer[i] = 0;
+    printf("%-10s", buffer);
+}
+
+/*
+ * Sum a block. The checksum of a block must end up at zero
+ * to be valid. The chk_sum field is selected so that adding
+ * it yields zero.
+ */
+int sum_block(struct block_header *header)
+{
+    s32 *block = (s32 *)header;
+    u32 i;
+    s32 sum = 0;
+
+    for (i = 0; i < header->summed_longs; i++)
+	sum += *block++;
+    
+    return (sum != 0);
+}
+
+/*
+ * Print an AmigaOS disk type. Disk types are a four-byte identifier
+ * describing the file system. They are usually written as a three-letter
+ * word followed by a backslash and a version number. For example,
+ * DOS\0 would be the original file system. SFS\0 would be SmartFileSystem.
+ * DOS\1 is FFS.
+ */
+static void print_disk_type(u32 disk_type)
+{
+    char buffer[6];
+    buffer[0] = (disk_type & 0xFF000000)>>24;
+    buffer[1] = (disk_type & 0x00FF0000)>>16;
+    buffer[2] = (disk_type & 0x0000FF00)>>8;
+    buffer[3] = '\\';
+    buffer[4] = (disk_type & 0x000000FF) + '0';
+    buffer[5] = 0;
+    printf("%s", buffer);
+}
+
+/*
+ * Print the info contained within the given partition block
+ */
+static void print_part_info(struct partition_block *p)
+{
+    struct amiga_part_geometry *g;
+    
+    g = (struct amiga_part_geometry *)&(p->environment);
+
+    bstr_print(p->drive_name);
+    printf("%6d\t%6d\t", 
+	   g->low_cyl * g->block_per_track * g->surfaces , 
+	   (g->high_cyl - g->low_cyl + 1) * g->block_per_track * g->surfaces - 1);
+    print_disk_type(g->dos_type);
+    printf("\t%5d\n", g->boot_priority);
+}
+
+/*
+ * Search for the Rigid Disk Block. The rigid disk block is required
+ * to be within the first 16 blocks of a drive, needs to have
+ * the ID AMIGA_ID_RDISK ('RDSK') and needs to have a valid
+ * sum-to-zero checksum
+ */
+struct rigid_disk_block *get_rdisk(block_dev_desc_t *dev_desc)
+{
+    int i;
+    int limit;
+    char *s;
+
+    s = getenv("amiga_scanlimit");
+    if (s)
+	limit = atoi(s);
+    else
+	limit = AMIGA_BLOCK_LIMIT;
+
+    for (i=0; i<limit; i++)
+    {
+	ulong res = dev_desc->block_read(dev_desc->dev, i, 1,
+					 (ulong *)block_buffer);
+	if (res == 1)
+	{
+	    struct rigid_disk_block *trdb = (struct rigid_disk_block *)block_buffer;
+	    if (trdb->id == AMIGA_ID_RDISK)
+	    {
+		PRINTF("Rigid disk block suspect at %d, checking checksum\n",i);
+		if (sum_block((struct block_header *)block_buffer) == 0)
+		{
+		    PRINTF("FOUND\n");
+		    memcpy(&rdb, trdb, sizeof(struct rigid_disk_block));
+		    return (struct rigid_disk_block *)&rdb;
+		}
+	    }
+	}
+    }
+    PRINTF("Done scanning, no RDB found\n");
+    return NULL;
+}
+
+/* 
+ * Search for boot code
+ * Again, the first boot block must be located somewhere in the first 16 blocks, or rooted in the
+ * Ridgid disk block
+ */
+
+struct bootcode_block *get_bootcode(block_dev_desc_t *dev_desc)
+{
+    int i;
+    int limit;
+    char *s;
+
+    s = getenv("amiga_scanlimit");
+    if (s)
+	limit = atoi(s);
+    else
+	limit = AMIGA_BLOCK_LIMIT;
+
+    PRINTF("Scanning for BOOT from 0 to %d\n", limit);
+
+    for (i = 0; i < limit; i++)
+    {
+	ulong res = dev_desc->block_read(dev_desc->dev, i, 1, (ulong *)block_buffer);
+	if (res == 1)
+	{
+	    struct bootcode_block *boot = (struct bootcode_block *)block_buffer;
+	    if (boot->id == AMIGA_ID_BOOT)
+	    {
+		PRINTF("BOOT block at %d, checking checksum\n", i);
+		if (sum_block((struct block_header *)block_buffer) == 0)
+		{
+		    PRINTF("Found valid bootcode block\n");
+		    memcpy(&bootcode, boot, sizeof(struct bootcode_block));
+		    return &bootcode;
+		}
+	    }
+	}
+    }
+
+    PRINTF("No boot code found on disk\n");
+    return 0;
+}
+
+/* 
+ * Test if the given partition has an Amiga partition table/Rigid
+ * Disk block
+ */
+int test_part_amiga(block_dev_desc_t *dev_desc)
+{
+    struct rigid_disk_block *rdb;
+    struct bootcode_block *bootcode;
+
+    PRINTF("test_part_amiga: Testing for an Amiga RDB partition\n");
+    
+    rdb = get_rdisk(dev_desc);
+    if (rdb)
+    {
+	bootcode = get_bootcode(dev_desc);
+	if (bootcode)
+	    PRINTF("test_part_amiga: bootable Amiga disk\n");
+	else
+	    PRINTF("test_part_amiga: non-bootable Amiga disk\n");
+
+	return 0;
+    }
+    else 
+    {
+	PRINTF("test_part_amiga: no RDB found\n");
+	return -1;
+    }
+
+}
+
+/* 
+ * Find partition number partnum on the given drive.
+ */
+static struct partition_block *find_partition(block_dev_desc_t *dev_desc, int partnum)
+{
+    struct rigid_disk_block *rdb;
+    struct partition_block *p;
+    u32 block;
+
+    PRINTF("Trying to find partition block %d\n", partnum);
+    rdb = get_rdisk(dev_desc);
+    if (!rdb) 
+    {
+	PRINTF("find_partition: no rdb found\n");
+	return NULL;
+    }
+    
+    PRINTF("find_partition: Scanning partition list\n");
+
+    block = rdb->partition_list;
+    PRINTF("find_partition: partition list at 0x%x\n", block);
+
+    while (block != 0xFFFFFFFF)
+    {
+	ulong res = dev_desc->block_read(dev_desc->dev, block, 1,
+					 (ulong *)block_buffer);
+	if (res == 1)
+	{
+	    p = (struct partition_block *)block_buffer;
+	    if (p->id == AMIGA_ID_PART)
+	    {
+		PRINTF("PART block suspect at 0x%x, checking checksum\n",block);
+		if (sum_block((struct block_header *)p) == 0)
+		{
+		    if (partnum == 0) break;
+		    else 
+		    {
+			partnum--;
+			block = p->next;
+		    }
+		}
+	    } else block = 0xFFFFFFFF;
+	} else block = 0xFFFFFFFF;
+    }
+
+    if (block == 0xFFFFFFFF) 
+    {
+	PRINTF("PART block not found\n");
+	return NULL;
+    }
+
+    return (struct partition_block *)block_buffer;
+}
+
+/* 
+ * Get info about a partition
+ */
+int get_partition_info_amiga (block_dev_desc_t *dev_desc, int part, disk_partition_t *info)
+{
+    struct partition_block *p = find_partition(dev_desc, part-1);
+    struct amiga_part_geometry *g;
+    u32 disk_type;
+
+    if (!p) return -1;
+
+    g = (struct amiga_part_geometry *)&(p->environment);
+    info->start = g->low_cyl  * g->block_per_track * g->surfaces;
+    info->size  = (g->high_cyl - g->low_cyl + 1) * g->block_per_track * g->surfaces - 1;
+    info->blksz = rdb.block_bytes;
+    bcpl_strcpy(info->name, p->drive_name);
+    
+
+    disk_type = g->dos_type;
+
+    info->type[0] = (disk_type & 0xFF000000)>>24;
+    info->type[1] = (disk_type & 0x00FF0000)>>16;
+    info->type[2] = (disk_type & 0x0000FF00)>>8;
+    info->type[3] = '\\';
+    info->type[4] = (disk_type & 0x000000FF) + '0';
+    info->type[5] = 0;
+   
+    return 0;
+}
+
+void print_part_amiga (block_dev_desc_t *dev_desc)
+{    
+    struct rigid_disk_block *rdb;
+    struct bootcode_block *boot;
+    struct partition_block *p;
+    u32 block;
+    int i = 1;
+
+    rdb = get_rdisk(dev_desc);
+    if (!rdb) 
+    {
+	PRINTF("print_part_amiga: no rdb found\n");
+	return;
+    }
+    
+    PRINTF("print_part_amiga: Scanning partition list\n");
+
+    block = rdb->partition_list;
+    PRINTF("print_part_amiga: partition list at 0x%x\n", block);
+
+    printf("Summary:  DiskBlockSize: %d\n"
+	   "          Cylinders    : %d\n"
+	   "          Sectors/Track: %d\n"
+	   "          Heads        : %d\n\n",
+	   rdb->block_bytes, rdb->cylinders, rdb->sectors,
+	   rdb->heads);
+
+    printf("                 First   Num. \n"
+	   "Nr.  Part. Name  Block   Block  Type        Boot Priority\n");
+
+    while (block != 0xFFFFFFFF)
+    {
+	ulong res;
+
+	PRINTF("Trying to load block #0x%X\n", block);
+	
+	res = dev_desc->block_read(dev_desc->dev, block, 1,
+				   (ulong *)block_buffer);
+	if (res == 1)
+	{
+	    p = (struct partition_block *)block_buffer;
+	    if (p->id == AMIGA_ID_PART)
+	    {
+		PRINTF("PART block suspect at 0x%x, checking checksum\n",block);
+		if (sum_block((struct block_header *)p) == 0)
+		{
+		    printf("%-4d ", i); i++;
+		    print_part_info(p);
+		    block = p->next;
+		}
+	    } else block = 0xFFFFFFFF;
+	} else block = 0xFFFFFFFF;
+    }
+
+    boot = get_bootcode(dev_desc);
+    if (boot)
+    {
+	printf("Disk is bootable\n");
+    }
+}
+
+#endif
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
new file mode 100644
index 00000000000..9e59be9faa5
--- /dev/null
+++ b/disk/part_amiga.h
@@ -0,0 +1,157 @@
+/*
+ * (C) Copyright 2000
+ * Hans-Joerg Frieden, Hyperion Entertainment
+ * Hans-JoergF@hyperion-entertainment.com
+ *
+ * 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 _DISK_PART_AMIGA_H
+#define _DISK_PART_AMIGA_H
+#include <common.h>
+
+#ifdef CONFIG_ISO_PARTITION
+/* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS
+   have 2048 byte blocks */
+#define DEFAULT_SECTOR_SIZE   2048
+#else
+#define DEFAULT_SECTOR_SIZE	512
+#endif
+
+
+#define AMIGA_BLOCK_LIMIT 16
+
+/*
+ * Amiga disks have a very open structure. The head for the partition table information
+ * is stored somewhere within the first 16 blocks on disk, and is called the
+ * "RigidDiskBlock".
+ */
+
+struct rigid_disk_block 
+{
+    u32 id;
+    u32 summed_longs;
+    s32 chk_sum;
+    u32 host_id;
+    u32 block_bytes;
+    u32 flags;
+    u32 bad_block_list;
+    u32 partition_list;
+    u32 file_sys_header_list;
+    u32 drive_init;
+    u32 bootcode_block;
+    u32 reserved_1[5];
+    
+    /* Physical drive geometry */
+    u32 cylinders;
+    u32 sectors;
+    u32 heads;
+    u32 interleave;
+    u32 park;
+    u32 reserved_2[3];
+    u32 write_pre_comp;
+    u32 reduced_write;
+    u32 step_rate;
+    u32 reserved_3[5];
+
+    /* logical drive geometry */
+    u32 rdb_blocks_lo;
+    u32 rdb_blocks_hi;
+    u32 lo_cylinder;
+    u32 hi_cylinder;
+    u32 cyl_blocks;
+    u32 auto_park_seconds;
+    u32 high_rdsk_block;
+    u32 reserved_4;
+    
+    char disk_vendor[8];
+    char disk_product[16];
+    char disk_revision[4];
+    char controller_vendor[8];
+    char controller_product[16];
+    char controller_revision[4];
+    
+    u32 reserved_5[10];
+};
+
+/*
+ * Each partition on this drive is defined by such a block
+ */
+
+struct partition_block 
+{
+    u32 id;
+    u32 summed_longs;
+    s32 chk_sum;
+    u32 host_id;
+    u32 next;
+    u32 flags;
+    u32 reserved_1[2];
+    u32 dev_flags;
+    char drive_name[32];
+    u32 reserved_2[15];
+    u32 environment[17];
+    u32 reserved_3[15];
+};
+
+struct bootcode_block 
+{
+    u32   id;
+    u32   summed_longs;
+    s32   chk_sum;
+    u32   host_id;
+    u32   next;
+    u32   load_data[123];
+};
+
+
+#define AMIGA_ID_RDISK                  0x5244534B
+#define AMIGA_ID_PART                   0x50415254
+#define AMIGA_ID_BOOT                   0x424f4f54
+
+/* 
+ * The environment array in the partition block
+ * describes the partition
+ */
+
+struct amiga_part_geometry 
+{
+    u32 table_size;
+    u32 size_blocks;
+    u32 unused1;
+    u32 surfaces;
+    u32 sector_per_block;
+    u32 block_per_track;
+    u32 reserved;
+    u32 prealloc;
+    u32 interleave;
+    u32 low_cyl;
+    u32 high_cyl;
+    u32 num_buffers;
+    u32 buf_mem_type;
+    u32 max_transfer;
+    u32 mask;
+    s32 boot_priority;
+    u32 dos_type;
+    u32 baud;
+    u32 control;
+    u32 boot_blocks;
+};
+
+#endif /* _DISK_PART_AMIGA_H_ */
diff --git a/disk/part_dos.h b/disk/part_dos.h
index 1a5c3777b5c..cc3fa81d73b 100644
--- a/disk/part_dos.h
+++ b/disk/part_dos.h
@@ -25,7 +25,13 @@
 #define _DISK_PART_DOS_H
 
 
+#ifdef CONFIG_ISO_PARTITION
+/* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS
+   have 2048 byte blocks */
+#define DEFAULT_SECTOR_SIZE   2048
+#else
 #define DEFAULT_SECTOR_SIZE	512
+#endif
 #define DOS_PART_TBL_OFFSET	0x1be
 #define DOS_PART_MAGIC_OFFSET	0x1fe
 
diff --git a/disk/part_iso.c b/disk/part_iso.c
index a98539da469..72259274c17 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -97,6 +97,7 @@ int get_partition_info_iso_verb(block_dev_desc_t * dev_desc, int part_num, disk_
 	info->blksz=ppr->secsize_BE; /* assuming same block size for all entries */
 	PRINTF(" Lastsect:%08lx\n",lastsect);
 	for(i=blkaddr;i<lastsect;i++) {
+		PRINTF("Reading block %d\n", i);
 		if (dev_desc->block_read (dev_desc->dev, i, 1, (ulong *) tmpbuf) != 1)
   	 	return (-1);
 		if(ppr->desctype==0x00)
diff --git a/disk/part_mac.h b/disk/part_mac.h
index 0340fe8febd..fb1edac561e 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -89,6 +89,9 @@ typedef struct mac_partition {
 	__u32	boot_cksum;	/* boot code checksum			*/
 	uchar	processor[16];	/* Type of Processor			*/
 	__u16	part_pad[188];	/* reserved				*/
+#ifdef CONFIG_ISO_PARTITION
+        uchar   iso_dummy[2048];/* Reservere enough room for an ISO partition block to fit */ 
+#endif
 } mac_partition_t;
 
 #define MAC_STATUS_BOOTABLE	8	/* partition is bootable */