Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fb9a4ca9820fd4d7c4906bd393004662451e273e

Authored by H. Peter Anvin
1 parent 7856a16ea0
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

bzip2/lzma: move initrd/ramfs options out of BLK_DEV 

Impact: Partial resolution of build failure

Move the initrd/initramfs configuration options from
drivers/block/Kconfig to usr/Kconfig, since they do not and should not
depend on CONFIG_BLK_DEV.  This fixes builds when CONFIG_BLK_DEV=n.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

Showing 2 changed files with 27 additions and 27 deletions Side-by-side Diff

drivers/block/Kconfig
Diff comments   View file @ fb9a4ca
... ... @@ -358,33 +358,6 @@
358 358 will prevent RAM block device backing store memory from being
359 359 allocated from highmem (only a problem for highmem systems).
360 360  
361   -config RD_GZIP
362   - bool "Initial ramdisk compressed using gzip"
363   - default y
364   - depends on BLK_DEV_INITRD=y
365   - select DECOMPRESS_GZIP
366   - help
367   - Support loading of a gzip encoded initial ramdisk or cpio buffer.
368   - If unsure, say Y.
369   -
370   -config RD_BZIP2
371   - bool "Initial ramdisk compressed using bzip2"
372   - default n
373   - depends on BLK_DEV_INITRD=y
374   - select DECOMPRESS_BZIP2
375   - help
376   - Support loading of a bzip2 encoded initial ramdisk or cpio buffer
377   - If unsure, say N.
378   -
379   -config RD_LZMA
380   - bool "Initial ramdisk compressed using lzma"
381   - default n
382   - depends on BLK_DEV_INITRD=y
383   - select DECOMPRESS_LZMA
384   - help
385   - Support loading of a lzma encoded initial ramdisk or cpio buffer
386   - If unsure, say N.
387   -
388 361 config CDROM_PKTCDVD
389 362 tristate "Packet writing on CD/DVD media"
390 363 depends on !UML
... ... @@ -44,4 +44,31 @@
44 44 owned by group root in the initial ramdisk image.
45 45  
46 46 If you are not sure, leave it set to "0".
  47 +
  48 +config RD_GZIP
  49 + bool "Initial ramdisk compressed using gzip"
  50 + default y
  51 + depends on BLK_DEV_INITRD=y
  52 + select DECOMPRESS_GZIP
  53 + help
  54 + Support loading of a gzip encoded initial ramdisk or cpio buffer.
  55 + If unsure, say Y.
  56 +
  57 +config RD_BZIP2
  58 + bool "Initial ramdisk compressed using bzip2"
  59 + default n
  60 + depends on BLK_DEV_INITRD=y
  61 + select DECOMPRESS_BZIP2
  62 + help
  63 + Support loading of a bzip2 encoded initial ramdisk or cpio buffer
  64 + If unsure, say N.
  65 +
  66 +config RD_LZMA
  67 + bool "Initial ramdisk compressed using lzma"
  68 + default n
  69 + depends on BLK_DEV_INITRD=y
  70 + select DECOMPRESS_LZMA
  71 + help
  72 + Support loading of a lzma encoded initial ramdisk or cpio buffer
  73 + If unsure, say N.