From bcb1638b70c6dfd5a72b6d0d50775144ce6235f6 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Wed, 4 Mar 2015 20:03:51 +0100
Subject: [PATCH] remove carambola_factory

we have our own recovery mechanism
---
 u-boot/board/ar7240/carambola2/Makefile       |  1 -
 .../ar7240/carambola2/carambola_factory.c     | 57 -------------------
 u-boot/common/main.c                          |  4 --
 u-boot/include/configs/carambola2.h           |  4 --
 u-boot/include/configs/skylab.h               |  4 --
 5 files changed, 70 deletions(-)
 delete mode 100644 u-boot/board/ar7240/carambola2/carambola_factory.c

diff --git a/u-boot/board/ar7240/carambola2/Makefile b/u-boot/board/ar7240/carambola2/Makefile
index 538f836bd7..3d5f272587 100644
--- a/u-boot/board/ar7240/carambola2/Makefile
+++ b/u-boot/board/ar7240/carambola2/Makefile
@@ -3,7 +3,6 @@ include $(TOPDIR)/config.mk
 LIB	= lib$(BOARD).a
 
 OBJS	= $(BOARD).o flash.o ../common/ar7240_flash.o ../common/ar7240_s26_phy.o
-OBJS	+= carambola_factory.o
 OBJS	+= ../common/watchdog.o
 SOBJS	= ../common/lowlevel_init.o
 SOBJS	+= hornet_pll_init.o
diff --git a/u-boot/board/ar7240/carambola2/carambola_factory.c b/u-boot/board/ar7240/carambola2/carambola_factory.c
deleted file mode 100644
index c6b8bc6376..0000000000
--- a/u-boot/board/ar7240/carambola2/carambola_factory.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <common.h>
-#include <config.h>
-
-#define XMK_STR(x)        #x
-#define MK_STR(x) XMK_STR(x)
-
-static void carambola_factory_load_image(void)
-{
-	char *filename = CFG_C2_IMG_FILENAME;
-	int tftp_ret;
-		
-	int  argc_tftp = 3;
-	char* argv_tftp[] = {"tftpboot", CFG_C2_IMG_LOAD_ADDR, filename};
-	
-	int argc_bootm = 2;
-	char* argv_bootm[] = {"bootm", CFG_C2_IMG_LOAD_ADDR};
-	  
-	if (!getenv ("ipaddr"))
-		setenv("ipaddr", MK_STR(CONFIG_IPADDR));
-
-	if (!getenv ("serverip"))
-		setenv("serverip", MK_STR(CONFIG_SERVERIP));
-	
-	//Workaround for slow TFTP:
-	//wake-up network stack with ping to server
-	char *serverip = getenv ("serverip");
-	char ping_command[32]="ping ";
-	strncpy(ping_command+5, serverip, 16);
-	run_command(ping_command, NULL);
-	//end of workaround
-	
-	setenv("netretry", "once"); // Try once, reboot after
-	tftp_ret=do_tftpb (NULL, 0, argc_tftp, argv_tftp);
-	if (0 == tftp_ret) {
-		  printf("Booting TFTP image...\n");
-		  do_bootm(NULL, 0, argc_bootm, argv_bootm);
-		  do_reset(NULL, 0, 0, NULL);
-	}
-	else{
-		  printf("Error getting TFTP image. Rebooting...\n");
-		  do_reset(NULL, 0, 0, NULL);  
-	}
-	return;
-}
-
-
-void carambola_factory_mode(void)
-{
-	char* production_env = getenv("production");
-	
-	if (production_env){
-		if (strncmp(production_env, "yes", 3) == 0){
-			carambola_factory_load_image();
-		}
-	}
-	return;
-}
diff --git a/u-boot/common/main.c b/u-boot/common/main.c
index 5db46f105c..48e8c39da3 100644
--- a/u-boot/common/main.c
+++ b/u-boot/common/main.c
@@ -506,10 +506,6 @@ void main_loop (void)
 
 	if (bootdelay >= 0 && s && !abortboot (bootdelay)) {
 
-#ifdef CONFIG_CARAMBOLA_FACTORY_MODE
-		carambola_factory_mode();
-#endif
-		
 # ifdef CONFIG_AUTOBOOT_KEYED
 		int prev = disable_ctrlc(1);	/* disable Control C checking */
 # endif
diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h
index 074965dc69..32ae5c4961 100644
--- a/u-boot/include/configs/carambola2.h
+++ b/u-boot/include/configs/carambola2.h
@@ -60,10 +60,6 @@
 
 #define CFG_BOOTM_LEN	(16 << 20) /* 16 MB */
 
-#define CONFIG_CARAMBOLA_FACTORY_MODE
-#define CFG_C2_IMG_LOAD_ADDR		"0x80F00000"
-#define CFG_C2_IMG_FILENAME		"carambola2.bin"
-
 #include <configs/common.h>
 
 #include <cmd_confdefs.h>
diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h
index 444c4a351e..884aa41d10 100644
--- a/u-boot/include/configs/skylab.h
+++ b/u-boot/include/configs/skylab.h
@@ -59,10 +59,6 @@
 
 #define CFG_BOOTM_LEN	(16 << 20) /* 16 MB */
 
-#define CONFIG_CARAMBOLA_FACTORY_MODE
-#define CFG_C2_IMG_LOAD_ADDR		"0x80F00000"
-#define CFG_C2_IMG_FILENAME		"carambola2.bin"
-
 #include <configs/common.h>
 
 #include <cmd_confdefs.h>