From 09f7c70010bb751ba9a98f8ee5c710098571e7d3 Mon Sep 17 00:00:00 2001 From: lanefu Date: Sat, 3 Aug 2019 14:06:31 -0400 Subject: [PATCH] Odroidn2 tweaks (#1498) * prefix uboot boot_scripts with /boot/ path * load codec modules on desktop build --- config/boards/odroidn2.csc | 6 +++++- .../u-boot-odroidn2/fix-boot-scripts-path.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 patch/u-boot/u-boot-odroidn2/fix-boot-scripts-path.patch diff --git a/config/boards/odroidn2.csc b/config/boards/odroidn2.csc index d529de779..49c1fa15e 100644 --- a/config/boards/odroidn2.csc +++ b/config/boards/odroidn2.csc @@ -3,7 +3,11 @@ BOARD_NAME="Odroid N2" BOARDFAMILY="odroidn2" BOOTCONFIG="odroidn2_config" # -MODULES="" +MODULES="media_clock firmware" +if [[ $BUILD_DESKTOP == 'yes' ]]; then + MODULES+=" decoder_common stream_input amvdec_avs amvdec_h264 amvdec_h264_4k2k amvdec_mh264 amvdec_h264mvc amvdec_h265 amvdec_mjpeg amvdec_mmjpeg amvdec_mpeg12 amvdec_mpeg4 amvdec_mmpeg4 amvdec_real amvdec_vc1 amvdec_vp9" +fi + MODULES_NEXT="" # KERNEL_TARGET="default,dev" diff --git a/patch/u-boot/u-boot-odroidn2/fix-boot-scripts-path.patch b/patch/u-boot/u-boot-odroidn2/fix-boot-scripts-path.patch new file mode 100644 index 000000000..b42258a9e --- /dev/null +++ b/patch/u-boot/u-boot-odroidn2/fix-boot-scripts-path.patch @@ -0,0 +1,13 @@ +diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h +index 1539e68..3828642 100644 +--- a/include/configs/odroid-g12-common.h ++++ b/include/configs/odroid-g12-common.h +@@ -96,7 +96,7 @@ + + #define ENV_BOOT_ORDER_DEFAULT "boot_order=mmc rawimage usb pxe spi\0" + +-#define ENV_BOOTSCRIPTS_DEFAULT "boot_scripts=boot.ini boot.scr\0" ++#define ENV_BOOTSCRIPTS_DEFAULT "boot_scripts=boot.ini boot.scr /boot/boot.ini /boot/boot.scr\0" + + #define ENV_BOOT_ATTEMPT_DEFAULT \ + "boot_attempt=" \