Unverified Commit d4cb5d36 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Clean up the defconfigs 

It's been a while since cleaning up the defconfigs, so I manually
checked up on each change.  This found a handful of minor issues, which
have been fixed in-line.
parents 5a7ac592 ce3fe7a4

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ choice 
		depends on 32BIT

		bool "1GiB"

	config MAXPHYSMEM_2GB

		depends on 64BIT && CMODEL_MEDLOW

		depends on 64BIT

		bool "2GiB"

	config MAXPHYSMEM_128GB

		depends on 64BIT && CMODEL_MEDANY

arch/riscv/configs/defconfig

+6 −7
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y 
CONFIG_POSIX_MQUEUE=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BPF_SYSCALL=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_CGROUPS=y
@@ -13,10 +14,10 @@ CONFIG_USER_NS=y 
CONFIG_CHECKPOINT_RESTORE=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_BPF_SYSCALL=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_SOC_MICROCHIP_POLARFIRE=y

CONFIG_SOC_SIFIVE=y

CONFIG_SOC_VIRT=y

CONFIG_SOC_MICROCHIP_POLARFIRE=y

CONFIG_SMP=y

CONFIG_HOTPLUG_CPU=y

CONFIG_JUMP_LABEL=y
@@ -68,14 +69,14 @@ CONFIG_HW_RANDOM=y 
CONFIG_HW_RANDOM_VIRTIO=y

CONFIG_SPI=y

CONFIG_SPI_SIFIVE=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_SIFIVE=y

# CONFIG_PTP_1588_CLOCK is not set

CONFIG_POWER_RESET=y

CONFIG_DRM=m

CONFIG_DRM_RADEON=m

CONFIG_DRM_NOUVEAU=m

CONFIG_DRM_VIRTIO_GPU=m

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y
@@ -86,10 +87,10 @@ CONFIG_USB_OHCI_HCD=y 
CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_UAS=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_CADENCE=y

CONFIG_MMC=y

CONFIG_MMC_SPI=y

CONFIG_RTC_CLASS=y

CONFIG_VIRTIO_PCI=y
@@ -140,5 +141,3 @@ CONFIG_RCU_EQS_DEBUG=y 
# CONFIG_FTRACE is not set

# CONFIG_RUNTIME_TESTING_MENU is not set

CONFIG_MEMTEST=y
 
# CONFIG_SYSFS_SYSCALL is not set

CONFIG_EFI=y

arch/riscv/configs/nommu_k210_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ CONFIG_EMBEDDED=y 
CONFIG_SLOB=y

# CONFIG_MMU is not set

CONFIG_SOC_CANAAN=y

CONFIG_SOC_CANAAN_K210_DTB_SOURCE="k210_generic"

CONFIG_MAXPHYSMEM_2GB=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2
@@ -75,7 +74,6 @@ CONFIG_LEDS_GPIO=y 
CONFIG_LEDS_USER=y

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_SURFACE_PLATFORMS is not set

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

arch/riscv/configs/nommu_k210_sdcard_defconfig

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ CONFIG_EMBEDDED=y 
CONFIG_SLOB=y

# CONFIG_MMU is not set

CONFIG_SOC_CANAAN=y

CONFIG_SOC_CANAAN_K210_DTB_SOURCE="k210_generic"

CONFIG_MAXPHYSMEM_2GB=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2
@@ -30,7 +29,6 @@ CONFIG_CMDLINE_FORCE=y 
# CONFIG_SECCOMP is not set

# CONFIG_STACKPROTECTOR is not set

# CONFIG_GCC_PLUGINS is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

CONFIG_BINFMT_FLAT=y
@@ -72,7 +70,6 @@ CONFIG_LEDS_GPIO=y 
CONFIG_LEDS_USER=y

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_SURFACE_PLATFORMS is not set

CONFIG_EXT2_FS=y

# CONFIG_FILE_LOCKING is not set

# CONFIG_DNOTIFY is not set

arch/riscv/configs/nommu_virt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ CONFIG_SMP=y 
CONFIG_CMDLINE="root=/dev/vda rw earlycon=uart8250,mmio,0x10000000,115200n8 console=ttyS0"

CONFIG_CMDLINE_FORCE=y

CONFIG_JUMP_LABEL=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_MSDOS_PARTITION is not set

# CONFIG_EFI_PARTITION is not set