From d04c37b74db30a1756f15dc313b51e28a0b286c1 Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Mon, 11 Dec 2017 13:12:19 -0800 Subject: [PATCH] Re-build linux_defconfig This shouldn't change any functionality, it just makes the next diff easier to see. --- .gitmodules | 3 +++ conf/linux_defconfig | 55 ++++++++++++++------------------------------ riscv-qemu | 1 + 3 files changed, 21 insertions(+), 38 deletions(-) create mode 160000 riscv-qemu diff --git a/.gitmodules b/.gitmodules index c245a1c..352e6b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "riscv-fesvr"] path = riscv-fesvr url = https://github.com/riscv/riscv-fesvr.git +[submodule "riscv-qemu"] + path = riscv-qemu + url = git://github.com/riscv/riscv-qemu.git diff --git a/conf/linux_defconfig b/conf/linux_defconfig index b2f71ea..6b09fd7 100644 --- a/conf/linux_defconfig +++ b/conf/linux_defconfig @@ -1,6 +1,9 @@ CONFIG_SMP=y # CONFIG_COMPACTION is not set CONFIG_HZ_100=y +CONFIG_PCI=y +CONFIG_PCI_DEBUG=y +CONFIG_PCIE_XILINX=y CONFIG_CROSS_COMPILE="riscv64-unknown-linux-gnu-" CONFIG_DEFAULT_HOSTNAME="ucbvax" # CONFIG_CROSS_MEMORY_ATTACH is not set @@ -14,29 +17,35 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y -# CONFIG_EFI_PARTITION is not set # CONFIG_IOSCHED_DEADLINE is not set CONFIG_NET=y +CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_INET_XFRM_MODE_TRANSPORT is not set # CONFIG_INET_XFRM_MODE_TUNNEL is not set # CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_INET_LRO is not set # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set -# CONFIG_WIRELESS is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FIRMWARE_IN_KERNEL is not set -# CONFIG_BLK_DEV is not set -# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_SIL24=y +CONFIG_NETDEVICES=y +CONFIG_E1000E=y +CONFIG_R8169=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_VT is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set -# CONFIG_USB_SUPPORT is not set +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT3_FS=y # CONFIG_FILE_LOCKING is not set @@ -46,40 +55,10 @@ CONFIG_EXT3_FS=y CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set # CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_EARLY_PRINTK=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="earlyprintk" CONFIG_PRINTK_TIME=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_SECTION_MISMATCH=y -CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="earlyprintk" -CONFIG_FRAME_POINTER=y CONFIG_STACKTRACE=y -# CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set -CONFIG_PCI=y -CONFIG_PCI_DEBUG=y -CONFIG_USB_HID=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PCI=y -CONFIG_USB_EHCI_HCD=y -CONFIG_PACKET=y -CONFIG_NETDEVICES=y -CONFIG_NET_CORE=y -CONFIG_ETHERNET=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000E=y -CONFIG_PCIE_XILINX=y -CONFIG_R8169=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_USB_STORAGE=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_SD=y -CONFIG_EFI_PARTITION=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_SIL24=y diff --git a/riscv-qemu b/riscv-qemu new file mode 160000 index 0000000..2ab9055 --- /dev/null +++ b/riscv-qemu @@ -0,0 +1 @@ +Subproject commit 2ab905517f367c4ac60603080c4d9abec658a647