From 4de6b9bb7717b8d5f5a4e1a8edfa36736001bb06 Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 2 Feb 2018 21:28:34 +0100 Subject: [PATCH 1/5] Revert "projects/Amlogic: LePotato: lower DDR clock to 792MHz" This reverts commit 478b7d0e7a4d39e04dc016ae44b6c4bc4987d007. --- projects/Amlogic/devices/LePotato/packages/u-boot/package.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/Amlogic/devices/LePotato/packages/u-boot/package.mk b/projects/Amlogic/devices/LePotato/packages/u-boot/package.mk index 184c022647..54e3a7331f 100644 --- a/projects/Amlogic/devices/LePotato/packages/u-boot/package.mk +++ b/projects/Amlogic/devices/LePotato/packages/u-boot/package.mk @@ -33,10 +33,6 @@ PKG_IS_KERNEL_PKG="yes" PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" [ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader" -post_unpack() { - sed -i 's/^#define CONFIG_DDR_CLK.*912/#define CONFIG_DDR_CLK 792/g' $PKG_BUILD/board/amlogic/configs/libretech_cc.h -} - make_target() { export PATH=$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/:$TOOLCHAIN/lib/gcc-linaro-arm-eabi/bin/:$PATH CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make mrproper From 9d30630dbd6254f05abbe8e4f1d2cc9f573bf95c Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 2 Feb 2018 21:56:27 +0100 Subject: [PATCH 2/5] projects/Amlogic: enable serial console by default for Odroid-C2 and LePotato Also fix an entry in config.ini with serial console template. Previous entry worked but didn't provide LE serial console as service requires "console=ttyS0,115200" without "n8" --- projects/Amlogic/devices/LePotato/bootloader/boot.ini | 2 +- projects/Amlogic/devices/LePotato/bootloader/config.ini | 2 +- projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini | 2 +- projects/Amlogic/devices/Odroid_C2/bootloader/config.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/Amlogic/devices/LePotato/bootloader/boot.ini b/projects/Amlogic/devices/LePotato/bootloader/boot.ini index b252c86ca7..f732af637d 100644 --- a/projects/Amlogic/devices/LePotato/bootloader/boot.ini +++ b/projects/Amlogic/devices/LePotato/bootloader/boot.ini @@ -9,7 +9,7 @@ LIBRETECH-UBOOT-CONFIG setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE" -setenv condev "tty0" +setenv condev "ttyS0,115200" setenv hdmimode "1080p60hz" setenv hdmioutput "1" setenv vpu "1" diff --git a/projects/Amlogic/devices/LePotato/bootloader/config.ini b/projects/Amlogic/devices/LePotato/bootloader/config.ini index 1dfa45d044..23e743828b 100644 --- a/projects/Amlogic/devices/LePotato/bootloader/config.ini +++ b/projects/Amlogic/devices/LePotato/bootloader/config.ini @@ -8,7 +8,7 @@ # # Console Setup # on serial port: -# condev="ttyS0,115200n8" +# condev="ttyS0,115200" # #------------------------------------------------------------------------------------------------------ diff --git a/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini b/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini index c0c8fdfab8..95db1970b1 100644 --- a/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini +++ b/projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini @@ -9,7 +9,7 @@ ODROIDC2-UBOOT-CONFIG setenv bootrootfs "BOOT_IMAGE=KERNEL boot=LABEL=LIBREELEC disk=LABEL=STORAGE" -setenv condev "tty0" +setenv condev "ttyS0,115200" setenv hdmimode "1080p60hz" setenv hdmioutput "1" setenv vpu "1" diff --git a/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini b/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini index 4c29bb833d..6c205f1b76 100644 --- a/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini +++ b/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini @@ -8,7 +8,7 @@ # # Console Setup # on serial port: -# condev="ttyS0,115200n8" +# condev="ttyS0,115200" # #------------------------------------------------------------------------------------------------------ From 9e84c656ea2201be2727eea18a1727b9ab838384 Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 2 Feb 2018 23:42:08 +0100 Subject: [PATCH 3/5] projects/Amlogic: LePotato: faster booting by not trying to parse env/dtb on boot env and dtb are not present on SD card, if we don't parse them we save time. --- .../patches/u-boot-0004-faster-boot.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/projects/Amlogic/devices/LePotato/packages/u-boot/patches/u-boot-0004-faster-boot.patch b/projects/Amlogic/devices/LePotato/packages/u-boot/patches/u-boot-0004-faster-boot.patch index 819081f8fb..8b2426b39c 100644 --- a/projects/Amlogic/devices/LePotato/packages/u-boot/patches/u-boot-0004-faster-boot.patch +++ b/projects/Amlogic/devices/LePotato/packages/u-boot/patches/u-boot-0004-faster-boot.patch @@ -60,3 +60,38 @@ index b3ccfae..6052a87 100644 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #define CONFIG_FASTBOOT_FLASH 1 #define CONFIG_USB_GADGET 1 +diff --git a/board/amlogic/libretech_cc/libretech_cc.c b/board/amlogic/libretech_cc/libretech_cc.c +index 33bd007..b1748d9 100644 +--- a/board/amlogic/libretech_cc/libretech_cc.c ++++ b/board/amlogic/libretech_cc/libretech_cc.c +@@ -417,13 +417,6 @@ U_BOOT_CMD(hdmi_init, CONFIG_SYS_MAXARGS, 0, do_hdmi_init, + #endif + #ifdef CONFIG_BOARD_LATE_INIT + int board_late_init(void){ +- //update env before anyone using it +- run_command("get_rebootmode; echo reboot_mode=${reboot_mode}; "\ +- "if test ${reboot_mode} = factory_reset; then "\ +- "defenv_reserv aml_dt;setenv upgrade_step 2;save; fi;", 0); +- run_command("if itest ${upgrade_step} == 1; then "\ +- "defenv_reserv; setenv upgrade_step 2; saveenv; fi;", 0); +- + #ifndef CONFIG_AML_IRDETECT_EARLY + /* after */ + run_command("cvbs init;hdmitx hpd", 0); +@@ -448,16 +441,10 @@ int board_late_init(void){ + #elif defined(CONFIG_DTB_MEM_ADDR) + { + char cmd[128]; +- int ret; + if (!getenv("dtb_mem_addr")) { + sprintf(cmd, "setenv dtb_mem_addr 0x%x", CONFIG_DTB_MEM_ADDR); + run_command(cmd, 0); + } +- sprintf(cmd, "imgread dtb boot ${dtb_mem_addr}"); +- ret = run_command(cmd, 0); +- if (ret) { +- printf("%s(): cmd[%s] fail, ret=%d\n", __func__, cmd, ret); +- } + } + #endif// #ifndef DTB_BIND_KERNEL + #ifdef CONFIG_AML_V2_FACTORY_BURN From 7c74563cd00a0f5dced247f878bcd5d56028c13a Mon Sep 17 00:00:00 2001 From: kszaq Date: Sun, 4 Feb 2018 12:28:15 +0100 Subject: [PATCH 4/5] projects/Amlogic: clean up CMDLINE Don't force noswap, don't force ssh. --- projects/Amlogic/linux/linux.aarch64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index c1d0b97574..2800b1e49e 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -365,7 +365,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 # # Boot options # -CONFIG_CMDLINE="console=tty0 systemd.show_status=auto noswap ssh" +CONFIG_CMDLINE="console=tty0 systemd.show_status=auto" # CONFIG_CMDLINE_FROM_BOOTLOADER is not set CONFIG_CMDLINE_EXTEND=y # CONFIG_CMDLINE_FORCE is not set From aad9640bd3bb5f084fa67fea59ab6b3b76885e46 Mon Sep 17 00:00:00 2001 From: kszaq Date: Sun, 4 Feb 2018 12:37:50 +0100 Subject: [PATCH 5/5] projects/Amlogic: change double quotes to single quotes in config.ini Env variables in config.ini should be enclosed in single quotes, else we will have the double quotes in cmdline. --- .../devices/LePotato/bootloader/config.ini | 70 ++++++------- .../devices/Odroid_C2/bootloader/config.ini | 98 +++++++++---------- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/projects/Amlogic/devices/LePotato/bootloader/config.ini b/projects/Amlogic/devices/LePotato/bootloader/config.ini index 23e743828b..a1858eabec 100644 --- a/projects/Amlogic/devices/LePotato/bootloader/config.ini +++ b/projects/Amlogic/devices/LePotato/bootloader/config.ini @@ -8,7 +8,7 @@ # # Console Setup # on serial port: -# condev="ttyS0,115200" +# condev='ttyS0,115200' # #------------------------------------------------------------------------------------------------------ @@ -16,37 +16,37 @@ # # Video # Setup the video output -# hdmimode="480i60hz" -# hdmimode="480i_rpt" -# hdmimode="480p60hz" -# hdmimode="480p_rpt" -# hdmimode="576i50hz" -# hdmimode="576i_rpt" -# hdmimode="576p50hz" -# hdmimode="576p_rpt" -# hdmimode="720p60hz" -# hdmimode="720p50hz" -# hdmimode="1080i60hz" -# hdmimode="1080p60hz" -# hdmimode="1080i50hz" -# hdmimode="1080p50hz" -# hdmimode="1080p30hz" -# hdmimode="1080p25hz" -# hdmimode="1080p24hz" -# hdmimode="2160p60hz" -# hdmimode="2160p50hz" -# hdmimode="2160p30hz" -# hdmimode="2160p25hz" -# hdmimode="2160p24hz" -# hdmimode="2160p60hz420" -# hdmimode="2160p50hz420" -# hdmimode="smpte60hz" -# hdmimode="smpte50hz" -# hdmimode="smpte30hz" -# hdmimode="smpte25hz" -# hdmimode="smpte24hz" -# hdmimode="smpte60hz420" -# hdmimode="smpte50hz420" +# hdmimode='480i60hz' +# hdmimode='480i_rpt' +# hdmimode='480p60hz' +# hdmimode='480p_rpt' +# hdmimode='576i50hz' +# hdmimode='576i_rpt' +# hdmimode='576p50hz' +# hdmimode='576p_rpt' +# hdmimode='720p60hz' +# hdmimode='720p50hz' +# hdmimode='1080i60hz' +# hdmimode='1080p60hz' +# hdmimode='1080i50hz' +# hdmimode='1080p50hz' +# hdmimode='1080p30hz' +# hdmimode='1080p25hz' +# hdmimode='1080p24hz' +# hdmimode='2160p60hz' +# hdmimode='2160p50hz' +# hdmimode='2160p30hz' +# hdmimode='2160p25hz' +# hdmimode='2160p24hz' +# hdmimode='2160p60hz420' +# hdmimode='2160p50hz420' +# hdmimode='smpte60hz' +# hdmimode='smpte50hz' +# hdmimode='smpte30hz' +# hdmimode='smpte25hz' +# hdmimode='smpte24hz' +# hdmimode='smpte60hz420' +# hdmimode='smpte50hz420' # #------------------------------------------------------------------------------------------------------ @@ -57,14 +57,14 @@ # Setup the LibreELEC options # valid values are: textmode debugging progress nofsck nosplash noram overlay quiet ssh # -# libreelec="quiet" +# libreelec='quiet' # #------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------ # # Enable|Disable HDMI CEC Control -# hdmi_cec="0" -# hdmi_cec="1" +# hdmi_cec='0' +# hdmi_cec='1' # #------------------------------------------------------------------------------------------------------ diff --git a/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini b/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini index 6c205f1b76..e5efbc8b37 100644 --- a/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini +++ b/projects/Amlogic/devices/Odroid_C2/bootloader/config.ini @@ -8,7 +8,7 @@ # # Console Setup # on serial port: -# condev="ttyS0,115200" +# condev='ttyS0,115200' # #------------------------------------------------------------------------------------------------------ @@ -16,37 +16,37 @@ # # Video # Setup the video output -# hdmimode="480i60hz" -# hdmimode="480i_rpt" -# hdmimode="480p60hz" -# hdmimode="480p_rpt" -# hdmimode="576i50hz" -# hdmimode="576i_rpt" -# hdmimode="576p50hz" -# hdmimode="576p_rpt" -# hdmimode="720p60hz" -# hdmimode="720p50hz" -# hdmimode="1080i60hz" -# hdmimode="1080p60hz" -# hdmimode="1080i50hz" -# hdmimode="1080p50hz" -# hdmimode="1080p30hz" -# hdmimode="1080p25hz" -# hdmimode="1080p24hz" -# hdmimode="2160p60hz" -# hdmimode="2160p50hz" -# hdmimode="2160p30hz" -# hdmimode="2160p25hz" -# hdmimode="2160p24hz" -# hdmimode="2160p60hz420" -# hdmimode="2160p50hz420" -# hdmimode="smpte60hz" -# hdmimode="smpte50hz" -# hdmimode="smpte30hz" -# hdmimode="smpte25hz" -# hdmimode="smpte24hz" -# hdmimode="smpte60hz420" -# hdmimode="smpte50hz420" +# hdmimode='480i60hz' +# hdmimode='480i_rpt' +# hdmimode='480p60hz' +# hdmimode='480p_rpt' +# hdmimode='576i50hz' +# hdmimode='576i_rpt' +# hdmimode='576p50hz' +# hdmimode='576p_rpt' +# hdmimode='720p60hz' +# hdmimode='720p50hz' +# hdmimode='1080i60hz' +# hdmimode='1080p60hz' +# hdmimode='1080i50hz' +# hdmimode='1080p50hz' +# hdmimode='1080p30hz' +# hdmimode='1080p25hz' +# hdmimode='1080p24hz' +# hdmimode='2160p60hz' +# hdmimode='2160p50hz' +# hdmimode='2160p30hz' +# hdmimode='2160p25hz' +# hdmimode='2160p24hz' +# hdmimode='2160p60hz420' +# hdmimode='2160p50hz420' +# hdmimode='smpte60hz' +# hdmimode='smpte50hz' +# hdmimode='smpte30hz' +# hdmimode='smpte25hz' +# hdmimode='smpte24hz' +# hdmimode='smpte60hz420' +# hdmimode='smpte50hz420' # #------------------------------------------------------------------------------------------------------ @@ -57,23 +57,23 @@ # Setup the LibreELEC options # valid values are: textmode debugging progress nofsck nosplash noram overlay quiet ssh # -# libreelec="quiet" +# libreelec='quiet' # #------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------ # # Enable|Disable HDMI CEC Control -# hdmi_cec="0" -# hdmi_cec="1" +# hdmi_cec='0' +# hdmi_cec='1' # #------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------ # # Enable|Disable RTC Shield -# rtc_shield="0" -# rtc_shield="1" +# rtc_shield='0' +# rtc_shield='1' # #------------------------------------------------------------------------------------------------------ @@ -86,27 +86,27 @@ # http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq # # MAX CPU's -# maxcpus="1" -# maxcpus="2" -# maxcpus="3" -# maxcpus="4" +# maxcpus='1' +# maxcpus='2' +# maxcpus='3' +# maxcpus='4' # # MAX Frequency # 2.016GHz -# max_freq="2016" +# max_freq='2016' # 1.944GHz -# max_freq="1944" +# max_freq='1944' # 1.920GHz -# max_freq="1920" +# max_freq='1920' # 1.896GHz -# max_freq="1896 +# max_freq='1896 # 1.752GHz -# max_freq="1752" +# max_freq='1752' # 1.680GHz -# max_freq="1680" +# max_freq='1680' # 1.656GHz -# max_freq="1656" +# max_freq='1656' # 1.536GHz -# max_freq="1536" +# max_freq='1536' # #------------------------------------------------------------------------------------------------------