Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9707274718b0d343d93941fb19f9314ef3cffa4b

Authored by Simon Glass
Committed by Tom Rini
1 parent d315628edb
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

fs: Convert CONFIG_CMD_CRAMFS to Kconfig 

This converts the following to Kconfig:
   CONFIG_CMD_CRAMFS

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: imply CMD_CRAMFS for keymile]
Signed-off-by: Tom Rini <trini@konsulko.com>

Showing 14 changed files with 21 additions and 5 deletions Side-by-side Diff

arch/arm/mach-kirkwood/Kconfig
Diff comments   View file @ 9707274
... ... @@ -34,6 +34,7 @@
34 34 config TARGET_KM_KIRKWOOD
35 35 bool "KM_KIRKWOOD Board"
36 36 select BOARD_LATE_INIT
  37 + imply CMD_CRAMFS
37 38  
38 39 config TARGET_NET2BIG_V2
39 40 bool "LaCie 2Big Network v2 NAS Board"
arch/powerpc/cpu/mpc8260/Kconfig
Diff comments   View file @ 9707274
... ... @@ -10,6 +10,7 @@
10 10  
11 11 config TARGET_KM82XX
12 12 bool "Support km82xx"
  13 + imply CMD_CRAMFS
13 14  
14 15 endchoice
15 16  
arch/powerpc/cpu/mpc83xx/Kconfig
Diff comments   View file @ 9707274
... ... @@ -64,12 +64,15 @@
64 64  
65 65 config TARGET_KM8360
66 66 bool "Support km8360"
  67 + imply CMD_CRAMFS
67 68  
68 69 config TARGET_SUVD3
69 70 bool "Support suvd3"
  71 + imply CMD_CRAMFS
70 72  
71 73 config TARGET_TUXX1
72 74 bool "Support tuxx1"
  75 + imply CMD_CRAMFS
73 76  
74 77 config TARGET_TQM834X
75 78 bool "Support TQM834x"
arch/powerpc/cpu/mpc85xx/Kconfig
Diff comments   View file @ 9707274
... ... @@ -321,6 +321,7 @@
321 321 bool "Support kmp204x"
322 322 select ARCH_P2041
323 323 select PHYS_64BIT
  324 + imply CMD_CRAMFS
324 325  
325 326 config TARGET_XPEDITE520X
326 327 bool "Support xpedite520x"
... ... @@ -899,6 +899,16 @@
899 899 U-Boot to actually boot the Operating System. Available commands are
900 900 cbfsinit, cbfsinfo, cbfsls and cbfsload.
901 901  
  902 +config CMD_CRAMFS
  903 + bool "Enable the 'cramfs' command"
  904 + help
  905 + This provides commands for dealing with CRAMFS (Compressed ROM
  906 + filesystem). CRAMFS is useful when space is tight since files are
  907 + compressed. Two commands are provided:
  908 +
  909 + cramfsls - lists files in a cramfs image
  910 + cramfsload - loads a file from a cramfs image
  911 +
902 912 config CMD_EXT2
903 913 bool "ext2 command support"
904 914 help
configs/UCP1020_SPIFLASH_defconfig
Diff comments   View file @ 9707274
... ... @@ -20,6 +20,7 @@
20 20 CONFIG_CMD_DHCP=y
21 21 CONFIG_CMD_MII=y
22 22 CONFIG_CMD_PING=y
  23 +CONFIG_CMD_CRAMFS=y
23 24 CONFIG_CMD_EXT2=y
24 25 CONFIG_CMD_FAT=y
25 26 CONFIG_MTD_NOR_FLASH=y
configs/UCP1020_defconfig
Diff comments   View file @ 9707274
... ... @@ -20,6 +20,7 @@
20 20 CONFIG_CMD_DHCP=y
21 21 CONFIG_CMD_MII=y
22 22 CONFIG_CMD_PING=y
  23 +CONFIG_CMD_CRAMFS=y
23 24 CONFIG_CMD_EXT2=y
24 25 CONFIG_CMD_FAT=y
25 26 CONFIG_MTD_NOR_FLASH=y
configs/sandbox_defconfig
Diff comments   View file @ 9707274
... ... @@ -53,6 +53,7 @@
53 53 CONFIG_CMD_TPM=y
54 54 CONFIG_CMD_TPM_TEST=y
55 55 CONFIG_CMD_CBFS=y
  56 +CONFIG_CMD_CRAMFS=y
56 57 CONFIG_CMD_EXT4_WRITE=y
57 58 CONFIG_MAC_PARTITION=y
58 59 CONFIG_AMIGA_PARTITION=y
configs/sandbox_noblk_defconfig
Diff comments   View file @ 9707274
... ... @@ -56,6 +56,7 @@
56 56 CONFIG_CMD_TPM=y
57 57 CONFIG_CMD_TPM_TEST=y
58 58 CONFIG_CMD_CBFS=y
  59 +CONFIG_CMD_CRAMFS=y
59 60 CONFIG_CMD_EXT2=y
60 61 CONFIG_CMD_EXT4=y
61 62 CONFIG_CMD_EXT4_WRITE=y
configs/sandbox_spl_defconfig
Diff comments   View file @ 9707274
... ... @@ -60,6 +60,7 @@
60 60 CONFIG_CMD_TPM=y
61 61 CONFIG_CMD_TPM_TEST=y
62 62 CONFIG_CMD_CBFS=y
  63 +CONFIG_CMD_CRAMFS=y
63 64 CONFIG_CMD_EXT4_WRITE=y
64 65 CONFIG_MAC_PARTITION=y
65 66 CONFIG_AMIGA_PARTITION=y
include/configs/UCP1020.h
Diff comments   View file @ 9707274
... ... @@ -447,7 +447,6 @@
447 447 #define CONFIG_CMD_IRQ
448 448 #define CONFIG_CMD_REGINFO
449 449 #define CONFIG_CMD_ERRATA
450   -#define CONFIG_CMD_CRAMFS
451 450  
452 451 /*
453 452 * USB
include/configs/km/keymile-common.h
Diff comments   View file @ 9707274
... ... @@ -69,8 +69,6 @@
69 69 #define CONFIG_MTD_DEVICE
70 70 #define CONFIG_MTD_CONCAT
71 71  
72   -#define CONFIG_CMD_CRAMFS
73   -
74 72 #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
75 73 #define CONFIG_KM_DEF_ENV_BOOTPARAMS \
76 74 "actual_bank=0\0"
include/configs/sandbox.h
Diff comments   View file @ 9707274
... ... @@ -35,7 +35,6 @@
35 35 #define CONFIG_FAT_WRITE
36 36 #define CONFIG_FS_EXT4
37 37 #define CONFIG_EXT4_WRITE
38   -#define CONFIG_CMD_CRAMFS
39 38 #define CONFIG_HOST_MAX_DEVICES 4
40 39  
41 40 /*
scripts/config_whitelist.txt
Diff comments   View file @ 9707274
... ... @@ -393,7 +393,6 @@
393 393 CONFIG_CMDLINE_EDITING
394 394 CONFIG_CMDLINE_PS_SUPPORT
395 395 CONFIG_CMDLINE_TAG
396   -CONFIG_CMD_CRAMFS
397 396 CONFIG_CMD_DATE
398 397 CONFIG_CMD_DEFAULTENV_VARS
399 398 CONFIG_CMD_DEKBLOB