From c2046ea049535a2109129684bca5d4f0d66e900e Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 14 Jun 2018 12:37:19 +0200 Subject: [PATCH] Odroid C2 NEXT tiny config adjustement to remove errros from bootup and moving u-boot to 2018.05 --- config/kernel/linux-odroidc2-dev.config | 6 +++--- config/kernel/linux-odroidc2-next.config | 4 ++-- config/sources/odroidc2.conf | 4 ++-- ...vision-by-zero-in-meson_mmc_config_clock.patch.disabled} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename patch/u-boot/u-boot-odroidc2-next/{0001-mmc-avoid-division-by-zero-in-meson_mmc_config_clock.patch => 0001-mmc-avoid-division-by-zero-in-meson_mmc_config_clock.patch.disabled} (100%) diff --git a/config/kernel/linux-odroidc2-dev.config b/config/kernel/linux-odroidc2-dev.config index 702b9368f9..1685a37f54 100644 --- a/config/kernel/linux-odroidc2-dev.config +++ b/config/kernel/linux-odroidc2-dev.config @@ -1514,10 +1514,10 @@ CONFIG_OF_IRQ=y CONFIG_OF_NET=y CONFIG_OF_MDIO=y CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set -# CONFIG_PARPORT is not set +CONFIG_OF_OVERLAY=m +CONFIG_PARPORT=m CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_NULL_BLK is not set +CONFIG_BLK_DEV_NULL_BLK=m CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set CONFIG_ZRAM_LZ4_COMPRESS=y diff --git a/config/kernel/linux-odroidc2-next.config b/config/kernel/linux-odroidc2-next.config index 9c1211e309..cbe7389c75 100644 --- a/config/kernel/linux-odroidc2-next.config +++ b/config/kernel/linux-odroidc2-next.config @@ -1562,8 +1562,8 @@ CONFIG_OF_IRQ=y CONFIG_OF_NET=y CONFIG_OF_MDIO=y CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set -# CONFIG_PARPORT is not set +CONFIG_OF_OVERLAY=m +CONFIG_PARPORT=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_ZRAM=m diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf index ebbeef7c4a..39e324fff2 100644 --- a/config/sources/odroidc2.conf +++ b/config/sources/odroidc2.conf @@ -22,7 +22,7 @@ case $BRANCH in next) BOOTSOURCE=$MAINLINE_UBOOT_SOURCE BOOTDIR=$MAINLINE_UBOOT_DIR - BOOTBRANCH='tag:v2018.03' + BOOTBRANCH='tag:v2018.05' BOOTPATCHDIR='u-boot-odroidc2-next' UBOOT_TARGET_MAP=";;$SRC/cache/sources/odroidc2-blobs/bl1.bin.hardkernel u-boot.bin" BOOTSCRIPT='boot-odroid-c2-next.cmd:boot.cmd' @@ -39,7 +39,7 @@ case $BRANCH in dev) BOOTSOURCE=$MAINLINE_UBOOT_SOURCE BOOTDIR=$MAINLINE_UBOOT_DIR - BOOTBRANCH='tag:v2018.03' + BOOTBRANCH='tag:v2018.05' BOOTPATCHDIR='u-boot-odroidc2-next' UBOOT_TARGET_MAP=";;$SRC/cache/sources/odroidc2-blobs/bl1.bin.hardkernel u-boot.bin" BOOTSCRIPT='boot-odroid-c2-next.cmd:boot.cmd' diff --git a/patch/u-boot/u-boot-odroidc2-next/0001-mmc-avoid-division-by-zero-in-meson_mmc_config_clock.patch b/patch/u-boot/u-boot-odroidc2-next/0001-mmc-avoid-division-by-zero-in-meson_mmc_config_clock.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-odroidc2-next/0001-mmc-avoid-division-by-zero-in-meson_mmc_config_clock.patch rename to patch/u-boot/u-boot-odroidc2-next/0001-mmc-avoid-division-by-zero-in-meson_mmc_config_clock.patch.disabled