From 074c8f39437f6485a4a8018db59d9aa010dc3f06 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 12 Jun 2019 22:59:17 +0300 Subject: [PATCH] Orange Pi One: use mainline kernel 5.1.9 and mainline uboot --- board/orangepione/mkimage.sh | 2 -- configs/orangepione_defconfig | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/board/orangepione/mkimage.sh b/board/orangepione/mkimage.sh index 2e53952649..2a136cac1e 100755 --- a/board/orangepione/mkimage.sh +++ b/board/orangepione/mkimage.sh @@ -9,5 +9,3 @@ export UBOOT_BIN=${IMG_DIR}/u-boot-sunxi-with-spl.bin export UBOOT_SEEK=16 export BOOT_START=20 source ${COMMON_DIR}/mkimage.sh - - diff --git a/configs/orangepione_defconfig b/configs/orangepione_defconfig index a33e26d69a..b3b3a44a1b 100644 --- a/configs/orangepione_defconfig +++ b/configs/orangepione_defconfig @@ -11,10 +11,9 @@ BR2_TARGET_TZ_INFO=y BR2_ROOTFS_OVERLAY="board/common/overlay board/orangepione/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/megous/linux/archive/5b6f5a7624123ce30817093ffdcf5214191a37af.tar.gz" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/orangepione/kernel.config" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.9" +BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config" @@ -76,10 +75,6 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_NANO=y BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://megous.com/u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="3eae864a23480978bcaafe1b143bf787bb375f47" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y