diff --git a/board/amlogic/env/android_tv.env b/board/amlogic/env/android_tv.env
index c4b128f..a5ec9ce 100644
--- a/board/amlogic/env/android_tv.env
+++ b/board/amlogic/env/android_tv.env
@@ -110,9 +110,10 @@
 
 initargs=init=/init ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 loop.max_part=4
 
+console=ttyS0,115200
 storeargs=get_bootloaderversion;
 	setenv bootargs ${initargs}
-		loglevel=${loglevel} console=ttyS0,${baudrate} no_console_suspend earlycon=aml_uart,${uart_base}
+		loglevel=${loglevel} console=${console} no_console_suspend earlycon=aml_uart,${uart_base}
 		scramble_reg=${scramble_reg} cma_first_wm_low=on
 		otg_device=${otg_device} disable_ir=${disable_ir} cpufreq.default_governor=${default_governor}
 		logo=${display_layer},loaded,${fb_addr} vout=${outputmode},${vout_init} connector0_type=${connector0_type}
diff --git a/common/cmd_afm.c b/common/cmd_afm.c
index 53e3f63..e9639b2 100644
--- a/common/cmd_afm.c
+++ b/common/cmd_afm.c
@@ -13,6 +13,7 @@
 	{
 		char *serialno = env_get("usid");
 		char *mac = env_get("mac");
+		char *console = env_get("console");
 		char *silent = env_get("silent");
 		char *powermode = env_get("powermode");
 		char *otg_device = env_get("otg_device");
@@ -38,7 +39,7 @@
 			"model_name :     %s\n"
 			"serialno :       %s\n"
 			"mac :            %s\n"
-			"console :        \n"
+			"console :        %s\n"
 			"silent :         %s\n"
 			"powermode :      %s\n"
 			"otg_device :     %s\n"
@@ -46,6 +47,7 @@
 			, strlen(modelt_name) != 0 ? modelt_name : ""
 			, serialno != NULL? serialno : ""
 			, mac != NULL? mac : ""
+			, console != NULL && !strcmp(console, "ttyS0,115200") ? "on" : "off"
 			, silent != NULL? (!strcmp(silent, "0")? "on" : "off") : "on"
 			, powermode != NULL? powermode : ""
 			, otg_device != NULL? otg_device : ""
@@ -130,6 +132,18 @@
 		handle_model_set("model1_name", str_value);
 	} else if (!strcmp(str_cmd, "model2_name")) {
 		handle_model_set("model2_name", str_value);
+	} else if (!strcmp(str_cmd, "console")) {
+		if (!strcmp(str_value, "on")) {
+			run_command("setenv console ttyS0,115200", 0);
+			run_command("setenv loglevel 7", 0);
+		} else if (!strcmp(str_value, "off")) {
+			run_command("setenv console off", 0);
+			run_command("setenv loglevel 0", 0);
+		} else {
+			printf("invalid value\n");
+			return CMD_RET_USAGE;
+		}
+		run_command("saveenv", 0);
 	} else {
 		printf("invalid value\n");
 		return CMD_RET_USAGE;