From patchwork Wed Jun 19 16:54:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1118873 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="kXTh2S81"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45TWLr0YNLz9s5c for ; Thu, 20 Jun 2019 02:56:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E76A62078C; Wed, 19 Jun 2019 16:56:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DECx2lJDUFDK; Wed, 19 Jun 2019 16:56:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B0E502076B; Wed, 19 Jun 2019 16:56:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C70841BF355 for ; Wed, 19 Jun 2019 16:56:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C30A086767 for ; Wed, 19 Jun 2019 16:56:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Q5PH+7xksgIe for ; Wed, 19 Jun 2019 16:56:31 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 11832813ED for ; Wed, 19 Jun 2019 16:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1560963391; x=1592499391; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=J5p13V626RCvKN9xmuy+tLMOw84S5K9dKeQOZZau7Bg=; b=kXTh2S81z5eknDCbqjrq59/pg04XGG69clyIPrM6W8VQcFCwkp0aQESN qo5bzpe/7DSIOcheO9o1NYhQ4TELJ4buZDSYVy9Sltz/vdmRc2IW/NtW5 YGKPTP3JXjt8d0ENBaeHicvNman3CUG7O4/aXxI6DU5f/WeP08cJlDaQe jzIs4Fry9stopspg77b4Wqdnr2n7aBHIq/ZUet+XxtX6Pnp37hukJOY9d jp1cuQ46n4m9EIpnV5/jQ51hyIDKqhP4LS+Mjz0QWA402EtT4oaY0m7gF ovYx+zlIn2q+Eqjpgjocd7AHYKMWtgYfVM5mrR+LmMVb1ktA8MSp0mNjU Q==; X-IronPort-AV: E=Sophos;i="5.63,392,1557158400"; d="scan'208";a="112623706" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 20 Jun 2019 00:56:30 +0800 IronPort-SDR: wvzKHI7Ze+YP/KWDHrMqkmEWYrZputWIT10jP3sYxB2wPkP7cq6DS98Zg5z9ha9Cw9S1APtQVC NwjyRQZZdiMcVAkCPU6z9Gxr6RnDBFJ+e/1ekB+NTAj3rOPMQxBBxvikXB3y85GP/zcAnzKcVj p0A3VmFwaTcy524Nxlx4CSqXtmkWxe5qCKKVIwDYq00Do4Ikh8zhXPrwbN6tMW6wRS+Jmj4vHw lEIT54MxkFNLqC+hk3h8CI4/qgQ7ya1ZSYeMTbmPD992OQK+jV9g4SgTwV1iHf14tJ+JGiPfNJ OXaLXeBfQoA7mSVmrdt706lB Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 19 Jun 2019 09:55:56 -0700 IronPort-SDR: 8DDZ/3nsGEE9cG2y2RbXr3Oav9/e/dVcbK7U/ah22NMSIBdWHuNLpbnUIHJe/mdvQ7lYBN11Ng KAmiCOilK/xyDPsYDgq1Sqo+d6Ir5W2krN848l+VVTlBQEnXLSX+bad8IWcw7YgZDqw77rSIPU Ez2iD+oSTm9L1PZrAAiOqKH7RujojKa32+IArU5wVyfqbXprQauihjDGRbqVZHNTUOkzO2gjEz awurFDIHFeaWUNOeh42KN4DglYlf40NrvQNc9cAaouV2wvoptY2StH1Zf9/vZJdrhO/a60xgdQ 2eU= Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.140]) by uls-op-cesaip02.wdc.com with ESMTP; 19 Jun 2019 09:56:30 -0700 From: Alistair Francis To: buildroot@buildroot.org Date: Wed, 19 Jun 2019 09:54:05 -0700 Message-Id: <20190619165406.19615-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/2] configs/qemu_riscv64_virt: Update to 5.1 kernel X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, Alistair Francis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update the 64-bit defconfig to use the latest kernel. Signed-off-by: Alistair Francis --- v2: - Keep kernel version hard coded configs/qemu_riscv64_virt_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 12afac44fb..c0b1a43925 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -10,13 +10,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.20 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y +# Linux headers same as kernel, a 5.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.20.17" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y From patchwork Wed Jun 19 16:54:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1118874 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="rqzsKjQB"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45TWLy2W9gz9s5c for ; Thu, 20 Jun 2019 02:56:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D672320C45; Wed, 19 Jun 2019 16:56:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vE6-tvuSvxaN; Wed, 19 Jun 2019 16:56:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B593B20788; Wed, 19 Jun 2019 16:56:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9947B1BF355 for ; Wed, 19 Jun 2019 16:56:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 962A386767 for ; Wed, 19 Jun 2019 16:56:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ht0Na6zN9-SG for ; Wed, 19 Jun 2019 16:56:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from esa6.hgst.iphmx.com (esa6.hgst.iphmx.com [216.71.154.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id C0240813ED for ; Wed, 19 Jun 2019 16:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1560963394; x=1592499394; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iMTQ1YWbxJTdZehYaMXdHYwfIq/f+r09cf0uhfa/LDE=; b=rqzsKjQB7y+EetCMKvJiqQsWRkNUdUKnYN6tvWXAxjjxtUs/nvmRRU1b laRlS/xiZIhl6KGjLZY9u7PZzxabhXKtvli5IZt9UomMHd112+mylXAsq ElLy5uS66uQiF9+ZbHhVfuccxL5nNz04+Hbb9bGBqxpLyoqZFEJlafeBv QQs0mF5uIkIKP+9Bt0Gh2nPQXV6ePmSpCoo37+jsHDLcfXU14B9d0EJ5u 7bLWM0UOgJn2ZK03SolTt57e2boJtZOkWTwtl0Du1ZI6IuCO6YnSSaITD iKf7HQRPej3yfibvIriAgeE2XjjQRKRsSxk1roG/cwaY4n2jRpEyM8Kis g==; X-IronPort-AV: E=Sophos;i="5.63,392,1557158400"; d="scan'208";a="112623709" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 20 Jun 2019 00:56:34 +0800 IronPort-SDR: qX/9In/zF39KZzRNWdyCvnxvfWU1PWrR6VDiQWYEiEhyuwaJZ598Qyd3QoxJCe7VqdfzZ267Bg LK+ZAcM6gK+aVf04lQ0vbXJGiX5b7AjZG3NbZOfT88pquzOerc8BmSOIqTagZXRUBIywWTkwPq T56nXYkfHVPm9KQCpJk03eGI9dePvutSRPhT0w0e2c5IXToP3r7UKf81QWHGQVBs1MXXBtz1SL nDUtyn+kFCesYUb6gOFHVL/PhSQLNMSHlkvOGwp8/qa/znSt3AyenEYRhQG9GIfvkn3cy+0Jd8 8BhOaNarvhRUBVlDtPmXMVP9 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 19 Jun 2019 09:56:00 -0700 IronPort-SDR: PhSxYnnDyQSVROQFJbpsfopQzgPggPZeeNsxzyqhUkaq4/278OEUMWeA5EiK4D+mwVrY1JMQ+f qtzualOQWCp8d6mvVBTw+WgRaPegKZc0YJqd4KjH0BY6gbCiHRac29H8KeCLrZSYU3l4/5c11h NzGbRRoiQ2/ibwOjb6c2mIv8OyHHg6ym6pM0RrxQdDecDdmduHmpfVsC/AVb9GGJbUkZ3zCz/7 K4xbOiG7ZJZjqacxVPg4at3iewwJwAD3PRQ9kGndMHSZfnLG/tDfTcj2q522LeLqbEXTyLjdKm siU= Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.140]) by uls-op-cesaip02.wdc.com with ESMTP; 19 Jun 2019 09:56:33 -0700 From: Alistair Francis To: buildroot@buildroot.org Date: Wed, 19 Jun 2019 09:54:06 -0700 Message-Id: <20190619165406.19615-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190619165406.19615-1-alistair.francis@wdc.com> References: <20190619165406.19615-1-alistair.francis@wdc.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/2] configs/qemu_riscv32_virt: Update to 5.1 kernel X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, Alistair Francis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update the 32-bit defconfig to use the latest kernel. This requires a patch to revert a ABI to ensure that the glibc port continues to work. Signed-off-by: Alistair Francis --- v2: - Keep kernel version hard coded - Remove unused config fragment ...ert-riscv-Use-latest-system-call-ABI.patch | 66 +++++++++++++++++++ board/qemu/riscv32-virt/linux.config.fragment | 12 ---- configs/qemu_riscv32_virt_defconfig | 10 +-- 3 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 board/qemu/riscv32-virt/0001-Revert-riscv-Use-latest-system-call-ABI.patch delete mode 100644 board/qemu/riscv32-virt/linux.config.fragment diff --git a/board/qemu/riscv32-virt/0001-Revert-riscv-Use-latest-system-call-ABI.patch b/board/qemu/riscv32-virt/0001-Revert-riscv-Use-latest-system-call-ABI.patch new file mode 100644 index 0000000000..e0dfaa1501 --- /dev/null +++ b/board/qemu/riscv32-virt/0001-Revert-riscv-Use-latest-system-call-ABI.patch @@ -0,0 +1,66 @@ +From 15f62343916fcb3cae82e618da28eaa82bc8c007 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Tue, 16 Apr 2019 09:03:41 -0700 +Subject: [PATCH] Revert "riscv: Use latest system call ABI" + +This reverts commit d4c08b9776b392e20efc6198ebe1bc8ec1911d9b. + +The latest RISC-V 32bit glibc submission doesn't work with this patch, +so let's revert it. This revert can be reverted when the glibc +submission is updated to work on the 5.1 kernel. + +Signed-off-by: Alistair Francis +--- + arch/riscv/Kconfig | 1 + + arch/riscv/include/uapi/asm/unistd.h | 5 ++++- + arch/riscv/kernel/vdso/Makefile | 2 -- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig +index eb56c82d8aa1..43dd2680c696 100644 +--- a/arch/riscv/Kconfig ++++ b/arch/riscv/Kconfig +@@ -11,6 +11,7 @@ config 32BIT + + config RISCV + def_bool y ++ select ARCH_32BIT_OFF_T if !64BIT + # even on 32-bit, physical (and DMA) addresses are > 32-bits + select PHYS_ADDR_T_64BIT + select OF +diff --git a/arch/riscv/include/uapi/asm/unistd.h b/arch/riscv/include/uapi/asm/unistd.h +index 0e2eeeb1fd27..486a288b454c 100644 +--- a/arch/riscv/include/uapi/asm/unistd.h ++++ b/arch/riscv/include/uapi/asm/unistd.h +@@ -17,8 +17,11 @@ + + #ifdef __LP64__ + #define __ARCH_WANT_NEW_STAT +-#define __ARCH_WANT_SET_GET_RLIMIT + #endif /* __LP64__ */ ++#define __ARCH_WANT_SET_GET_RLIMIT ++#ifndef __LP64__ ++#define __ARCH_WANT_TIME32_SYSCALLS ++#endif + + #include + +diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile +index fec62b24df89..eed1c137f618 100644 +--- a/arch/riscv/kernel/vdso/Makefile ++++ b/arch/riscv/kernel/vdso/Makefile +@@ -2,11 +2,9 @@ + + # Symbols present in the vdso + vdso-syms = rt_sigreturn +-ifdef CONFIG_64BIT + vdso-syms += gettimeofday + vdso-syms += clock_gettime + vdso-syms += clock_getres +-endif + vdso-syms += getcpu + vdso-syms += flush_icache + +-- +2.21.0 + diff --git a/board/qemu/riscv32-virt/linux.config.fragment b/board/qemu/riscv32-virt/linux.config.fragment deleted file mode 100644 index bca9aa61c7..0000000000 --- a/board/qemu/riscv32-virt/linux.config.fragment +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_32BIT=y -CONFIG_ARCH_RV32I=y -# CONFIG_ARCH_RV64I is not set -CONFIG_MAXPHYSMEM_2GB=y -CONFIG_LBDAF=y -# CONFIG_SCSI_NSP32 is not set -CONFIG_GENERIC_ATOMIC64=y -CONFIG_GENERIC_LIB_ASHLDI3=y -CONFIG_GENERIC_LIB_ASHRDI3=y -CONFIG_GENERIC_LIB_LSHRDI3=y -CONFIG_GENERIC_LIB_UCMPDI2=y -CONFIG_GENERIC_LIB_UMODDI3=y diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 84f7b6ab9c..0395292cd8 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -10,15 +10,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.20 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y +# Linux headers same as kernel, a 5.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.20.17" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/riscv32-virt/linux.config.fragment" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.12" +BR2_LINUX_KERNEL_DEFCONFIG="rv32" +BR2_LINUX_KERNEL_PATCH="board/qemu/riscv32-virt/0001-Revert-riscv-Use-latest-system-call-ABI.patch" BR2_LINUX_KERNEL_IMAGE=y # Bootloader