qi-rename-tla01-gta03.patch

TLA01 is officially GTA03 now :-)

Signed-off-by: Andy Green <andy@openmoko.com>

qiboot/src/cpu/s3c6410/gta03.c

@@ -1,5 +1,5 @@
 #include <qi.h>
-#include <neo_tla01.h>
+#include <neo_gta03.h>
 #include <serial-s3c64xx.h>
 //#include <ports-s3c24xx.h>
 //#include <i2c-bitbang-s3c24xx.h>
@@ -13,11 +13,15 @@
 static const struct board_variant board_variants[] = {
 	[0] = {
 		.name = "SMDK",
-		.machine_revision = 0x010,
+		.machine_revision = 0,
 	},
+	[1] = {
+		.name = "GTA03 EVT1",
+		.machine_revision = 1
+	}
 };
 
-void port_init_tla01(void)
+void port_init_gta03(void)
 {
 #if 0
 	unsigned int * MPLLCON = (unsigned int *)0x4c000004;
@@ -146,35 +150,35 @@ void port_init_tla01(void)
  * GTA03 returns 0x001
  */
 
-int tla01_get_pcb_revision(void)
+int gta03_get_pcb_revision(void)
 {
-	return 0;
+	return 0; /* always SMDK right now */
 }
 
-const struct board_variant const * get_board_variant_tla01(void)
+const struct board_variant const * get_board_variant_gta03(void)
 {
-	return &board_variants[tla01_get_pcb_revision()];
+	return &board_variants[gta03_get_pcb_revision()];
 }
 
-int is_this_board_tla01(void)
+int is_this_board_gta03(void)
 {
-	/* FIXME: find something tla01 specific */
+	/* FIXME: find something gta03 specific */
 	return 1;
 }
 
-static void putc_tla01(char c)
+static void putc_gta03(char c)
 {
 	serial_putc_s3c64xx(GTA03_DEBUG_UART, c);
 }
 
-int sd_card_init_tla01(void)
+int sd_card_init_gta03(void)
 {
 	extern int s3c6410_mmc_init(int verbose);
 
 	return s3c6410_mmc_init(1);
 }
 
-int sd_card_block_read_tla01(unsigned char * buf, unsigned long start512,
+int sd_card_block_read_gta03(unsigned char * buf, unsigned long start512,
 							       int blocks512)
 {
 unsigned long s3c6410_mmc_bread(int dev_num, unsigned long blknr, unsigned long blkcnt,
@@ -186,20 +190,20 @@ unsigned long s3c6410_mmc_bread(int dev_num, unsigned long blknr, unsigned long
 /*
  * our API for bootloader on this machine
  */
-const struct board_api board_api_tla01 = {
-	.name = "TLA01",
+const struct board_api board_api_gta03 = {
+	.name = "GTA03",
 	.linux_machine_id = 1626 /*1866*/,
 	.linux_mem_start = 0x50000000,
 	.linux_mem_size = (128 * 1024 * 1024),
 	.linux_tag_placement = 0x50000000 + 0x100,
-	.get_board_variant = get_board_variant_tla01,
-	.is_this_board = is_this_board_tla01,
-	.port_init = port_init_tla01,
-	.putc = putc_tla01,
+	.get_board_variant = get_board_variant_gta03,
+	.is_this_board = is_this_board_gta03,
+	.port_init = port_init_gta03,
+	.putc = putc_gta03,
 	.kernel_source = {
 		[0] = {
 			.name = "SD Card rootfs",
-			.block_read = sd_card_block_read_tla01,
+			.block_read = sd_card_block_read_gta03,
 			.filesystem = FS_EXT2,
 			.partition_index = 2,
 			.filepath = "boot/uImage.bin",
@@ -209,7 +213,7 @@ const struct board_api board_api_tla01 = {
 		},
 		[1] = {
 			.name = "SD Card backup rootfs",
-			.block_read = sd_card_block_read_tla01,
+			.block_read = sd_card_block_read_gta03,
 			.filesystem = FS_EXT2,
 			.partition_index = 3,
 			.filepath = "boot/uImage.bin",
@@ -218,3 +222,4 @@ const struct board_api board_api_tla01 = {
 				       "loglevel=8 init=/bin/sh "
 		},	},
 };
+

qiboot/src/cpu/s3c6410/qi.lds

@@ -45,7 +45,7 @@ SECTIONS
 	  src/cpu/s3c6410/start.o		(.text .rodata* .data)
 	  src/cpu/s3c6410/start_qi.o		(.text .rodata* .data)
 	  src/cpu/s3c6410/serial-s3c64xx.o	(.text .rodata* .data)
-	  src/cpu/s3c6410/tla01.o		(.text .rodata* .data)
+	  src/cpu/s3c6410/gta03.o		(.text .rodata* .data)
 	  src/cpu/s3c6410/hs_mmc.o		(.text .rodata* .data)
 	  src/utils.o				(.text .rodata* .data)
 	  src/ctype.o				(.text .rodata* .data)

qiboot/src/cpu/s3c6410/start_qi.c

@@ -25,7 +25,7 @@
 
 
 #include <qi.h>
-#include <neo_tla01.h>
+#include <neo_gta03.h>
 
 #define stringify2(s) stringify1(s)
 #define stringify1(s) #s
@@ -33,7 +33,7 @@
 extern void bootloader_second_phase(void);
 
 const struct board_api *boards[] = {
-			&board_api_tla01,
+			&board_api_gta03,
 			NULL /* always last */
 };