Add more detection of more ROMs

Change-Id: I761773b256f4cc5f25601d7443d57cb962bb8e53