Revert "Fix build."

This reverts commit ba417824c65202206646c1bf41e2eecf3e4d32de.
update FA_defconfig
update config
config fixes