From patchwork Wed Mar 20 23:05:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1059603 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="QYlxaqQp"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="gLoi2oFp"; 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 44Plrr2mjbz9sR2 for ; Thu, 21 Mar 2019 10:05:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EECFE30AF6; Wed, 20 Mar 2019 23:05:45 +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 G82ppsSXQoqS; Wed, 20 Mar 2019 23:05:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9F6D530A41; Wed, 20 Mar 2019 23:05:33 +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 507BD1BF40F for ; Wed, 20 Mar 2019 23:05:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 44F3286B43 for ; Wed, 20 Mar 2019 23:05:29 +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 ts36lGGOojQh for ; Wed, 20 Mar 2019 23:05:23 +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 C325884E38 for ; Wed, 20 Mar 2019 23:05:23 +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=1553123123; x=1584659123; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=HyRIiG9QOU58iJHDzCN+l5q6/6Zf68rZmMANmfCuW+M=; b=QYlxaqQp9OazBAAIDKN+Q0tiMXhmh/i8JSxgGhPCYm/S/6cSqnTp25Sx 9aCDqjFjP7Lqn8DJE61DxmNh2L7XsF2tUp4F9+DZ+gZGxJWCLuBZ4qtUc Ce3zEX8rlUWTkCo8XHHlQRj5A8XlyQvk76xhNB6/eg9nZcmIbm4wzHzwJ se5NKjGGyyoFlEKUtjbvd8k1wd1qHhper6yhafkS1XpFi5vQV56mqy7Gd kfXzBeJEm7e9uZX7Tu866jffmAHDimOf5eq1lZplBqNJcda3NzKOHmwon wTvbvPnV8zyXz+ZkDLLNE+R72eR9SMEdVv6TfxNFO+lJPx+OezFUwiKMO Q==; X-IronPort-AV: E=Sophos;i="5.60,250,1549900800"; d="scan'208";a="105615339" Received: from mail-bn3nam04lp2059.outbound.protection.outlook.com (HELO NAM04-BN3-obe.outbound.protection.outlook.com) ([104.47.46.59]) by ob1.hgst.iphmx.com with ESMTP; 21 Mar 2019 07:05:22 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FWC5qfYy0+/g9X48yBauvcFGCXd+RlGnL+GRzMRG2yI=; b=gLoi2oFppHcW7Z6SRiMi6CXbUNVsZuHdSPQ8MVoGP1Vg7JrVaNAtbjKbVCzz2kVX5oBOO++VOEbcIJgVtJ9rBI+BV0Xh8DrV+kvXEnxy3nAFnW2g+tFqDB/gPOqiXhfJbSq6KiaRMQuHJXFFBxqexNAuRLLfJI0pMLqus19Z4EQ= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB4951.namprd04.prod.outlook.com (52.135.232.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1730.15; Wed, 20 Mar 2019 23:05:21 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::44e8:bd21:17b:348c%4]) with mapi id 15.20.1730.013; Wed, 20 Mar 2019 23:05:21 +0000 From: Alistair Francis To: "mark.corbin@embecosm.com" , "buildroot@buildroot.org" Thread-Topic: [PATCH v6 1/5] board/qemu/riscv32-virt: Convert defconfig into a fragment Thread-Index: AQHU33FkXI5VptzfrkCXCWOzfKTiOw== Date: Wed, 20 Mar 2019 23:05:21 +0000 Message-ID: <20190320230422.13592-1-alistair.francis@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR07CA0057.namprd07.prod.outlook.com (2603:10b6:a03:60::34) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.44.250] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0a321849-ca72-4122-a8b6-08d6ad8886d6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB4951; x-ms-traffictypediagnostic: BYAPR04MB4951: x-ms-exchange-purlcount: 1 wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 098291215C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(136003)(346002)(366004)(396003)(39860400002)(189003)(199004)(6506007)(386003)(50226002)(68736007)(106356001)(476003)(53936002)(2616005)(45080400002)(6486002)(8936002)(6436002)(6512007)(4326008)(6306002)(97736004)(52116002)(99286004)(14454004)(105586002)(3846002)(6116002)(66066001)(14444005)(7736002)(256004)(102836004)(5660300002)(110136005)(2501003)(26005)(25786009)(305945005)(54906003)(36756003)(1076003)(71190400001)(72206003)(44832011)(2906002)(478600001)(71200400001)(486006)(81156014)(81166006)(66574012)(316002)(186003)(86362001)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB4951; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 9HLQa763RXesysiDeau3Uf6Uw2XQF9cKzBgNo72Q21GVuQHcOaxoff8EwNMHInqCxBaNzJQi1qGn9Jlt3ifJ4j8codIY2gXjjt9ce4DarSiNqXEe/xSKt5kwBUX2ZTRHjs2ra5moe3SCq0peLbFGaPB97XP8nETLnKD5xRM/fB/mz8ikiv6MA5mb877DOHweEG3VlpKwelCGGzlu/gRtTiuiCjYFRw14e3olBctqurfuk42J20k03N769ceL6WVKYBm5tTe2LsxVlS8ejrJd5KOZg+kUVusfcBy00BXpKXsMoaEbc/OrI+zxiQ03KPQevKPzPJ7cMXwY5iJD1xwrvtXXzXJixWdrwmfBOh2xCaSFIjFeTwEKjwNycuO+f5QWVIpP7ESMgbpH0gHK3+951OE6AvU3wFLs5xCItmQsvUs= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a321849-ca72-4122-a8b6-08d6ad8886d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Mar 2019 23:05:21.0797 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB4951 Subject: [Buildroot] [PATCH v6 1/5] board/qemu/riscv32-virt: Convert defconfig into a fragment 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: Atish Patra , Alistair Francis , "alistair23@gmail.com" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Convert the config to the arch defconfig plus a fragment. When this fragment is applied we will generate the same config as we previously did. Signed-off-by: Alistair Francis --- board/qemu/riscv32-virt/linux.config | 23 ---- board/qemu/riscv32-virt/linux.config.fragment | 104 ++++++++++++++++++ configs/qemu_riscv32_virt_defconfig | 4 +- 3 files changed, 106 insertions(+), 25 deletions(-) delete mode 100644 board/qemu/riscv32-virt/linux.config create mode 100644 board/qemu/riscv32-virt/linux.config.fragment diff --git a/board/qemu/riscv32-virt/linux.config b/board/qemu/riscv32-virt/linux.config deleted file mode 100644 index c25583f768..0000000000 --- a/board/qemu/riscv32-virt/linux.config +++ /dev/null @@ -1,23 +0,0 @@ -CONFIG_ARCH_RV32I=y -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PCI=y -CONFIG_SYSVIPC=y -CONFIG_NET=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_WIRELESS is not set -CONFIG_VIRTIO_BLK=y -CONFIG_NETDEVICES=y -CONFIG_VIRTIO_NET=y -# CONFIG_ETHERNET is not set -# CONFIG_WLAN is not set -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_VIRT_DRIVERS=y -CONFIG_VIRTIO_MMIO=y -CONFIG_EXT2_FS=y -CONFIG_EXT4_FS=y -CONFIG_TMPFS=y diff --git a/board/qemu/riscv32-virt/linux.config.fragment b/board/qemu/riscv32-virt/linux.config.fragment new file mode 100644 index 0000000000..2ecc83c8e1 --- /dev/null +++ b/board/qemu/riscv32-virt/linux.config.fragment @@ -0,0 +1,104 @@ +CONFIG_ARCH_RV32I=y +# CONFIG_ARCH_RV64I is not set +# CONFIG_ATA is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_BLK_DEV_INITRD is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BPF_SYSCALL is not set +# CONFIG_CGROUPS is not set +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_CMODEL_MEDANY is not set +CONFIG_CMODEL_MEDLOW=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_ECHAINIV=y +CONFIG_CRYPTO_ENGINE=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_SHA256=y +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DRM is not set +# CONFIG_ETHERNET is not set +# CONFIG_EXPERT is not set +CONFIG_EXT2_FS=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_FB is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_FTRACE is not set +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +CONFIG_HID_EZKEY=y +CONFIG_HID_ITE=y +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LOGITECH=y +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_REDRAGON=y +# CONFIG_HVC_RISCV_SBI is not set +CONFIG_HW_RANDOM=y +# CONFIG_I2C is not set +# CONFIG_IKCONFIG is not set +CONFIG_INPUT_FF_MEMLESS=y +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_PNP is not set +# CONFIG_KEYS is not set +CONFIG_MAXPHYSMEM_2GB=y +# CONFIG_MDIO_DEVICE is not set +# CONFIG_MODULES is not set +# CONFIG_MSDOS_FS is not set +# CONFIG_NETLINK_DIAG is not set +# CONFIG_NFS_FS is not set +# CONFIG_NLS is not set +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PCIE_XILINX is not set +CONFIG_PGTABLE_LEVELS=2 +# CONFIG_PHYLIB is not set +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_PRINTK_TIME is not set +# CONFIG_PROC_CHILDREN is not set +# CONFIG_RAS is not set +# CONFIG_SCSI is not set +# CONFIG_SIFIVE_PLIC is not set +# CONFIG_SYNC_FILE is not set +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_TMPFS_XATTR is not set +# CONFIG_USB is not set +# CONFIG_USER_NS is not set +# CONFIG_VFAT_FS is not set +CONFIG_VIRT_DRIVERS=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_WIRELESS is not set +# CONFIG_WLAN is not set +# CONFIG_XZ_DEC is not set +CONFIG_32BIT=y +# CONFIG_EXT2_FS_XATTR 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_HID_LOGITECH_HIDPP is not set +CONFIG_LBDAF=y +# CONFIG_LOGIG940_FF is not set +# CONFIG_LOGIRUMBLEPAD2_FF is not set +# CONFIG_LOGITECH_FF is not set +# CONFIG_LOGIWHEELS_FF is not set + diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 6f9a61b11c..fab152e50a 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -18,8 +18,8 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/riscv32-virt/linux.config.fragment" # Bootloader BR2_TARGET_RISCV_PK=y