Merge "arch: arm: Fix armv7 init code"