X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib%2Fdisplay_options.c;h=694d2f22e89ec574f9db84d75de143c52fbf9507;hb=578f35a338ea45b425f734a7772a49ffd796c6bb;hp=a711425b906ae03a06849831ce718b11204196a5;hpb=f2d76ae4fdde180e120ea2d29d6ef881360b3cba;p=u-boot

diff --git a/lib/display_options.c b/lib/display_options.c
index a711425b90..694d2f22e8 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -23,13 +23,12 @@
 
 #include <config.h>
 #include <common.h>
+#include <version.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 
 int display_options (void)
 {
-	extern char version_string[];
-
 #if defined(BUILD_TAG)
 	printf ("\n\n%s, Build: %s\n\n", version_string, BUILD_TAG);
 #else
@@ -101,10 +100,12 @@ void print_size(unsigned long long size, const char *s)
 #define DEFAULT_LINE_LENGTH_BYTES (16)
 int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
 {
-	uint8_t linebuf[MAX_LINE_LENGTH_BYTES];
-	uint32_t *uip = (void*)linebuf;
-	uint16_t *usp = (void*)linebuf;
-	uint8_t *ucp = (void*)linebuf;
+	/* linebuf as a union causes proper alignment */
+	union linebuf {
+		uint32_t ui[MAX_LINE_LENGTH_BYTES/sizeof(uint32_t) + 1];
+		uint16_t us[MAX_LINE_LENGTH_BYTES/sizeof(uint16_t) + 1];
+		uint8_t  uc[MAX_LINE_LENGTH_BYTES/sizeof(uint8_t) + 1];
+	} lb;
 	int i;
 
 	if (linelen*width > MAX_LINE_LENGTH_BYTES)
@@ -121,24 +122,24 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen)
 
 		/* Copy from memory into linebuf and print hex values */
 		for (i = 0; i < linelen; i++) {
-			if (width == 4) {
-				uip[i] = *(volatile uint32_t *)data;
-				printf(" %08x", uip[i]);
-			} else if (width == 2) {
-				usp[i] = *(volatile uint16_t *)data;
-				printf(" %04x", usp[i]);
-			} else {
-				ucp[i] = *(volatile uint8_t *)data;
-				printf(" %02x", ucp[i]);
-			}
+			uint32_t x;
+			if (width == 4)
+				x = lb.ui[i] = *(volatile uint32_t *)data;
+			else if (width == 2)
+				x = lb.us[i] = *(volatile uint16_t *)data;
+			else
+				x = lb.uc[i] = *(volatile uint8_t *)data;
+			printf(" %0*x", width * 2, x);
 			data += width;
 		}
 
 		/* Print data in ASCII characters */
-		puts("    ");
-		for (i = 0; i < linelen * width; i++)
-			putc(isprint(ucp[i]) && (ucp[i] < 0x80) ? ucp[i] : '.');
-		putc ('\n');
+		for (i = 0; i < linelen * width; i++) {
+			if (!isprint(lb.uc[i]) || lb.uc[i] >= 0x80)
+				lb.uc[i] = '.';
+		}
+		lb.uc[i] = '\0';
+		printf("    %s\n", lb.uc);
 
 		/* update references */
 		addr += linelen * width;