some removed options were still referenced in config.c or the ARM. (cherry picked from commit 69e25f41ae)
69e25f41ae