Currently, we get the CONFIG_ prefix via the CONFIG_ macro, which means the CONFIG_ prefix is hard-coded at compile time. This goes against having a run-time defined CONFIG_ prefix. Add a function that returns the CONFIG_ prefix to use (but keep the current hard-coded behavior, to be changed in a later patch). To avoid touching all the code that uses the CONFIG_ macro, we just undef it, and define it to be a call to the function.
Unified · Split
| @@ -39,6 +39,12 @@ extern "C" { · 38 unmodified lines | |||
| 39 | #ifndef CONFIG_ | 39 | #ifndef CONFIG_ |
| 40 | #define CONFIG_ "CONFIG_" | 40 | #define CONFIG_ "CONFIG_" |
| 41 | #endif | 41 | #endif |
| 42 | static inline const char *CONFIG_prefix(void) | ||
| 43 | { | ||
| 44 | return CONFIG_; | ||
| 45 | } | ||
| 46 | #undef CONFIG_ | ||
| 47 | #define CONFIG_ CONFIG_prefix() | ||
| 42 | 48 | ||
| 43 | #define TF_COMMAND 0x0001 | 49 | #define TF_COMMAND 0x0001 |
| 44 | #define TF_PARAM 0x0002 | 50 | #define TF_PARAM 0x0002 |