From patchwork Tue Jun 18 23:53:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1118387 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="LTyId8KE"; 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 45T53K5TTCz9sBp for ; Wed, 19 Jun 2019 10:11:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 68C5720504; Wed, 19 Jun 2019 00:11: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 7W2kKyz1De0X; Wed, 19 Jun 2019 00:11:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 69DB9204FB; Wed, 19 Jun 2019 00:11:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6B2EA1BF2B0 for ; Wed, 19 Jun 2019 00:11:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 67C3020500 for ; Wed, 19 Jun 2019 00:11:34 +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 Zqb9uB1m8K7g for ; Wed, 19 Jun 2019 00:11:30 +0000 (UTC) X-Greylist: delayed 00:08:03 by SQLgrey-1.7.6 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by silver.osuosl.org (Postfix) with ESMTPS id 373392033E for ; Wed, 19 Jun 2019 00:11: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=1560903090; x=1592439090; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=T/OOSXTo3iKxxDI1DKPVHoMPSit8+aY6VEWwrMFgZh8=; b=LTyId8KE6WJGvF+VQQg6zlPfx9kCUrmjsI9g6Tpk3c+lv21vJ/0oDOAu JlI4LYWK3DddWPW7yW39HnbKU12VoLI9NTArGatkJzXbA18PoSnKdaplv auqRTSdd0wdvnNjj18C9p9rhEtQENcdOE9wrsDQ0qyQ8wFQwwN3OCy1+Q TSiueMv6WfonBSrjen0l2QhnzLxb6rpfGZUHWD65yZuO+1lFNyA/I5E0z SkZqap0vB3Q/zdgIx2QeIs1XcZ6eKU7kOEt8Kjl+1MAWUdZPBWlIV8ivX zjzX+gTc+cdzESls1wXFO8b0D9OXKgUJvWXezl8GvAAI/+TBLjCPTQ905 w==; X-IronPort-AV: E=Sophos;i="5.63,390,1557158400"; d="scan'208";a="217264349" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 19 Jun 2019 07:56:21 +0800 IronPort-SDR: s6xJnwejGiWJiD+nZ12jlxsGWEHTvLhqII3BlgFg12G3oa0mJWrgt6ysA892GkCC2oAGOWw9kC G3kmBJ7y619VdfijyRnnFNBpnP9MpUQomayrERS87UxnhyxrYrTHmVXnxSUj/YMeOYgEmgdmlQ dnuYwfO/2aMrbjfVC6Orno6q4NzyYv4m7ClqsKb55VujkWwMPbbBhJK9LvWr5BVLrtYYrd456K prbCAKH3dG+gSIQHqyPuN8o559ro9oETtO4uKVR5P//lcKv2Fc7pgWaQs6JMHskSO7/iBVFP+1 /HD1YlO9VOCLPHOnNYKWjWHu Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 18 Jun 2019 16:55:49 -0700 IronPort-SDR: X49mVFH15hy3J2J6bY167sA558dLvWFct/xEboqzkn16ISnaGJydoAjxSCC/kCEYYW4F79tZdf GZ3IXW1/uuFjflNJpMSCGgG75xM2leEKGsKg2MDeyfh2G76mNPI2zzSQ66fq7fwG8SKGjC2F50 9P4bzRzxM7j76rrnFKhurxlUxzjZMX0/22Nvp8WKEqaFcRRxnOlUMHw6l9Tcbnw0bUtWsBb2ad 5gr7E3xZ/jEj/uj8/c0BHCIojsuJb6gvbaQBiWG2Meay9iENNzQyPw17nRFGGWy4PLA3vE4qu7 2/o= 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; 18 Jun 2019 16:56:21 -0700 From: Alistair Francis To: buildroot@buildroot.org Date: Tue, 18 Jun 2019 16:53:57 -0700 Message-Id: <20190618235358.10613-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 --- configs/qemu_riscv64_virt_defconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 12afac44fb..e2932778ec 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -10,13 +10,8 @@ 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 - # 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_IMAGE=y From patchwork Tue Jun 18 23:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1118388 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="jzN1/TBA"; 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 45T53P2yd6z9sCJ for ; Wed, 19 Jun 2019 10:11:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F2871204AE; Wed, 19 Jun 2019 00:11:42 +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 jG-AJQlpYh+l; Wed, 19 Jun 2019 00:11:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7FBA020506; Wed, 19 Jun 2019 00:11:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9E65D1BF2B0 for ; Wed, 19 Jun 2019 00:11:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9B4532033E for ; Wed, 19 Jun 2019 00:11:34 +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 PmgTqwG2ym-G for ; Wed, 19 Jun 2019 00:11:30 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by silver.osuosl.org (Postfix) with ESMTPS id 5A5B6204FB for ; Wed, 19 Jun 2019 00:11: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=1560903090; x=1592439090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ilkJWyfW/y3wzA+hMsTd+PZU/6eZUsh0mjR/Nztameg=; b=jzN1/TBAS00Ytq5x8AZLB2z6HJhUSJQ/Ia3SeLWEryT7qBK8wq+ZKLzZ pwQwquz+/Wr7HjLzhuBYpYvoIMNiSf9xIVPRed0fuZ6C6dRzlZmXxRhkN MErublZt9zkoBW5I7xJWbIPbHwDyjcRFn5MvoNHWgFaqy6Psd0hvoUHFO Rc3vyOiux2BgX/VM2SHgmV27TiLrtcf2Ng9GH4VgvPZ+fOm49M0PbjuAe f29YW/lnmiy9k31Fw97WNqPVnNQKrMqDEazNbCGygymJY2o2t2vi6l9nA Lq56kFSuSvEU1DEyt4S/wyR61s37O81TKUPIIhHCXa2EVid4a2l+qSRaM Q==; X-IronPort-AV: E=Sophos;i="5.63,390,1557158400"; d="scan'208";a="217264351" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 19 Jun 2019 07:56:21 +0800 IronPort-SDR: WbX5OKrCggluSpkE3vDcdEzXkiJN69HLoyXaatBamqhA89kEUnQbPNPks2nwVaGMLYh+krlFTZ KqmoF6+oHxQESu2MHftICm3kRsVip/jYjPRsOeYxCGTpEjFA+Ly5Ge7Z7YH6vT3nK095V7kwh7 8czGckIE+t4IpIHBnY9euyOX6mzDBWu4DrfPGbLAZKuWW7wfq5j/SQlTnwon0gPtUyr+1kr98L wjKUHwHwsORFpu1+WFCgXMqXUNgIFSnazMTUsP3H9S7lB8iP4bABGtJi32GE3+ya8sD4T9Azs8 SvMUFwCIYDARxOhnpfRhYZWe Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 18 Jun 2019 16:55:49 -0700 IronPort-SDR: X9QqDI+0MFZ5BQT0F1H3nB5hZrKCSFGOsdQtGYiEnfVQVeLP+4JjwEfIOSHWB2yUmrejljDYy2 TX0HezWJQFO7d0QLzXa/g2f6LktW6HmU84cIVIMwMZ69gcZsTRcTn+FPnLhhaVxHvDuiRtHFjD T3KZ9ToXDGHRecmgnb5yZecfQjXXYkehYbkQ/Bt4Zcdu42ovKXQyRSBVRQEgP+UEU8G5/g2L0T /gCcAK5QKOHlyjYz1V8tr216jkXX66JaM+OrPijXqJw6ZgaP4ruqfrJLifaWmpSu97b5WBR/k3 FKE= 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; 18 Jun 2019 16:56:21 -0700 From: Alistair Francis To: buildroot@buildroot.org Date: Tue, 18 Jun 2019 16:53:58 -0700 Message-Id: <20190618235358.10613-2-alistair.francis@wdc.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190618235358.10613-1-alistair.francis@wdc.com> References: <20190618235358.10613-1-alistair.francis@wdc.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 --- ...ert-riscv-Use-latest-system-call-ABI.patch | 66 +++++++++++++++++++ configs/qemu_riscv32_virt_defconfig | 9 +-- 2 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 board/qemu/riscv32-virt/0001-Revert-riscv-Use-latest-system-call-ABI.patch 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/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 84f7b6ab9c..77ac411258 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -10,15 +10,10 @@ 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 - # 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_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