[U-Boot] [PATCH v2 1/2] icore: configs: Fix merge conflict issue