diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2019-07-29 22:16:06 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2019-07-30 04:32:05 +0200 |
| commit | a89bf68e889dd989e486b0a131618f69e5fc26c6 (patch) | |
| tree | 629d01fd1550526f1de21214e630c842128762dd | |
| parent | 94109a95062cb9830dc4452142dc65e905b7433f (diff) | |
| download | rockbox-a89bf68e889dd989e486b0a131618f69e5fc26c6.tar.gz rockbox-a89bf68e889dd989e486b0a131618f69e5fc26c6.zip | |
cleanup: Remove HAVE_MULTIVOLUME from targets with HAVE_MULTIDRIVE
The latter always enables the former.
There are no remaining HAVE_MULTIVOLUME users in-tree.
Change-Id: I0f4fd03a6ffed5c0eb3fb5f916f671bd199f1c8e
| -rw-r--r-- | firmware/export/config/creativezen.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/creativezenxfi.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/creativezenxfi2.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/creativezenxfi3.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index 0033b7d4eb..81f594f76f 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h | |||
| @@ -133,7 +133,6 @@ | |||
| 133 | #define CONFIG_STORAGE STORAGE_SD | 133 | #define CONFIG_STORAGE STORAGE_SD |
| 134 | #define NUM_DRIVES 2 | 134 | #define NUM_DRIVES 2 |
| 135 | #define HAVE_MULTIDRIVE | 135 | #define HAVE_MULTIDRIVE |
| 136 | #define HAVE_MULTIVOLUME | ||
| 137 | #define HAVE_HOTSWAP | 136 | #define HAVE_HOTSWAP |
| 138 | 137 | ||
| 139 | /* todo */ | 138 | /* todo */ |
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index 35bd1efdfb..fbe114d5c7 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h | |||
| @@ -138,7 +138,6 @@ | |||
| 138 | #define CONFIG_STORAGE STORAGE_SD | 138 | #define CONFIG_STORAGE STORAGE_SD |
| 139 | #define NUM_DRIVES 2 | 139 | #define NUM_DRIVES 2 |
| 140 | #define HAVE_MULTIDRIVE | 140 | #define HAVE_MULTIDRIVE |
| 141 | #define HAVE_MULTIVOLUME | ||
| 142 | #define HAVE_HOTSWAP | 141 | #define HAVE_HOTSWAP |
| 143 | 142 | ||
| 144 | /* todo */ | 143 | /* todo */ |
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 3945311e29..9fff106e26 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h | |||
| @@ -140,7 +140,6 @@ | |||
| 140 | #define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD) | 140 | #define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD) |
| 141 | #define NUM_DRIVES 2 | 141 | #define NUM_DRIVES 2 |
| 142 | #define HAVE_MULTIDRIVE | 142 | #define HAVE_MULTIDRIVE |
| 143 | #define HAVE_MULTIVOLUME | ||
| 144 | #define HAVE_HOTSWAP_STORAGE_AS_MAIN | 143 | #define HAVE_HOTSWAP_STORAGE_AS_MAIN |
| 145 | #define HAVE_HOTSWAP | 144 | #define HAVE_HOTSWAP |
| 146 | #define CONFIG_NAND NAND_IMX233 | 145 | #define CONFIG_NAND NAND_IMX233 |
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index d72b41d608..81e1e453b2 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h | |||
| @@ -144,7 +144,6 @@ | |||
| 144 | #define CONFIG_STORAGE STORAGE_SD | 144 | #define CONFIG_STORAGE STORAGE_SD |
| 145 | #define NUM_DRIVES 2 | 145 | #define NUM_DRIVES 2 |
| 146 | #define HAVE_MULTIDRIVE | 146 | #define HAVE_MULTIDRIVE |
| 147 | #define HAVE_MULTIVOLUME | ||
| 148 | #define HAVE_HOTSWAP | 147 | #define HAVE_HOTSWAP |
| 149 | 148 | ||
| 150 | /* Extra threads: touchpad */ | 149 | /* Extra threads: touchpad */ |