jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2479 from kszaq/le90_aml_cleanup_2

Browse Source 
projects/Amlogic: 2nd series of cleanups
This commit is contained in:
Radostan Riedel 2018-02-06 15:04:43 +01:00 committed by GitHub
commit 89426f1d71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 122 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/Amlogic/devices/LePotato/bootloader/boot.ini
View File

@ -9,7 +9,7 @@
LIBRETECH-UBOOT-CONFIG LIBRETECH-UBOOT-CONFIG
setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE" setenv bootrootfs "BOOT_IMAGE=kernel.img boot=LABEL=LIBREELEC disk=LABEL=STORAGE"
setenv condev "tty0" setenv condev "ttyS0,115200"
setenv hdmimode "1080p60hz" setenv hdmimode "1080p60hz"
setenv hdmioutput "1" setenv hdmioutput "1"
setenv vpu "1" setenv vpu "1"

70
projects/Amlogic/devices/LePotato/bootloader/config.ini
View File

@ -8,7 +8,7 @@
# #
# Console Setup # Console Setup
# on serial port: # on serial port:
# condev="ttyS0,115200n8" # condev='ttyS0,115200'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
@ -16,37 +16,37 @@
# #
# Video # Video
# Setup the video output # Setup the video output
# hdmimode="480i60hz" # hdmimode='480i60hz'
# hdmimode="480i_rpt" # hdmimode='480i_rpt'
# hdmimode="480p60hz" # hdmimode='480p60hz'
# hdmimode="480p_rpt" # hdmimode='480p_rpt'
# hdmimode="576i50hz" # hdmimode='576i50hz'
# hdmimode="576i_rpt" # hdmimode='576i_rpt'
# hdmimode="576p50hz" # hdmimode='576p50hz'
# hdmimode="576p_rpt" # hdmimode='576p_rpt'
# hdmimode="720p60hz" # hdmimode='720p60hz'
# hdmimode="720p50hz" # hdmimode='720p50hz'
# hdmimode="1080i60hz" # hdmimode='1080i60hz'
# hdmimode="1080p60hz" # hdmimode='1080p60hz'
# hdmimode="1080i50hz" # hdmimode='1080i50hz'
# hdmimode="1080p50hz" # hdmimode='1080p50hz'
# hdmimode="1080p30hz" # hdmimode='1080p30hz'
# hdmimode="1080p25hz" # hdmimode='1080p25hz'
# hdmimode="1080p24hz" # hdmimode='1080p24hz'
# hdmimode="2160p60hz" # hdmimode='2160p60hz'
# hdmimode="2160p50hz" # hdmimode='2160p50hz'
# hdmimode="2160p30hz" # hdmimode='2160p30hz'
# hdmimode="2160p25hz" # hdmimode='2160p25hz'
# hdmimode="2160p24hz" # hdmimode='2160p24hz'
# hdmimode="2160p60hz420" # hdmimode='2160p60hz420'
# hdmimode="2160p50hz420" # hdmimode='2160p50hz420'
# hdmimode="smpte60hz" # hdmimode='smpte60hz'
# hdmimode="smpte50hz" # hdmimode='smpte50hz'
# hdmimode="smpte30hz" # hdmimode='smpte30hz'
# hdmimode="smpte25hz" # hdmimode='smpte25hz'
# hdmimode="smpte24hz" # hdmimode='smpte24hz'
# hdmimode="smpte60hz420" # hdmimode='smpte60hz420'
# hdmimode="smpte50hz420" # hdmimode='smpte50hz420'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
@ -57,14 +57,14 @@
# Setup the LibreELEC options # Setup the LibreELEC options
# valid values are: textmode debugging progress nofsck nosplash noram overlay quiet ssh # valid values are: textmode debugging progress nofsck nosplash noram overlay quiet ssh
# #
# libreelec="quiet" # libreelec='quiet'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
# #
# Enable|Disable HDMI CEC Control # Enable|Disable HDMI CEC Control
# hdmi_cec="0" # hdmi_cec='0'
# hdmi_cec="1" # hdmi_cec='1'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------

4
projects/Amlogic/devices/LePotato/packages/u-boot/package.mk
View File

