summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/amlogic/configs/tl1_skt_v1.h25
-rw-r--r--board/amlogic/configs/tl1_t309_v1.h25
-rw-r--r--board/amlogic/configs/tl1_x301_v1.h25
-rw-r--r--common/bootm.c2
4 files changed, 31 insertions, 46 deletions
diff --git a/board/amlogic/configs/tl1_skt_v1.h b/board/amlogic/configs/tl1_skt_v1.h
index 42d94e52cb..0581614b88 100644
--- a/board/amlogic/configs/tl1_skt_v1.h
+++ b/board/amlogic/configs/tl1_skt_v1.h
@@ -113,8 +113,9 @@
"video_reverse=0\0"\
"active_slot=_a\0"\
"boot_part=boot\0"\
+ "fs_type=""rootfstype=ramfs""\0"\
"initargs="\
- "ro rootwait skip_initramfs init=/init console=ttyS0,115200 no_console_suspend earlycon=aml-uart,0xff803000 printk.devkmsg=on ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\
+ "init=/init console=ttyS0,115200 no_console_suspend earlycon=aml-uart,0xff803000 printk.devkmsg=on ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\
"\0"\
"upgrade_check="\
"echo upgrade_step=${upgrade_step}; "\
@@ -123,22 +124,9 @@
"else fi;"\
"\0"\
"storeargs="\
- "setenv bootargs ${initargs} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmimode=${hdmimode} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\
+ "setenv bootargs ${initargs} ${fs_type} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmimode=${hdmimode} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\
"setenv bootargs ${bootargs} androidboot.hardware=amlogic;"\
"run cmdline_keys;"\
- "get_system_as_root_mode;"\
- "echo system_mode: ${system_mode};"\
- "if test ${system_mode} != 1; then "\
- "setenv bootargs ${bootargs} rootfstype=ramfs;"\
- "fi;"\
- "if test ${system_mode} = 1; then "\
- "get_rebootmode;"\
- "if test ${reboot_mode} = factory_reset; then "\
- "setenv bootargs ${bootargs} rootfstype=ramfs;"\
- "else "\
- "setenv bootargs ${bootargs} ro rootwait skip_initramfs;"\
- "fi;"\
- "fi;"\
"\0"\
"switch_bootmode="\
"get_rebootmode;"\
@@ -153,6 +141,12 @@
"fi;fi;fi;fi;"\
"\0" \
"storeboot="\
+ "get_system_as_root_mode;"\
+ "echo system_mode: ${system_mode};"\
+ "if test ${system_mode} = 1; then "\
+ "setenv fs_type ""ro rootwait skip_initramfs"";"\
+ "run storeargs;"\
+ "fi;"\
"if imgread kernel ${boot_part} ${loadaddr}; then bootm ${loadaddr}; fi;"\
"run update;"\
"\0"\
@@ -253,6 +247,7 @@
"run upgrade_check;"\
"run init_display;"\
"run storeargs;"\
+ "bcb uboot-command;"\
"run switch_bootmode;"
diff --git a/board/amlogic/configs/tl1_t309_v1.h b/board/amlogic/configs/tl1_t309_v1.h
index 563e8b5e73..4b1d980416 100644
--- a/board/amlogic/configs/tl1_t309_v1.h
+++ b/board/amlogic/configs/tl1_t309_v1.h
@@ -114,8 +114,9 @@
"video_reverse=0\0"\
"active_slot=_a\0"\
"boot_part=boot\0"\
+ "fs_type=""rootfstype=ramfs""\0"\
"initargs="\
- "ro rootwait skip_initramfs init=/init console=ttyS0,115200 no_console_suspend earlycon=aml-uart,0xff803000 printk.devkmsg=on ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\
+ "init=/init console=ttyS0,115200 no_console_suspend earlycon=aml-uart,0xff803000 printk.devkmsg=on ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\
"\0"\
"upgrade_check="\
"echo upgrade_step=${upgrade_step}; "\
@@ -124,22 +125,9 @@
"else fi;"\
"\0"\
"storeargs="\
- "setenv bootargs ${initargs} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmimode=${hdmimode} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\
+ "setenv bootargs ${initargs} ${fs_type} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmimode=${hdmimode} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\
"setenv bootargs ${bootargs} androidboot.hardware=amlogic;"\
"run cmdline_keys;"\
- "get_system_as_root_mode;"\
- "echo system_mode: ${system_mode};"\
- "if test ${system_mode} != 1; then "\
- "setenv bootargs ${bootargs} rootfstype=ramfs;"\
- "fi;"\
- "if test ${system_mode} = 1; then "\
- "get_rebootmode;"\
- "if test ${reboot_mode} = factory_reset; then "\
- "setenv bootargs ${bootargs} rootfstype=ramfs;"\
- "else "\
- "setenv bootargs ${bootargs} ro rootwait skip_initramfs;"\
- "fi;"\
- "fi;"\
"\0"\
"switch_bootmode="\
"get_rebootmode;"\
@@ -154,6 +142,12 @@
"fi;fi;fi;fi;"\
"\0" \
"storeboot="\
+ "get_system_as_root_mode;"\
+ "echo system_mode: ${system_mode};"\
+ "if test ${system_mode} = 1; then "\
+ "setenv fs_type ""ro rootwait skip_initramfs"";"\
+ "run storeargs;"\
+ "fi;"\
"if imgread kernel ${boot_part} ${loadaddr}; then bootm ${loadaddr}; fi;"\
"run update;"\
"\0"\
@@ -254,6 +248,7 @@
"run upgrade_check;"\
"run init_display;"\
"run storeargs;"\
+ "bcb uboot-command;"\
"run switch_bootmode;"
diff --git a/board/amlogic/configs/tl1_x301_v1.h b/board/amlogic/configs/tl1_x301_v1.h
index 7f6f966819..845cca85e8 100644
--- a/board/amlogic/configs/tl1_x301_v1.h
+++ b/board/amlogic/configs/tl1_x301_v1.h
@@ -114,8 +114,9 @@
"video_reverse=0\0"\
"active_slot=_a\0"\
"boot_part=boot\0"\
+ "fs_type=""rootfstype=ramfs""\0"\
"initargs="\
- "ro rootwait skip_initramfs init=/init console=ttyS0,115200 no_console_suspend earlycon=aml-uart,0xff803000 printk.devkmsg=on ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\
+ "init=/init console=ttyS0,115200 no_console_suspend earlycon=aml-uart,0xff803000 printk.devkmsg=on ramoops.pstore_en=1 ramoops.record_size=0x8000 ramoops.console_size=0x4000 "\
"\0"\
"upgrade_check="\
"echo upgrade_step=${upgrade_step}; "\
@@ -124,22 +125,9 @@
"else fi;"\
"\0"\
"storeargs="\
- "setenv bootargs ${initargs} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmimode=${hdmimode} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\
+ "setenv bootargs ${initargs} ${fs_type} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmimode=${hdmimode} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\
"setenv bootargs ${bootargs} androidboot.hardware=amlogic;"\
"run cmdline_keys;"\
- "get_system_as_root_mode;"\
- "echo system_mode: ${system_mode};"\
- "if test ${system_mode} != 1; then "\
- "setenv bootargs ${bootargs} rootfstype=ramfs;"\
- "fi;"\
- "if test ${system_mode} = 1; then "\
- "get_rebootmode;"\
- "if test ${reboot_mode} = factory_reset; then "\
- "setenv bootargs ${bootargs} rootfstype=ramfs;"\
- "else "\
- "setenv bootargs ${bootargs} ro rootwait skip_initramfs;"\
- "fi;"\
- "fi;"\
"\0"\
"switch_bootmode="\
"get_rebootmode;"\
@@ -154,6 +142,12 @@
"fi;fi;fi;fi;"\
"\0" \
"storeboot="\
+ "get_system_as_root_mode;"\
+ "echo system_mode: ${system_mode};"\
+ "if test ${system_mode} = 1; then "\
+ "setenv fs_type ""ro rootwait skip_initramfs"";"\
+ "run storeargs;"\
+ "fi;"\
"if imgread kernel ${boot_part} ${loadaddr}; then bootm ${loadaddr}; fi;"\
"run update;"\
"\0"\
@@ -254,6 +248,7 @@
"run upgrade_check;"\
"run init_display;"\
"run storeargs;"\
+ "bcb uboot-command;"\
"run switch_bootmode;"
diff --git a/common/bootm.c b/common/bootm.c
index 65999987ff..486ec9f466 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -264,7 +264,7 @@ static int read_fdto_partition(void)
char dtbo_partition[32];
char *s1;
- run_command("get_valid_slot;", 0);
+ //run_command("get_valid_slot;", 0);
s1 = getenv("active_slot");
printf("active_slot is %s\n", s1);
if (strcmp(s1, "normal") == 0) {
View Lorry Controller Status