TS-7100 updates

Makefile.am

@@ -1,2 +1,2 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src
+SUBDIRS = src scripts

configure.ac

@@ -27,5 +27,6 @@ AC_CHECK_FUNCS([bzero getpagesize memset munmap select strstr strtoul strtoull])
 AC_CONFIG_FILES([
 	Makefile 
 	src/Makefile 
+	scripts/Makefile
 ])
 AC_OUTPUT

scripts/Makefile.am

@@ -0,0 +1 @@
+bin_SCRIPTS = splash-convert

src/Makefile.am

@@ -2,7 +2,7 @@ GITCOMMIT:= $(shell git describe --abbrev=12 --dirty --always)
 
 CFLAGS=-Wall -fno-tree-cselim
 
-tshwctl_SOURCES = tshwctl.c fpga.c eval_cmdline.c helpers.c
+tshwctl_SOURCES = tshwctl.c fpga.c helpers.c
 tshwctl_CPPFLAGS = -DGITCOMMIT="\"${GITCOMMIT}\""
 
 lcdmesg_SOURCES = lcdmesg.c helpers.c fpga.c

src/helpers.c

@@ -1,7 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <endian.h>
 #include <string.h>
+#include <errno.h>
 
 int get_model(void)
 {
@@ -29,3 +31,25 @@ int get_model(void)
 
 	return ret;
 }
+
+int chosen_read_u32(const char *name, uint32_t *value)
+{
+    char     path[256];
+    FILE    *fp;
+    uint32_t be_val;
+    size_t   n;
+
+    snprintf(path, sizeof(path), "/sys/firmware/devicetree/base/chosen/%s", name);
+
+    fp = fopen(path, "rb");
+    if (!fp)
+        return errno;
+    n = fread(&be_val, 1, sizeof(be_val), fp);
+    fclose(fp);
+
+    if (n != sizeof(be_val))
+        return EIO;
+
+    *value = be32toh(be_val);
+    return 0;
+}

src/helpers.h

@@ -2,5 +2,6 @@
 #define __HELPERS_H__
 
 int get_model(void);
+int chosen_read_u32(const char *name, uint32_t *value);
 
 #endif //__HELPERS_H__

src/tshwctl.c

@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "eval_cmdline.h"
 #include "fpga.h"
 #include "helpers.h"
 
@@ -24,17 +23,36 @@ int model = 0;
 
 void do_info(void)
 {
-	fpga_init(0x50004000);
-	eval_cmd_init();
+	int ret;
 
+	fpga_init(0x50004000);
 	printf("MODEL=%X\n", model);
 
-	if(model == 0x7100) {
-		printf("FPGA_REV=0x%X\n", fpeek32(0x0) >> 16);
-		printf("CPU_OPTS=0x%X\n", eval_cmd("cpu_opts"));
-		printf("IO_OPTS=0x%X\n", eval_cmd("io_opts"));
-		printf("IO_MODEL=0x%X\n", eval_cmd("io_model"));
-	} else if(model == 0x7250) {
+	if (model == 0x7100) {
+		uint32_t cpu_options, io_options, io_model;
+
+		ret = chosen_read_u32("cpu-options", &cpu_options);
+		if (ret) {
+			fprintf(stderr, "cpu-options missing from device-tree chosen.\n"
+							"This may be an outdated u-boot\n");
+			return;
+		}
+
+		ret = chosen_read_u32("io-options", &io_options);
+		if (ret) {
+			return;
+		}
+
+		ret = chosen_read_u32("io-model", &io_model);
+		if (ret) {
+			return;
+		}
+
+		printf("FPGA_REV=%d\n", fpeek32(0x0));
+		printf("CPU_OPTS=0x%X\n", cpu_options);
+		printf("IO_OPTS=0x%X\n", io_options);
+		printf("IO_MODEL=0x%X\n", io_model);
+	} else if (model == 0x7250) {
 		uint32_t fpga_rev = fpeek32(0x0);
 		uint32_t fpga_hash = fpeek32(0x4);
 		uint32_t opts = fpeek32(0x8);