projects
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
76b7936
401d1c4
)
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
author
Tom Rini
<trini@konsulko.com>
Mon, 15 Feb 2021 13:19:40 +0000
(08:19 -0500)
committer
Tom Rini
<trini@konsulko.com>
Mon, 15 Feb 2021 15:16:45 +0000
(10:16 -0500)
- Merge the patch to take <asm/global_data.h> out of <common.h>
33 files changed:
1
2
arch/arm/cpu/armv7/ls102xa/cpu.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/lib/bdinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/lib/bootm.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mach-rockchip/sdram.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/m68k/lib/bdinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/lib/bdinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/riscv/cpu/fu540/dram.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/riscv/cpu/generic/dram.c
patch
|
diff1
|
diff2
|
blob
|
history
board/AndesTech/ax25-ae350/ax25-ae350.c
patch
|
diff1
|
diff2
|
blob
|
history
board/Marvell/mvebu_armada-37xx/board.c
patch
|
diff1
|
diff2
|
blob
|
history
board/keymile/common/common.c
patch
|
diff1
|
diff2
|
blob
|
history
board/kontron/sl28/sl28.c
patch
|
diff1
|
diff2
|
blob
|
history
board/lego/ev3/legoev3.c
patch
|
diff1
|
diff2
|
blob
|
history
board/nokia/rx51/rx51.c
patch
|
diff1
|
diff2
|
blob
|
history
board/theadorable/theadorable.c
patch
|
diff1
|
diff2
|
blob
|
history
cmd/bdinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/clk/at91/compat.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/clk/clk_stm32mp1.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/core/device-remove.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/core/root.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/mmc/mv_sdhci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ftmac100.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/pci/pci_mvebu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/serial/serial_sifive.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/smem/msm_smem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/fsl_qspi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/video/meson/meson_vpu.c
patch
|
diff1
|
diff2
|
blob
|
history
include/init.h
patch
|
diff1
|
diff2
|
blob
|
history
include/sysinfo.h
patch
|
diff1
|
diff2
|
blob
|
history
lib/efi_loader/efi_dt_fixup.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/efi_selftest/dtbdump.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/fdtdec.c
patch
|
diff1
|
diff2
|
blob
|
history
test/dm/core.c
patch
|
diff1
|
diff2
|
blob
|
history
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