[U-Boot] [Patch 0/7] Resolve conflict for merging

[York Sun]

This is v2 patch to resolve merge conflict. Once merged, the ad-hoc
config error should not appear. Since v1, another 3 macros are
fixed.

[PATCH 1/7] armv8: ls1046a: Convert CONFIG_LS1046A to Kconfig option
[PATCH 2/7] driver: ddr: fsl_mmdc: Pass board parameters through data
[PATCH 3/7] armv8: ls1012a: Convert CONFIG_LS1012A to Kconfig option
[PATCH 4/7] Convert CONFIG_SYS_FSL_ERRATUM_A010315 to Kconfig option
[PATCH 5/7] armv8: ls1046ardb_emmc: Fix a typo in defconfig
[PATCH 6/7] armv7: ls1021a: Convert CONFIG_LS1_DEEP_SLEEP to Kconfig
[PATCH 7/7] armv7: ls102xa: Rename GIC_ADDR and DCSR_RCPM_ADDR