diff options
| author | Tom Rini | 2021-04-29 11:31:06 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-04-29 11:31:06 -0400 |
| commit | f3a0d2c1af630cc09a34c2159aa2dfa12b831762 (patch) | |
| tree | 08a339ed98c9daeb06d4471ea6a01b42cae37842 /arch/arm | |
| parent | 3d2f8bc673d8a8c0ecb2ba27d21f8c54152281ca (diff) | |
| parent | b00bad9dc81ee0337761cc50443dffa22a6cdedf (diff) | |
Merge tag 'xilinx-for-v2021.07-rc2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze
Xilinx changes for v2021.07-rc2
xilinx:
- Enable saving variables based on bootmode
- Cleanup usb dfu setup and wire it up with usb bootmode
- Fix bootscript address logic
- Remove GD references (spi, Versal)
- Enable capsule update
clk:
- Small Kconfig fix
net:
- Fix gmii2rgmii bridge binding
usb:
- Propagate error (dfu gadget)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-versal/mp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-versal/mp.c b/arch/arm/mach-versal/mp.c index c97c311d313..9b0518d6a2c 100644 --- a/arch/arm/mach-versal/mp.c +++ b/arch/arm/mach-versal/mp.c @@ -5,13 +5,10 @@ */ #include <common.h> -#include <asm/global_data.h> #include <asm/io.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> -DECLARE_GLOBAL_DATA_PTR; - #define HALT 0 #define RELEASE 1 |