diff options
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r-- | firmware/export/config.h | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index cad25facb0..c6bd74ba34 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -868,6 +868,18 @@ Lyre prototype 1 */ | |||
868 | #define CONFIG_STORAGE_MULTI | 868 | #define CONFIG_STORAGE_MULTI |
869 | #endif | 869 | #endif |
870 | 870 | ||
871 | #if defined(CONFIG_STORAGE_MULTI) && !defined(HAVE_MULTIDRIVE) | ||
872 | #define HAVE_MULTIDRIVE | ||
873 | #endif | ||
874 | |||
875 | #if defined(HAVE_MULTIDRIVE) && !defined(NUM_DRIVES) | ||
876 | #error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES | ||
877 | #endif | ||
878 | |||
879 | #ifndef NUM_DRIVES | ||
880 | #define NUM_DRIVES 1 | ||
881 | #endif | ||
882 | |||
871 | #if !defined(HAVE_MULTIVOLUME) | 883 | #if !defined(HAVE_MULTIVOLUME) |
872 | #if defined(HAVE_MULTIDRIVE) | 884 | #if defined(HAVE_MULTIDRIVE) |
873 | /* Multidrive strongly implies multivolume */ | 885 | /* Multidrive strongly implies multivolume */ |
@@ -886,13 +898,6 @@ Lyre prototype 1 */ | |||
886 | #else | 898 | #else |
887 | #define NUM_VOLUMES_PER_DRIVE 1 | 899 | #define NUM_VOLUMES_PER_DRIVE 1 |
888 | #endif | 900 | #endif |
889 | #if defined(CONFIG_STORAGE_MULTI) && !defined(HAVE_MULTIDRIVE) | ||
890 | #define HAVE_MULTIDRIVE | ||
891 | #endif | ||
892 | |||
893 | #if defined(HAVE_MULTIDRIVE) && !defined(NUM_DRIVES) | ||
894 | #error HAVE_MULTIDRIVE needs to have an explicit NUM_DRIVES | ||
895 | #endif | ||
896 | 901 | ||
897 | /* note to remove multi-partition booting this could be changed to MULTIDRIVE */ | 902 | /* note to remove multi-partition booting this could be changed to MULTIDRIVE */ |
898 | #if defined(HAVE_BOOTDATA) && defined(BOOT_REDIR) && defined(HAVE_MULTIVOLUME) | 903 | #if defined(HAVE_BOOTDATA) && defined(BOOT_REDIR) && defined(HAVE_MULTIVOLUME) |
@@ -905,10 +910,6 @@ Lyre prototype 1 */ | |||
905 | # define MULTIBOOT_MIN_VOLUME 0 | 910 | # define MULTIBOOT_MIN_VOLUME 0 |
906 | #endif | 911 | #endif |
907 | 912 | ||
908 | #ifndef NUM_DRIVES | ||
909 | #define NUM_DRIVES 1 | ||
910 | #endif | ||
911 | |||
912 | #define NUM_VOLUMES (NUM_DRIVES * NUM_VOLUMES_PER_DRIVE) | 913 | #define NUM_VOLUMES (NUM_DRIVES * NUM_VOLUMES_PER_DRIVE) |
913 | 914 | ||
914 | #if defined(BOOTLOADER) && defined(HAVE_ADJUSTABLE_CPU_FREQ) | 915 | #if defined(BOOTLOADER) && defined(HAVE_ADJUSTABLE_CPU_FREQ) |
@@ -942,31 +943,35 @@ Lyre prototype 1 */ | |||
942 | #ifdef HAVE_BOOTLOADER_USB_MODE | 943 | #ifdef HAVE_BOOTLOADER_USB_MODE |
943 | /* Priority in bootloader is wanted */ | 944 | /* Priority in bootloader is wanted */ |
944 | #define HAVE_PRIORITY_SCHEDULING | 945 | #define HAVE_PRIORITY_SCHEDULING |
946 | |||
945 | #if (CONFIG_CPU == S5L8702) | 947 | #if (CONFIG_CPU == S5L8702) |
946 | #define USB_DRIVER_CLOSE | 948 | #define USB_DRIVER_CLOSE |
947 | #else | 949 | #else |
948 | #define USB_STATUS_BY_EVENT | 950 | #define USB_STATUS_BY_EVENT |
949 | #define USB_DETECT_BY_REQUEST | 951 | #define USB_DETECT_BY_REQUEST |
950 | #endif | 952 | #endif |
953 | |||
951 | #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC | 954 | #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC |
952 | #define INCLUDE_TIMEOUT_API | 955 | #define INCLUDE_TIMEOUT_API |
953 | #define USB_DRIVER_CLOSE | 956 | #define USB_DRIVER_CLOSE |
954 | #endif | 957 | #endif |
958 | |||
955 | #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_TNETV105 | 959 | #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_TNETV105 |
956 | #define INCLUDE_TIMEOUT_API | 960 | #define INCLUDE_TIMEOUT_API |
957 | #define USB_DRIVER_CLOSE | 961 | #define USB_DRIVER_CLOSE |
958 | #endif | 962 | #endif |
963 | |||
959 | #if CONFIG_CPU == X1000 | 964 | #if CONFIG_CPU == X1000 |
960 | #define USB_DRIVER_CLOSE | 965 | #define USB_DRIVER_CLOSE |
961 | #endif | 966 | #endif |
962 | #endif | 967 | |
968 | #endif /* BOOTLOADER_USB_MODE */ | ||
963 | 969 | ||
964 | #else /* !BOOTLOADER */ | 970 | #else /* !BOOTLOADER */ |
965 | 971 | ||
966 | #define HAVE_EXTENDED_MESSAGING_AND_NAME | 972 | #define HAVE_EXTENDED_MESSAGING_AND_NAME |
967 | #define HAVE_WAKEUP_EXT_CB | 973 | #define HAVE_WAKEUP_EXT_CB |
968 | 974 | ||
969 | |||
970 | #if defined(ASSEMBLER_THREADS) \ | 975 | #if defined(ASSEMBLER_THREADS) \ |
971 | || defined(HAVE_WIN32_FIBER_THREADS) \ | 976 | || defined(HAVE_WIN32_FIBER_THREADS) \ |
972 | || defined(HAVE_SIGALTSTACK_THREADS) | 977 | || defined(HAVE_SIGALTSTACK_THREADS) |
@@ -1001,7 +1006,7 @@ Lyre prototype 1 */ | |||
1001 | #endif /* CONFIG_USB == */ | 1006 | #endif /* CONFIG_USB == */ |
1002 | #endif /* HAVE_USBSTACK */ | 1007 | #endif /* HAVE_USBSTACK */ |
1003 | 1008 | ||
1004 | #endif /* BOOTLOADER */ | 1009 | #endif /* !BOOTLOADER */ |
1005 | 1010 | ||
1006 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) || (CONFIG_CPU == JZ4760B) \ | 1011 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) || (CONFIG_CPU == JZ4760B) \ |
1007 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ | 1012 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ |