Merge branch '2021-02-02-drop-asm_global_data-when-unused'

- Merge the patch to take <asm/global_data.h> out of <common.h>

diff --cc arch/arm/cpu/armv7/ls102xa/cpu.c
Simple merge

diff --cc arch/arm/lib/bdinfo.c
Simple merge

diff --cc arch/arm/lib/bootm.c
Simple merge

diff --cc arch/arm/mach-rockchip/sdram.c
Simple merge

diff --cc arch/m68k/lib/bdinfo.c
Simple merge

diff --cc arch/powerpc/lib/bdinfo.c
Simple merge

diff --cc arch/riscv/cpu/fu540/dram.c
Simple merge

diff --cc arch/riscv/cpu/generic/dram.c
Simple merge

diff --cc board/AndesTech/ax25-ae350/ax25-ae350.c
Simple merge

diff --cc board/Marvell/mvebu_armada-37xx/board.c
Simple merge

diff --cc board/keymile/common/common.c
Simple merge

diff --cc board/kontron/sl28/sl28.c
Simple merge

diff --cc board/lego/ev3/legoev3.c
Simple merge

diff --cc board/nokia/rx51/rx51.c
Simple merge

diff --cc board/theadorable/theadorable.c
Simple merge

diff --cc cmd/bdinfo.c
Simple merge

diff --cc drivers/clk/at91/compat.c
Simple merge

diff --cc drivers/clk/clk_stm32mp1.c
Simple merge

diff --cc drivers/core/device-remove.c
Simple merge

diff --cc drivers/core/root.c
Simple merge

diff --cc drivers/mmc/mv_sdhci.c
Simple merge

diff --cc drivers/net/ftmac100.c
Simple merge

diff --cc drivers/pci/pci_mvebu.c
Simple merge

diff --cc drivers/serial/serial_sifive.c
Simple merge

diff --cc drivers/smem/msm_smem.c
Simple merge

diff --cc drivers/spi/fsl_qspi.c
Simple merge

diff --cc drivers/video/meson/meson_vpu.c
Simple merge

diff --cc include/init.h
Simple merge

diff --cc include/sysinfo.h
Simple merge

diff --cc lib/efi_loader/efi_dt_fixup.c
Simple merge

diff --cc lib/efi_selftest/dtbdump.c
index 38ab9f8bf0ed33918d7e49493fd72897f4a2a288,844d08246ee3367192dfad9d2b5eff5e64e444bd..f6ddaa30726c47db57c7c5ca8187169493591762
--- 1/lib/efi_selftest/dtbdump.c
--- 2/lib/efi_selftest/dtbdump.c
+++ b/lib/efi_selftest/dtbdump.c
@@@ -9,7 -9,7 +9,8 @@@
  #include <common.h>
  #include <efi_api.h>
  #include <efi_dt_fixup.h>
 +#include <part.h>
+ #include <linux/libfdt.h>
  
  #define BUFFER_SIZE 64
  #define ESC 0x17

diff --cc lib/fdtdec.c
Simple merge

diff --cc test/dm/core.c
Simple merge