mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
init: simplify initramfs.o build rule
CONFIG_BLK_DEV_INITRD is known to be enabled in the else branch, so there is no need to use obj-$(CONFIG_BLK_DEV_INITRD). Use obj-y directly to make the build rule clearer. Also, reorder the condition to make the code easier to follow. No functional change. Link: https://lore.kernel.org/[email protected] Signed-off-by: Yuntao Wang <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Nicolas Schier <[email protected]> Cc: Nathan Chancellor <[email protected]>
This commit is contained in:
committed by
Andrew Morton
parent
7c3f4d699f
commit
a7f476e262
+3
-3
@@ -6,10 +6,10 @@
|
||||
ccflags-y := -fno-function-sections -fno-data-sections
|
||||
|
||||
obj-y := main.o version.o mounts.o
|
||||
ifneq ($(CONFIG_BLK_DEV_INITRD),y)
|
||||
obj-y += noinitramfs.o
|
||||
ifeq ($(CONFIG_BLK_DEV_INITRD),y)
|
||||
obj-y += initramfs.o
|
||||
else
|
||||
obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o
|
||||
obj-y += noinitramfs.o
|
||||
endif
|
||||
obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o
|
||||
obj-$(CONFIG_INITRAMFS_TEST) += initramfs_test.o
|
||||
|
||||
Reference in New Issue
Block a user