# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1402881317 0
# Node ID 7daea247606222974bf256c1127a784955931a3e
# Parent  7602443edf0d997e7033ecf1511eec232d65fdfd
loadagent: Intel flash support added, compiles

diff -r 7602443edf0d -r 7daea2476062 target-utils/libload/Makefile
--- a/target-utils/libload/Makefile	Sun Jun 15 22:06:46 2014 +0000
+++ b/target-utils/libload/Makefile	Mon Jun 16 01:15:17 2014 +0000
@@ -5,7 +5,7 @@
 RANLIB=	arm-elf-ranlib
 
 OBJS=	cmd_blankchk.o cmd_crc32.o cmd_memdump_human.o cmd_memdump_machine.o \
-	cmd_memload.o amdflash.o hexstrings.o
+	cmd_memload.o amdflash.o hexstrings.o intelflash.o
 
 all:	libload.a
 
diff -r 7602443edf0d -r 7daea2476062 target-utils/libload/intelflash.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/target-utils/libload/intelflash.c	Mon Jun 16 01:15:17 2014 +0000
@@ -0,0 +1,77 @@
+/*
+ * This module implements the INFB and INFW commands for programming
+ * Intel-style flash memories.  The syntax and operation are exactly
+ * the same as the AMD flash counterparts AMFB and AMFW.
+ */
+
+#include <sys/types.h>
+#include "types.h"
+
+static u32 base_addr;
+
+void
+cmd_INFB(argbulk)
+	char *argbulk;
+{
+	char *argv[2];
+	u_long addr;
+
+	if (parse_args(argbulk, 1, 1, argv, 0) < 0)
+		return;
+	if (parse_hexarg(argv[0], 8, &addr) < 0) {
+		printf("ERROR: argument must be a valid 32-bit hex address\n");
+		return;
+	}
+	if (addr & 1) {
+		printf("ERROR: odd address\n");
+		return;
+	}
+	base_addr = addr;
+}
+
+void
+cmd_INFW(argbulk)
+	char *argbulk;
+{
+	char *argv[3], *s;
+	u_long offset;
+	volatile u16 *flashptr;
+	u32 datum;	/* needs to be u32 for decode_hex_digits() */
+	u16 stat;
+	int i;
+
+	if (parse_args(argbulk, 2, 2, argv, 0) < 0)
+		return;
+	if (parse_hexarg(argv[0], 8, &offset) < 0) {
+	    printf("ERROR: offset argument must a valid 32-bit hex value\n");
+		return;
+	}
+	if (offset & 1) {
+		printf("ERROR: odd offset argument\n");
+		return;
+	}
+	flashptr = (volatile u16 *)(base_addr + offset);
+	for (s = argv[1]; *s; flashptr++, s += 4) {
+		if (decode_hex_digits(s, 4, &datum) < 0) {
+			printf("ERROR: bad INFW hex string argument\n");
+			return;
+		}
+		*flashptr = 0x40;
+		*flashptr = datum;
+		for (i = 10000; i; i--) {
+			stat = *flashptr;
+			if (stat & 0x80)
+				break;
+		}
+		if (!i) {
+			printf("ERROR: flash write timeout at %08X\n",
+				(u_long) flashptr);
+			return;
+		}
+		if (stat & 0x10) {
+			printf("ERROR: program operation failed at %08X\n",
+				(u_long) flashptr);
+			return;
+		}
+	}
+}
diff -r 7602443edf0d -r 7daea2476062 target-utils/loadagent/cmdtab.c
--- a/target-utils/loadagent/cmdtab.c	Sun Jun 15 22:06:46 2014 +0000
+++ b/target-utils/loadagent/cmdtab.c	Mon Jun 16 01:15:17 2014 +0000
@@ -2,6 +2,8 @@
 
 extern void cmd_AMFB();
 extern void cmd_AMFW();
+extern void cmd_INFB();
+extern void cmd_INFW();
 extern void cmd_abbr();
 extern void cmd_abbw();
 extern void cmd_blankchk();
@@ -26,6 +28,8 @@
 	{"AMFB", cmd_AMFB},
 	{"AMFW", cmd_AMFW},
 	{"DUMP", cmd_memdump_machine},
+	{"INFB", cmd_INFB},
+	{"INFW", cmd_INFW},
 	{"ML", cmd_memload},
 	{"abbinit", abb_init},
 	{"abbr", cmd_abbr},