fpgautils: s/firmware/bitstream/

fpgautils.c

@@ -884,7 +884,7 @@ FILE *open_bitstream(const char *dname, const char *filename)
 
 #define check_magic(L)  do {  \
 	if (1 != fread(buf, 1, 1, f))  \
-		bailout(LOG_ERR, "%s: Error reading firmware ('%c')",  \
+		bailout(LOG_ERR, "%s: Error reading bitstream ('%c')",  \
 		        repr, L);  \
 	if (buf[0] != L)  \
 		bailout(LOG_ERR, "%s: Firmware has wrong magic ('%c')",  \
@@ -893,14 +893,14 @@ FILE *open_bitstream(const char *dname, const char *filename)
 
 #define read_str(eng)  do {  \
 	if (1 != fread(buf, 2, 1, f))  \
-		bailout(LOG_ERR, "%s: Error reading firmware (" eng " len)",  \
+		bailout(LOG_ERR, "%s: Error reading bitstream (" eng " len)",  \
 		        repr);  \
 	len = (ubuf[0] << 8) | ubuf[1];  \
 	if (len >= sizeof(buf))  \
 		bailout(LOG_ERR, "%s: Firmware " eng " too long",  \
 		        repr);  \
 	if (1 != fread(buf, len, 1, f))  \
-		bailout(LOG_ERR, "%s: Error reading firmware (" eng ")",  \
+		bailout(LOG_ERR, "%s: Error reading bitstream (" eng ")",  \
 		        repr);  \
 	buf[len] = '\0';  \
 } while(0)
@@ -914,10 +914,10 @@ FILE *open_xilinx_bitstream(const char *dname, const char *repr, const char *fwf
 
 	FILE *f = open_bitstream(dname, fwfile);
 	if (!f)
-		bailout(LOG_ERR, "%s: Error opening firmware file %s",
+		bailout(LOG_ERR, "%s: Error opening bitstream file %s",
 		        repr, fwfile);
 	if (1 != fread(buf, 2, 1, f))
-		bailout(LOG_ERR, "%s: Error reading firmware (magic)",
+		bailout(LOG_ERR, "%s: Error reading bitstream (magic)",
 		        repr);
 	if (buf[0] || buf[1] != 9)
 		bailout(LOG_ERR, "%s: Firmware has wrong magic (9)",
@@ -936,7 +936,7 @@ FILE *open_xilinx_bitstream(const char *dname, const char *repr, const char *fwf
 		++p;
 	unsigned long fwusercode = (unsigned long)strtoll(p, &p, 16);
 	if (p[0] != '\0')
-		bailout(LOG_ERR, "%s: Bad usercode in firmware file",
+		bailout(LOG_ERR, "%s: Bad usercode in bitstream file",
 		        repr);
 	if (fwusercode == 0xffffffff)
 		bailout(LOG_ERR, "%s: Firmware doesn't support user code",
@@ -953,7 +953,7 @@ FILE *open_xilinx_bitstream(const char *dname, const char *repr, const char *fwf
 	applog(LOG_DEBUG, "  Build time: %s", buf);
 	check_magic('e');
 	if (1 != fread(buf, 4, 1, f))
-		bailout(LOG_ERR, "%s: Error reading firmware (data len)",
+		bailout(LOG_ERR, "%s: Error reading bitstream (data len)",
 		        repr);
 	len = ((unsigned long)ubuf[0] << 24) | ((unsigned long)ubuf[1] << 16) | (ubuf[2] << 8) | ubuf[3];
 	applog(LOG_DEBUG, "  Bitstream size: %lu", len);