Newer
Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
--- ../../u-boot-2012.04/include/configs/galaxys2.h 2020-03-07 10:47:21.546618135 +0000
+++ include/configs/galaxys2.h 2019-12-17 19:53:50.301924846 +0000
@@ -134,6 +134,7 @@
"setenv stderr ${con}\0" \
"sercon=setenv con serial; run setcon\0" \
"usbcon=setenv con usbtty; run setcon\0" \
+ "setenv usbtty cdc_ac\0" \
"vgacon=setenv con vga; run setcon\0" \
"kernel_name=/boot/boot.img\0"\
"kernel_name_safe=/boot/boot_safe.img\0"\
@@ -152,12 +153,12 @@
\
"boot_sdcard=" \
"setenv loadaddr 0x4EE08000; " \
- "mmc dev 1" \
+ "mmc dev 0" \
"mmc rescan; " \
- "if fatload mmc 1:0x1 " \
+ "if fatload mmc 0:0x0 " \
"${loadaddr} ${script_img}; then " \
"source ${loadaddr}; " \
- "elif ext4load mmc 1:0x1 " \
+ "elif ext4load mmc 0:0x0 " \
"${loadaddr} ${script_img}; then " \
"source ${loadaddr}; " \
"fi\0" \
@@ -226,16 +227,19 @@
"run mmc_boot_safe\0" \
\
"boot_android=" \
- "setenv android_cmd loglevel=4 console=ram sec_debug.enable=0 " \
+ /* "setenv android_cmd loglevel=4 console=ram sec_debug.enable=0 " \ */ \
+ /* "setenv android_cmd loglevel=4 console=ttyS0,115200n8 console=tty0 sec_debug.enable=0 " \
"sec_debug.enable_user=0 sec_log=0x100000@0x4d900000 " \
"s3cfb.bootloaderfb=0x5ec00000 ld9040.get_lcdtype=0x2 " \
- "consoleblank=0 lpj=3981312 vmalloc=144m ;" \
+ "consoleblank=0 lpj=3981312 vmalloc=144m " \
+ "root=/dev/mmcblk0p1 rw rootfstype=ext4 rootwait init=/sbin/init ;" \ */ \
"if test $sgs2_bootmode_val -eq 1; then "\
- "setenv android_cmd ${android_cmd} bootmode=2 root=/dev/mmcblk1p1 rw rootfstype=ext4 rootwait init=/sbin/init; " \
+ "setenv android_cmd ${android_cmd} bootmode=2; " \
"fi ;" \
"mmc dev 0; " \
"mmc read ${loadaddr} 0x16000 0x4000; " \
- "setenv bootargs ${android_cmd}; "\
+ /* "setenv bootargs ${android_cmd}; "\ */ \
+ "setenv bootargs console=tty0 consoleblank=0 root=/dev/mmcblk1p1 rw rootfstype=ext4 rootwait init=/sbin/init ; " \
"echo Command Line: ${bootargs}; " \
"bootm ${loadaddr}\0" \
\
@@ -258,7 +262,8 @@
"galaxy_boot=" \
/*"setenv verify n; "*/ \
"setenv loadaddr 0x4EE08000; " \
- "setenv dev_extras console=tty0 --no-log lpj=3981312; " \
+ /*"setenv dev_extras console=tty0 --no-log lpj=3981312; "*/ \
+ "setenv dev_extras console=tty0 lpj=3981312; " \
"mmc rescan; " \
"echo Regular boot; " \
"run boot_android;\0 " \