author | Xindong Xu <xindong.xu@amlogic.com> | 2019-12-20 09:08:35 (GMT) |
---|---|---|
committer | Xindong Xu <xindong.xu@amlogic.com> | 2019-12-20 09:08:35 (GMT) |
commit | 0fdcd19f0b37a1e842bd1d83ae955b41f628acb3 (patch) | |
tree | d1bf6c7cac5893f946d5f9e4b2a135dfab6c3673 | |
parent | c27e92f80ba7af07fbc3f110dafa2346d1110df9 (diff) | |
download | uboot-amlogic-191220.zip uboot-amlogic-191220.tar.gz uboot-amlogic-191220.tar.bz2 |
deadpool: sync to trunk 96213f6c188
Change-Id: I54069a9001698056d5959fcca6d811bd9a9ec124
-rw-r--r-- | board/amlogic/configs/g12a_deadpool_v1.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/board/amlogic/configs/g12a_deadpool_v1.h b/board/amlogic/configs/g12a_deadpool_v1.h index c602671..3a2a923 100644 --- a/board/amlogic/configs/g12a_deadpool_v1.h +++ b/board/amlogic/configs/g12a_deadpool_v1.h @@ -55,6 +55,9 @@ #define CONFIG_CMD_BOOTCTOL_AVB +/* support ext4*/ +#define CONFIG_CMD_EXT4 1 + /* Serial config */ #define CONFIG_CONS_INDEX 2 #define CONFIG_BAUDRATE 115200 @@ -84,7 +87,8 @@ "jtag=disable\0"\ "loadaddr=1080000\0"\ "panel_type=lcd_1\0" \ - "outputmode=1080p60hz\0" \ + "lcd_ctrl=0x00000000\0" \ + "outputmode=1080p60hz\0" \ "hdmimode=1080p60hz\0" \ "colorattribute=444,8bit\0"\ "cvbsmode=576cvbs\0" \ @@ -100,11 +104,13 @@ "fb_width=1920\0" \ "fb_height=1080\0" \ "frac_rate_policy=1\0" \ + "sdr2hdr=2\0" \ "hdmi_read_edid=1\0" \ "hdmichecksum=0x00000000\0" \ "dolby_status=0\0" \ "dolby_vision_on=0\0" \ "usb_burning=update 1000\0" \ + "otg_device=1\0"\ "fdt_high=0x20000000\0"\ "try_auto_burn=update 700 750;\0"\ "sdcburncfg=aml_sdc_burn.ini\0"\ @@ -121,6 +127,7 @@ "active_slot=normal\0"\ "boot_part=boot\0"\ "reboot_mode_android=""normal""\0"\ + "Irq_check_en=0\0"\ "fs_type=""rootfstype=ramfs""\0"\ "aml_dt=g12a_s905y2_deadpool\0"\ "initargs="\ @@ -134,7 +141,7 @@ "\0"\ "storeargs="\ "get_bootloaderversion;" \ - "setenv bootargs ${initargs} ${fs_type} reboot_mode_android=${reboot_mode_android} logo=${display_layer},loaded,${fb_addr} vout=${outputmode},enable panel_type=${panel_type} hdmitx=${cecconfig},${colorattribute} hdmimode=${hdmimode} hdmichecksum=${hdmichecksum} dolby_vision_on=${dolby_vision_on} frac_rate_policy=${frac_rate_policy} hdmi_read_edid=${hdmi_read_edid} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\ + "setenv bootargs ${initargs} hdr_priority=${hdr_priority} otg_device=${otg_device} ${fs_type} reboot_mode_android=${reboot_mode_android} logo=${display_layer},loaded,${fb_addr} fb_width=${fb_width} fb_height=${fb_height} display_bpp=${display_bpp} outputmode=${outputmode} vout=${outputmode},enable panel_type=${panel_type} lcd_ctrl=${lcd_ctrl} hdmitx=${cecconfig},${colorattribute} hdmimode=${hdmimode} hdmichecksum=${hdmichecksum} dolby_vision_on=${dolby_vision_on} frac_rate_policy=${frac_rate_policy} hdmi_read_edid=${hdmi_read_edid} cvbsmode=${cvbsmode} osd_reverse=${osd_reverse} video_reverse=${video_reverse} irq_check_en=${Irq_check_en} androidboot.selinux=${EnableSelinux} androidboot.firstboot=${firstboot} jtag=${jtag}; "\ "setenv bootargs ${bootargs} androidboot.hardware=amlogic androidboot.bootloader=${bootloader_version} androidboot.build.expect.baseband=N/A;"\ "run cmdline_keys;"\ "\0"\ @@ -242,11 +249,16 @@ "get_valid_slot;"\ "echo active_slot: ${active_slot};"\ "if test ${active_slot} = normal; then "\ - "setenv bootargs ${bootargs} aml_dt=${aml_dt} recovery_part={recovery_part} recovery_offset={recovery_offset};"\ + "setenv bootargs ${bootargs} ${fs_type} aml_dt=${aml_dt} recovery_part=${recovery_part} recovery_offset=${recovery_offset};"\ "if imgread kernel ${recovery_part} ${loadaddr} ${recovery_offset}; then wipeisb; bootm ${loadaddr}; fi;"\ "else "\ - "setenv bootargs ${bootargs} aml_dt=${aml_dt} recovery_part=${boot_part} recovery_offset=${recovery_offset};"\ - "if imgread kernel ${boot_part} ${loadaddr}; then bootm ${loadaddr}; fi;"\ + "if test ${partiton_mode} = normal; then "\ + "setenv bootargs ${bootargs} ${fs_type} aml_dt=${aml_dt} recovery_part=${boot_part} recovery_offset=${recovery_offset};"\ + "if imgread kernel ${boot_part} ${loadaddr}; then bootm ${loadaddr}; fi;"\ + "else "\ + "setenv bootargs ${bootargs} ${fs_type} aml_dt=${aml_dt} recovery_part=${recovery_part} recovery_offset=${recovery_offset};"\ + "if imgread kernel ${recovery_part} ${loadaddr} ${recovery_offset}; then wipeisb; bootm ${loadaddr}; fi;"\ + "fi;"\ "fi;"\ "\0"\ "init_display="\ @@ -265,7 +277,7 @@ "else "\ "setenv reboot_mode_android ""normal"";"\ "run storeargs;"\ - "hdmitx hpd;hdmitx get_preferred_mode;hdmitx get_parse_edid;dovi process;osd open;osd clear;imgread pic logo bootup $loadaddr;bmp display $bootup_offset;bmp scale;vout output ${outputmode};dovi set;dovi pkg;"\ + "hdmitx hpd;hdmitx get_preferred_mode;hdmitx get_parse_edid;dovi process;osd open;osd clear;imgread pic logo bootup $loadaddr;bmp display $bootup_offset;bmp scale;vout output ${outputmode};dovi set;dovi pkg;vpp hdrpkt;"\ "fi;fi;"\ "\0"\ "cmdline_keys="\ @@ -285,6 +297,8 @@ "fi;"\ "if keyman read oemkey ${loadaddr} str; then "\ "setenv bootargs ${bootargs} androidboot.oem.key1=${oemkey};"\ + "else "\ + "setenv bootargs ${bootargs} androidboot.oem.key1=ATV00104319;"\ "fi;"\ "fi;"\ "\0"\ |