diff options
author | Tom Rini | 2016-03-14 19:21:44 -0400 |
---|---|---|
committer | Tom Rini | 2016-03-14 19:21:44 -0400 |
commit | 88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch) | |
tree | 0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /include/configs | |
parent | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff) | |
parent | 608e399fdef82e983db44c5cb8f5e772bba870e2 (diff) |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/UCP1020.h | 1 | ||||
-rw-r--r-- | include/configs/km/keymile-common.h | 1 | ||||
-rw-r--r-- | include/configs/sandbox.h | 7 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index b08072401b6..139e6297306 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -484,7 +484,6 @@ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ERRATA #define CONFIG_CMD_CRAMFS -#define CONFIG_CRAMFS_CMDLINE /* * USB diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 91b29b35bae..5edc8f68a90 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -83,7 +83,6 @@ #define CONFIG_MTD_CONCAT #define CONFIG_CMD_CRAMFS -#define CONFIG_CRAMFS_CMDLINE #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS #define CONFIG_KM_DEF_ENV_BOOTPARAMS \ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index d59beb80dd3..cc224674421 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -43,6 +43,8 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT4 #define CONFIG_CMD_EXT4_WRITE +#define CONFIG_CMD_CBFS +#define CONFIG_CMD_CRAMFS #define CONFIG_CMD_PART #define CONFIG_DOS_PARTITION #define CONFIG_HOST_MAX_DEVICES 4 @@ -52,8 +54,11 @@ #define CONFIG_CMD_GPT #define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION +#define CONFIG_AMIGA_PARTITION #define CONFIG_DOS_PARTITION +#define CONFIG_EFI_PARTITION +#define CONFIG_ISO_PARTITION +#define CONFIG_MAC_PARTITION /* * Size of malloc() pool, before and after relocation |