demo: cleanup output

software/demo/main.c

@@ -51,15 +51,6 @@ static void banner()
 			  "\e[0m           SoC demo program\n\n\n");
 }
 
-static void welcome()
-{
-	printf("\n\e[1mIMPORTANT: This program is proof of concept only,\n"
-	"IMPORTANT: and is not intended as a demonstration of the\n"
-	"IMPORTANT: usability of the final software.\e[0m\n"
-	"Questions/feedback: mail devel AT lists.milkymist.org\n"
-	"Have fun!\n\n");
-}
-
 int main()
 {
 	irq_setmask(0);
@@ -84,7 +75,6 @@ int main()
 	apipe_init();
 	rpipe_init();
 	osd_init();
-	welcome();
 	shell_init();
 
 	while(1) {

software/demo/shell.c

@@ -551,7 +551,6 @@ static void tmubench()
 	struct tmu_td td;
 	volatile int complete;
 	unsigned int t;
-	int hits, reqs;
 	char buffer[64];
 	int j;
 
@@ -599,10 +598,8 @@ static void tmubench()
 		tmu_submit_task(&td);
 		while(!complete);
 		t = CSR_TIMER1_COUNTER;
-		hits = CSR_TMU_HIT_A + CSR_TMU_HIT_B + CSR_TMU_HIT_C + CSR_TMU_HIT_D;
-		reqs = CSR_TMU_REQ_A + CSR_TMU_REQ_B + CSR_TMU_REQ_C + CSR_TMU_REQ_D;
 		/* send to UART only */
-		sprintf(buffer, "%d,%d,%d\n", t, hits, reqs);
+		sprintf(buffer, "%d\n", t);
 		j = 0;
 		while(buffer[j])
 			uart_write(buffer[j++]);

software/include/hw/tmu.h

@@ -1,6 +1,6 @@
 /*
  * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
+ * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,16 +63,4 @@ struct tmu_vertex {
 
 #define TMU_MESH_MAXSIZE	128
 
-/* Performance monitoring */
-
-#define CSR_TMU_REQ_A		MMPTR(0xe0007050)
-#define CSR_TMU_HIT_A		MMPTR(0xe0007054)
-#define CSR_TMU_REQ_B		MMPTR(0xe0007058)
-#define CSR_TMU_HIT_B		MMPTR(0xe000705C)
-#define CSR_TMU_REQ_C		MMPTR(0xe0007060)
-#define CSR_TMU_HIT_C		MMPTR(0xe0007064)
-#define CSR_TMU_REQ_D		MMPTR(0xe0007068)
-#define CSR_TMU_HIT_D		MMPTR(0xe000706C)
-
 #endif /* __HW_TMU_H */
-