From 8e42ad55360194b6750214abcf992fb64ccc7c26 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 23 Jul 2020 18:52:01 +0200 Subject: [PATCH] Cleanup boot files & Kenrel 5.7.10 (#782) * Odroid: Update kernel 5.7.10 * Cleanup boot files * Fix patches --- Documentation/kernel.md | 6 +- .../board/hardkernel/odroid-c2/boot-env.txt | 131 ------------------ .../board/hardkernel/odroid-c2/hassos-hook.sh | 1 - .../board/hardkernel/odroid-c2/uboot-boot.ush | 3 +- .../board/hardkernel/odroid-n2/boot-env.txt | 84 ----------- .../board/hardkernel/odroid-n2/hassos-hook.sh | 1 - .../board/hardkernel/odroid-n2/uboot-boot.ush | 5 +- .../board/hardkernel/odroid-xu4/boot-env.txt | 40 ------ .../hardkernel/odroid-xu4/hassos-hook.sh | 1 - .../hardkernel/odroid-xu4/uboot-boot.ush | 7 +- ...fig-enable-meson-gx-audio-as-module.patch} | 0 ...it-segments-to-1-when-dram-access-qu.patch | 46 ------ ...imply-acodec-glue-on-axg-sound-card.patch} | 0 ...son-gx-card-fix-sound-dai-dt-schema.patch} | 0 ...rm64-dts-meson-g12-add-internal-DAC.patch} | 0 ...dts-meson-g12-add-internal-DAC-glue.patch} | 0 ...12b-odroid-n2-enable-audio-loopback.patch} | 0 ...droid-n2-add-jack-audio-output-supp.patch} | 0 .../configs/odroid_c2_defconfig | 2 +- .../configs/odroid_n2_defconfig | 2 +- .../configs/odroid_xu4_defconfig | 2 +- 21 files changed, 9 insertions(+), 322 deletions(-) delete mode 100644 buildroot-external/board/hardkernel/odroid-c2/boot-env.txt delete mode 100644 buildroot-external/board/hardkernel/odroid-n2/boot-env.txt delete mode 100644 buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt rename buildroot-external/board/hardkernel/patches/linux/{0002-arm64-defconfig-enable-meson-gx-audio-as-module.patch => 0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch} (100%) delete mode 100644 buildroot-external/board/hardkernel/patches/linux/0001-mmc-meson-gx-limit-segments-to-1-when-dram-access-qu.patch rename buildroot-external/board/hardkernel/patches/linux/{0003-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch => 0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch} (100%) rename buildroot-external/board/hardkernel/patches/linux/{0004-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch => 0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch} (100%) rename buildroot-external/board/hardkernel/patches/linux/{0005-arm64-dts-meson-g12-add-internal-DAC.patch => 0004-arm64-dts-meson-g12-add-internal-DAC.patch} (100%) rename buildroot-external/board/hardkernel/patches/linux/{0006-arm64-dts-meson-g12-add-internal-DAC-glue.patch => 0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch} (100%) rename buildroot-external/board/hardkernel/patches/linux/{0007-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch => 0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch} (100%) rename buildroot-external/board/hardkernel/patches/linux/{0008-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch => 0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch} (100%) diff --git a/Documentation/kernel.md b/Documentation/kernel.md index 18eae8908..bc774b3b8 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -12,7 +12,7 @@ Default Kernel tree: 5.4 | Raspberry Pi 3 | 4.19.127 | | Raspberry Pi 4 | 4.19.127 | | Tinker Board | 5.4.50 | -| Odroid-C2 | 5.7.7 | -| Odroid-N2 | 5.7.7 | -| Odroid-XU4 | 5.7.7 | +| Odroid-C2 | 5.7.10 | +| Odroid-N2 | 5.7.10 | +| Odroid-XU4 | 5.7.10 | | Intel NUC | 5.4.50 | diff --git a/buildroot-external/board/hardkernel/odroid-c2/boot-env.txt b/buildroot-external/board/hardkernel/odroid-c2/boot-env.txt deleted file mode 100644 index ee744b3f6..000000000 --- a/buildroot-external/board/hardkernel/odroid-c2/boot-env.txt +++ /dev/null @@ -1,131 +0,0 @@ - - -# Custom modeline! -# To use custom modeline you need to disable all the below resolutions -# and setup your own! -# For more information check our wiki: -# http://odroid.com/dokuwiki/doku.php?id=en:c2_hdmi_autosetting -# Example below: -#m=custombuilt -#modeline=1920,1200,154000,74040,60,1920,1968,2000,2080,1200,1202,1208,1235,1,0,1 - -# 480 Lines (720x480) -#m=480i60hz -#m=480i_rpt -#m=480p60hz -#m=480p_rpt - -# 576 Lines (720x576) -#m=576i50hz -#m=576i_rpt -#m=576p50hz -#m=576p_rpt - -# 720 Lines (1280x720) -#m=720p50hz -#m=720p60hz - -# 1080 Lines (1920x1080) -#m=1080i60hz -m=1080p60hz -#m=1080i50hz -#m=1080p50hz -#m=1080p24hz - -# 4K (3840x2160) -#m=2160p30hz -#m=2160p25hz -#m=2160p24hz -#m=smpte24hz -#m=2160p50hz -#m=2160p60hz -#m=2160p50hz420 -#m=2160p60hz420 - -### VESA modes ### -#m=640x480p60hz -#m=800x480p60hz -#m=480x800p60hz -#m=800x600p60hz -#m=1024x600p60hz -#m=1024x768p60hz -#m=1280x800p60hz -#m=1280x1024p60hz -#m=1360x768p60hz -#m=1440x900p60hz -#m=1600x900p60hz -#m=1680x1050p60hz -#m=1600x1200p60hz -#m=1920x1200p60hz -#m=2560x1080p60hz -#m=2560x1440p60hz -#m=2560x1600p60hz -#m=3440x1440p60hz - -# HDMI BPP Mode -m_bpp=32 -#m_bpp=24 -#m_bpp=16 - -# HDMI DVI/VGA modes -# By default its set to HDMI, if needed change below. -# Uncomment only a single Line. -#vout=dvi -#vout=vga - -# HDMI HotPlug Detection control -# Allows you to force HDMI thinking that the cable is connected. -# true = HDMI will believe that cable is always connected -# false = will let board/monitor negotiate the connection status -#hpd=false -hpd=true - -# Monitor output -# Controls if HDMI PHY should output anything to the monitor -monitor_onoff=false - -# Server Mode (aka. No Graphics) -# Setting nographics to 1 will disable all video subsystem -# This mode is ideal of server type usage. (Saves ~300Mb of RAM) -nographics=0 - -# Meson Timer -# 1 - Meson Timer -# 0 - Arch Timer -# Using meson_timer improves the video playback however it breaks KVM (virtualization). -# Using arch timer allows KVM/Virtualization to work however you'll experience poor video -mesontimer=1 - -# UHS (Ultra High Speed) MicroSD mode enable/disable -disableuhs=false - -# MicroSD Card Detection enable/disable -# Force the MMC controlled to believe that a card is connected. -mmc_removable=true - -# USB Multi WebCam tweak -# Only enable this if you use it. -usbmulticam=false - -# CPU Frequency / Cores control -########################################### -### WARNING!!! WARNING!!! WARNING!!! -# Before changing anything here please read the wiki entry: -# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq -# -# MAX CPU's -#maxcpus=1 -#maxcpus=2 -#maxcpus=3 -maxcpus=4 - -# MAX Frequency -#max_freq=2016 -#max_freq=1944 -#max_freq=1944 -#max_freq=1920 -#max_freq=1896 -#max_freq=1752 -#max_freq=1680 -#max_freq=1656 -max_freq=1536 diff --git a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh index 547bb07d2..6fa2c7cff 100755 --- a/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh +++ b/buildroot-external/board/hardkernel/odroid-c2/hassos-hook.sh @@ -8,7 +8,6 @@ function hassos_pre_image() { local SPL_IMG="$(path_spl_img)" cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr" - cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt" cp "${BINARIES_DIR}/meson-gxbb-odroidc2.dtb" "${BOOT_DATA}/meson-gxbb-odroidc2.dtb" echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt" diff --git a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush index d993c522e..a3912683a 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush @@ -23,8 +23,7 @@ if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then fi # Board bootargs -if test "${m}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi -setenv bootargs_odroidc2 "no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} net.ifnames=0 elevator=noop disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}" +setenv bootargs_odroidc2 "" # HassOS bootargs setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory" diff --git a/buildroot-external/board/hardkernel/odroid-n2/boot-env.txt b/buildroot-external/board/hardkernel/odroid-n2/boot-env.txt deleted file mode 100644 index 476e9cd34..000000000 --- a/buildroot-external/board/hardkernel/odroid-n2/boot-env.txt +++ /dev/null @@ -1,84 +0,0 @@ - - -# Custom modeline! -# To use custom modeline you need to disable all the below resolutions -# and setup your own! -# For more information check our wiki: -# https://wiki.odroid.com/odroid-n2/application_note/software/set_display_mode - -# HDMI Mode -# Resolution Configuration -# Symbol | Resolution -# ----------------------+------------- -# "480x320p60hz" | 480x320 Progressive 60Hz -# "480p60hz" | 720x480 Progressive 60Hz -# "576p50hz" | 720x576 Progressive 50Hz -# "720p60hz" | 1280x720 Progressive 60Hz -# "720p50hz" | 1280x720 Progressive 50Hz -# "1080p60hz" | 1920x1080 Progressive 60Hz -# "1080p50hz" | 1920x1080 Progressive 50Hz -# "1080p30hz" | 1920x1080 Progressive 30Hz -# "1080p24hz" | 1920x1080 Progressive 24Hz -# "1080i60hz" | 1920x1080 Interlaced 60Hz -# "1080i50hz" | 1920x1080 Interlaced 50Hz -# "2160p60hz" | 3840x2160 Progressive 60Hz -# "2160p50hz" | 3840x2160 Progressive 50Hz -# "2160p30hz" | 3840x2160 Progressive 30Hz -# "2160p25hz" | 3840x2160 Progressive 25Hz -# "2160p24hz" | 3840x2160 Progressive 24Hz -# "smpte24hz" | 3840x2160 Progressive 24Hz SMPTE -# "2160p60hz420" | 3840x2160 Progressive 60Hz YCbCr 4:2:0 -# "2160p50hz420" | 3840x2160 Progressive 50Hz YCbCr 4:2:0 -# "640x480p60hz" | 640x480 Progressive 60Hz -# "800x480p60hz" | 800x480 Progressive 60Hz -# "800x600p60hz" | 800x600 Progressive 60Hz -# "1024x600p60hz" | 1024x600 Progressive 60Hz -# "1024x768p60hz" | 1024x768 Progressive 60Hz -# "1280x800p60hz" | 1280x800 Progressive 60Hz -# "1280x1024p60hz" | 1280x1024 Progressive 60Hz -# "1360x768p60hz" | 1360x768 Progressive 60Hz -# "1440x900p60hz" | 1440x900 Progressive 60Hz -# "1600x900p60hz" | 1600x900 Progressive 60Hz -# "1600x1200p60hz" | 1600x1200 Progressive 60Hz -# "1680x1050p60hz" | 1680x1050 Progressive 60Hz -# "1920x1200p60hz" | 1920x1200 Progressive 60Hz -# "2560x1080p60hz" | 2560x1080 Progressive 60Hz -# "2560x1440p60hz" | 2560x1440 Progressive 60Hz -# "2560x1600p60hz" | 2560x1600 Progressive 60Hz -# "3440x1440p60hz" | 3440x1440 Progressive 60Hz -hdmimode=1080p60hz - -# Overscan percentage -# This value scales down the actual screen size by the percentage below -# valid range is 80 to 100 -overscan=100 - -### voutmode : hdmi or dvi -#voutmode=dvi -voutmode=hdmi - -# HPD enable/disable option -disablehpd="false" - -# max cpu frequency for big core, A73 in MHz unit -# 1.8 GHz, default value -#max_freq_a73=2004 # 2.004 GHz -#max_freq_a73=1908 # 1.908 GHz -#max_freq_a73=1704 # 1.704 GHz -max_freq_a73=1800 - -# max cpu frequency for little core, A53 in MHz unit -# 1.896 GHz, default value -#max_freq_a53=1992 # 1.992 GHz -#max_freq_a53=1704 # 1.704 GHz -max_freq_a53=1896 - - -# max cpu-cores -# Note: -# CPU's 0 and 1 are the A53 (small cores) -# CPU's 2 to 5 are the A73 (big cores) -# Lowering this value disables only the bigger cores (the last cores). -#maxcpus=4 -#maxcpus=5 -maxcpus=6 diff --git a/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh index 49347ae70..d28d36d2d 100755 --- a/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh +++ b/buildroot-external/board/hardkernel/odroid-n2/hassos-hook.sh @@ -7,7 +7,6 @@ function hassos_pre_image() { local SPL_IMG="$(path_spl_img)" cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr" - cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt" cp "${BINARIES_DIR}/meson-g12b-odroid-n2.dtb" "${BOOT_DATA}/meson-g12b-odroid-n2.dtb" echo "console=tty0 console=ttyAML0,115200n8" > "${BOOT_DATA}/cmdline.txt" diff --git a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush index c044733d7..0faef437f 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush @@ -23,10 +23,7 @@ if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then fi # Board bootargs -if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi - -# Boot Args -setenv bootargs_odroidn2 "clk_ignore_unused hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} ${cmode} voutmode=${voutmode} disablehpd=${disablehpd} overscan=${overscan}" +setenv bootargs_odroidn2 "" # HassOS bootargs setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory" diff --git a/buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt b/buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt deleted file mode 100644 index 8792fee3a..000000000 --- a/buildroot-external/board/hardkernel/odroid-xu4/boot-env.txt +++ /dev/null @@ -1,40 +0,0 @@ - -macaddr=00:1e:06:61:7a:39 -vout=hdmi -# - DVI Mode (disables sound over HDMI as per DVI compat) -# vout=dvi - -# --- HDMI CEC Configuration --- -# ------------------------------------------ -cecenable=false -# set to true to enable HDMI CEC - -# Enable/Disable ODROID-VU7 Touchsreen -disable_vu7=false - -# DRAM Frequency -# Sets the LPDDR3 memory frequency -# Supported values: 933 825 728 633 (MHZ) -ddr_freq=825 - -# External watchdog board enable -external_watchdog=false -# debounce time set to 3 ~ 10 sec, default 3 sec -external_watchdog_debounce=3 - - -#------------------------------------------------------------------------------ -# -# HDMI Hot Plug detection -# -#------------------------------------------------------------------------------ -# -# Forces the HDMI subsystem to ignore the check if the cable is connected or -# not. -# false : disable the detection and force it as connected. -# true : let cable, board and monitor decide the connection status. -# -# default: true -# -#------------------------------------------------------------------------------ -HPD=true diff --git a/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh b/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh index 7383d4246..9bc6fa675 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh +++ b/buildroot-external/board/hardkernel/odroid-xu4/hassos-hook.sh @@ -10,7 +10,6 @@ function hassos_pre_image() { local spl_img="$(path_spl_img)" cp "${BINARIES_DIR}/boot.scr" "${BOOT_DATA}/boot.scr" - cp "${BOARD_DIR}/boot-env.txt" "${BOOT_DATA}/config.txt" cp "${BINARIES_DIR}/exynos5422-odroidxu4.dtb" "${BOOT_DATA}/exynos5422-odroidxu4.dtb" echo "console=tty1 console=ttySAC2,115200" > "${BOOT_DATA}/cmdline.txt" diff --git a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush index 79727b7ad..1af12a55e 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush +++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush @@ -25,12 +25,7 @@ if load mmc ${devnum}:1 ${ramdisk_addr_r} config.txt; then fi # Board bootargs -setenv hdmi_phy_control "HPD=${HPD} vout=${vout}" -if test "${cecenable}" = "false"; then fdt rm /cec@101B0000; fi -if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi -if test "${external_watchdog}" = "true"; then setenv external_watchdog "external_watchdog=${external_watchdog} external_watchdog_debounce=${external_watchdog_debounce}"; fi - -setenv bootargs_odroidxu4 "${videoconfig} ${hdmi_phy_control} ${hid_quirks} smsc95xx.macaddr=${macaddr} ${external_watchdog}" +setenv bootargs_odroidxu4 "" # HassOS bootargs setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory" diff --git a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-defconfig-enable-meson-gx-audio-as-module.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0002-arm64-defconfig-enable-meson-gx-audio-as-module.patch rename to buildroot-external/board/hardkernel/patches/linux/0001-arm64-defconfig-enable-meson-gx-audio-as-module.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0001-mmc-meson-gx-limit-segments-to-1-when-dram-access-qu.patch b/buildroot-external/board/hardkernel/patches/linux/0001-mmc-meson-gx-limit-segments-to-1-when-dram-access-qu.patch deleted file mode 100644 index d744befdf..000000000 --- a/buildroot-external/board/hardkernel/patches/linux/0001-mmc-meson-gx-limit-segments-to-1-when-dram-access-qu.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bbafdffacb88adb701ca2f37f3169df4c9ac3824 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Mon, 8 Jun 2020 10:44:58 +0200 -Subject: [PATCH 1/8] mmc: meson-gx: limit segments to 1 when dram-access-quirk - is needed - -The actual max_segs computation leads to failure while using the broadcom -sdio brcmfmac/bcmsdh driver, since the driver tries to make usage of scatter -gather. - -But with the dram-access-quirk we use a 1,5K SRAM bounce buffer, and the -max_segs current value of 3 leads to max transfers to 4,5k, which doesn't work. - -This patch sets max_segs to 1 to better describe the hardware limitation, -and fix the SDIO functionnality with the brcmfmac/bcmsdh driver on Amlogic -G12A/G12B SoCs on boards like SEI510 or Khadas VIM3. - -Reported-by: Art Nikpal -Reported-by: Christian Hewitt -Fixes: acdc8e71d9bb ("mmc: meson-gx: add dram-access-quirk") -Signed-off-by: Neil Armstrong ---- - drivers/mmc/host/meson-gx-mmc.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index 35400cf2a2e4..cfaf8e7e22ec 100644 ---- a/drivers/mmc/host/meson-gx-mmc.c -+++ b/drivers/mmc/host/meson-gx-mmc.c -@@ -1143,9 +1143,11 @@ static int meson_mmc_probe(struct platform_device *pdev) - - mmc->caps |= MMC_CAP_CMD23; - if (host->dram_access_quirk) { -+ /* Limit segments to 1 due to low available sram memory */ -+ mmc->max_segs = 1; - /* Limit to the available sram memory */ -- mmc->max_segs = SD_EMMC_SRAM_DATA_BUF_LEN / mmc->max_blk_size; -- mmc->max_blk_count = mmc->max_segs; -+ mmc->max_blk_count = SD_EMMC_SRAM_DATA_BUF_LEN / -+ mmc->max_blk_size; - } else { - mmc->max_blk_count = CMD_CFG_LENGTH_MASK; - mmc->max_segs = SD_EMMC_DESC_BUF_LEN / --- -2.17.1 - diff --git a/buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch b/buildroot-external/board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch rename to buildroot-external/board/hardkernel/patches/linux/0002-ASoC-meson-imply-acodec-glue-on-axg-sound-card.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0004-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch b/buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0004-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch rename to buildroot-external/board/hardkernel/patches/linux/0003-ASoC-meson-gx-card-fix-sound-dai-dt-schema.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC.patch b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC.patch rename to buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-g12-add-internal-DAC.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12-add-internal-DAC-glue.patch b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12-add-internal-DAC-glue.patch rename to buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-g12-add-internal-DAC-glue.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch b/buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch rename to buildroot-external/board/hardkernel/patches/linux/0006-arm64-dts-meson-g12b-odroid-n2-enable-audio-loopback.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch b/buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch rename to buildroot-external/board/hardkernel/patches/linux/0007-arm64-dts-meson-odroid-n2-add-jack-audio-output-supp.patch diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index c194cb834..fa4918e61 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index 02e1d1c6c..a40deed7e 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.10" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 206d12294..12208199d 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.10" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" BR2_LINUX_KERNEL_LZ4=y