Changeset 464

Timestamp:

11/05/09 09:17:04 (3 weeks ago)

Author:

goskab

Message:

Pulled in some more advanced partition detection

Because of some problems we have had with loading u-boot from SD cards
the partitioning scheme has been updated to now use the same routines as
u-boot. This means we have dynamic partition detection in x-loader. The
biggest thing that this fixes is the "could not read boot sector" error
message that occurs (seemingly at random) and stops devices from
properly being flashed. A little more testing should be done, but it
seems very promising.

Files:

• trunk/software/x-load/disk/Makefile (modified) (1 diff)
• trunk/software/x-load/disk/part.c (modified) (2 diffs)
• trunk/software/x-load/disk/part_dos.c (added)
• trunk/software/x-load/disk/part_dos.h (added)
• trunk/software/x-load/fs/fat/fat.c (modified) (5 diffs)
• trunk/software/x-load/include/configs/omap3530oswald.h (modified) (1 diff)

trunk/software/x-load/disk/Makefile

@@ -28 +28 @@
-LIB     = libdisk.a
-
-
+ part_dos.o
-
-all:    $(LIB)

trunk/software/x-load/disk/part.c

@@ -39 +39 @@
-     (CONFIG_COMMANDS & CFG_CMD_USB)    || \
-     defined(CONFIG_MMC) || \
+         defined(CFG_CMD_MMC) || \
-     defined(CONFIG_SYSTEMACE) )
-
@@ -125 +126 @@
-     (CONFIG_COMMANDS & CFG_CMD_USB)    || \
-     (CONFIG_COMMANDS & CFG_CMD_MMC)    || \
-
+
+
-
-#if defined(CONFIG_MAC_PARTITION) || \

trunk/software/x-load/fs/fat/fat.c

@@ -52 +52 @@
-#define DOS_PART_TBL_OFFSET     0x1be
-#define DOS_PART_MAGIC_OFFSET   0x1fe
-52
+36
-
-int strncmp(const char * cs,const char * ct,size_t count)
@@ -135 +135 @@
-        else {
-#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI) || \
-
+ || defined(CFG_CMD_MMC)
-                disk_partition_t info;
-                if(!get_partition_info(dev_desc, part_no, &info)) {
@@ -151 +151 @@
-                 * purpose the libpart must be included.
-                 */
-63
+32
-                //part_offset=0;
-                cur_part = 1;
@@ -604 +604 @@
-        volume_info *vistart;
-
-        printf("Reading boot sector\n");
-
-        if (disk_read(0, 1, block) < 0) {
-                FAT_DPRINT("Error: reading block\n");
@@ -640 +638 @@
-           is ok - it's just the buffer. */
-        vistart->fs_type[8] = '\0';
-
+
-        if (*fatsize == 32) {
-                if (compare_sign(FAT32_SIGN, vistart->fs_type) == 0) {

trunk/software/x-load/include/configs/omap3530oswald.h

@@ -45 +45 @@
-/* Enable the below macro if MMC boot support is required */
-#define CONFIG_MMC      1
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-#include <asm/arch/cpu.h>        /* get chip and board defs */