arch: revert some change to check boot problem.

Change-Id: I9311135f7c7295db9e9532d70ba5125b3c071dfb