@ -33,10 +33,6 @@ PKG_IS_KERNEL_PKG="yes"
PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
[ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/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() { make_target() {
export PATH=$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/:$TOOLCHAIN/lib/gcc-linaro-arm-eabi/bin/:$PATH 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 CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make mrproper

35
projects/Amlogic/devices/LePotato/packages/u-boot/patches/u-boot-0004-faster-boot.patch
View File

@ -60,3 +60,38 @@ index b3ccfae..6052a87 100644
#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 #define CONFIG_FASTBOOT_FLASH_MMC_DEV 1
#define CONFIG_FASTBOOT_FLASH 1 #define CONFIG_FASTBOOT_FLASH 1
#define CONFIG_USB_GADGET 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

2
projects/Amlogic/devices/Odroid_C2/bootloader/boot.ini
View File

@ -9,7 +9,7 @@
ODROIDC2-UBOOT-CONFIG ODROIDC2-UBOOT-CONFIG
setenv bootrootfs "BOOT_IMAGE=KERNEL boot=LABEL=LIBREELEC disk=LABEL=STORAGE" setenv bootrootfs "BOOT_IMAGE=KERNEL boot=LABEL=LIBREELEC disk=LABEL=STORAGE"
setenv condev "tty0" setenv condev "ttyS0,115200"
setenv hdmimode "1080p60hz" setenv hdmimode "1080p60hz"
setenv hdmioutput "1" setenv hdmioutput "1"
setenv vpu "1" setenv vpu "1"

98
projects/Amlogic/devices/Odroid_C2/bootloader/config.ini
View File

@ -8,7 +8,7 @@
# #
# Console Setup # Console Setup
# on serial port: # on serial port:
# condev="ttyS0,115200n8" # condev='ttyS0,115200'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
@ -16,37 +16,37 @@
# #
# Video # Video
# Setup the video output # Setup the video output
# hdmimode="480i60hz" # hdmimode='480i60hz'
# hdmimode="480i_rpt" # hdmimode='480i_rpt'
# hdmimode="480p60hz" # hdmimode='480p60hz'
# hdmimode="480p_rpt" # hdmimode='480p_rpt'
# hdmimode="576i50hz" # hdmimode='576i50hz'
# hdmimode="576i_rpt" # hdmimode='576i_rpt'
# hdmimode="576p50hz" # hdmimode='576p50hz'
# hdmimode="576p_rpt" # hdmimode='576p_rpt'
# hdmimode="720p60hz" # hdmimode='720p60hz'
# hdmimode="720p50hz" # hdmimode='720p50hz'
# hdmimode="1080i60hz" # hdmimode='1080i60hz'
# hdmimode="1080p60hz" # hdmimode='1080p60hz'
# hdmimode="1080i50hz" # hdmimode='1080i50hz'
# hdmimode="1080p50hz" # hdmimode='1080p50hz'
# hdmimode="1080p30hz" # hdmimode='1080p30hz'
# hdmimode="1080p25hz" # hdmimode='1080p25hz'
# hdmimode="1080p24hz" # hdmimode='1080p24hz'
# hdmimode="2160p60hz" # hdmimode='2160p60hz'
# hdmimode="2160p50hz" # hdmimode='2160p50hz'
# hdmimode="2160p30hz" # hdmimode='2160p30hz'
# hdmimode="2160p25hz" # hdmimode='2160p25hz'
# hdmimode="2160p24hz" # hdmimode='2160p24hz'
# hdmimode="2160p60hz420" # hdmimode='2160p60hz420'
# hdmimode="2160p50hz420" # hdmimode='2160p50hz420'
# hdmimode="smpte60hz" # hdmimode='smpte60hz'
# hdmimode="smpte50hz" # hdmimode='smpte50hz'
# hdmimode="smpte30hz" # hdmimode='smpte30hz'
# hdmimode="smpte25hz" # hdmimode='smpte25hz'
# hdmimode="smpte24hz" # hdmimode='smpte24hz'
# hdmimode="smpte60hz420" # hdmimode='smpte60hz420'
# hdmimode="smpte50hz420" # hdmimode='smpte50hz420'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
@ -57,23 +57,23 @@
# Setup the LibreELEC options # Setup the LibreELEC options
# valid values are: textmode debugging progress nofsck nosplash noram overlay quiet ssh # valid values are: textmode debugging progress nofsck nosplash noram overlay quiet ssh
# #
# libreelec="quiet" # libreelec='quiet'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
# #
# Enable|Disable HDMI CEC Control # Enable|Disable HDMI CEC Control
# hdmi_cec="0" # hdmi_cec='0'
# hdmi_cec="1" # hdmi_cec='1'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
# #
# Enable|Disable RTC Shield # Enable|Disable RTC Shield
# rtc_shield="0" # rtc_shield='0'
# rtc_shield="1" # rtc_shield='1'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------
@ -86,27 +86,27 @@
# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq # http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq
# #
# MAX CPU's # MAX CPU's
# maxcpus="1" # maxcpus='1'
# maxcpus="2" # maxcpus='2'
# maxcpus="3" # maxcpus='3'
# maxcpus="4" # maxcpus='4'
# #
# MAX Frequency # MAX Frequency
# 2.016GHz # 2.016GHz
# max_freq="2016" # max_freq='2016'
# 1.944GHz # 1.944GHz
# max_freq="1944" # max_freq='1944'
# 1.920GHz # 1.920GHz
# max_freq="1920" # max_freq='1920'
# 1.896GHz # 1.896GHz
# max_freq="1896 # max_freq='1896
# 1.752GHz # 1.752GHz
# max_freq="1752" # max_freq='1752'
# 1.680GHz # 1.680GHz
# max_freq="1680" # max_freq='1680'
# 1.656GHz # 1.656GHz
# max_freq="1656" # max_freq='1656'
# 1.536GHz # 1.536GHz
# max_freq="1536" # max_freq='1536'
# #
#------------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------------

2
projects/Amlogic/linux/linux.aarch64.conf
View File

@ -365,7 +365,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
# #
# Boot options # 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_FROM_BOOTLOADER is not set
CONFIG_CMDLINE_EXTEND=y CONFIG_CMDLINE_EXTEND=y
# CONFIG_CMDLINE_FORCE is not set # CONFIG_CMDLINE_FORCE is not set