Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e5177c1 authored by Alexey Brodkin's avatar Alexey Brodkin Committed by Vineet Gupta
Browse files

arc: get rid of DEVTMPFS dependency on INITRAMFS_SOURCE 

Even though DEVTMPFS is required when our pre-built initramfs
is used it is not the case in general. It is perfectly possible
to use initramfs with device nodes already populated or there
could be other usages, see discussion below for more detials:
http://thread.gmane.org/gmane.comp.embedded.openwrt.devel/37819/focus=37821



This change removes mentioned dependency from arch/arc/Kconfig
updating instead those defconfigs that are usually used with this
kind of pre-build initramfs.

And while at it all touched defconfigs were regenerated via
savedefconfig and some options were removed:
 * USB is selected by other options implicitly
 * VGA_CONSOLE is disableb for ARC since
   031e29b5
 * EXT3_FS automatically selects EXT4_FS
 * MTDxxx and JFFS2_FS make no sense for AXS because
   AXS NAND controller is not upstreamed
 * NET_OSCI_LAN is not in upstream as well
 * ARCPGU_xxx options make no sense because ARC PGU is not yet
   in upstream and when it gets there all config options would
   be taken from devicetree

Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent a150b085

arch/arc/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ config ARC 
	select BUILDTIME_EXTABLE_SORT

	select COMMON_CLK

	select CLONE_BACKWARDS

	# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev

	select DEVTMPFS if !INITRAMFS_SOURCE=""

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select GENERIC_FIND_FIRST_BIT

arch/arc/configs/axs101_defconfig

+1 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set
@@ -73,7 +74,6 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_DESIGNWARE_PLATFORM=y

# CONFIG_HWMON is not set

CONFIG_FB=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y
@@ -91,12 +91,10 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_DW=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

arch/arc/configs/axs103_defconfig

+1 −9
Original line number Diff line number Diff line
@@ -39,14 +39,10 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_AXS=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y
@@ -78,14 +74,12 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_DESIGNWARE_PLATFORM=y

# CONFIG_HWMON is not set

CONFIG_FB=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y
@@ -97,12 +91,10 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_DW=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

arch/arc/configs/axs103_smp_defconfig

+1 −9
Original line number Diff line number Diff line
@@ -40,14 +40,10 @@ CONFIG_IP_PNP_RARP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_IPV6 is not set

CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_AXS=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y
@@ -79,14 +75,12 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_DESIGNWARE_PLATFORM=y

# CONFIG_HWMON is not set

CONFIG_FB=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y
@@ -98,12 +92,10 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_DW=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

arch/arc/configs/nsim_700_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ CONFIG_DEFAULT_HOSTNAME="ARCLinux" 
# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -26,7 +27,6 @@ CONFIG_ARC_PLAT_SIM=y 
CONFIG_ARC_BUILTIN_DTB_NAME="nsim_700"

CONFIG_PREEMPT=y

# CONFIG_COMPACTION is not set

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -34,6 +34,7 @@ CONFIG_UNIX_DIAG=y 
CONFIG_NET_KEY=y

CONFIG_INET=y

# CONFIG_IPV6 is not set

CONFIG_DEVTMPFS=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FIRMWARE_IN_KERNEL is not set
@@ -51,7 +52,6 @@ CONFIG_SERIAL_ARC=y 
CONFIG_SERIAL_ARC_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set
@@ -63,4 +63,3 @@ CONFIG_NFS_FS=y 
# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_DEBUG_PREEMPT is not set
 
CONFIG_XZ_DEC=y