diff options
author | Tom Rini <trini@konsulko.com> | 2019-10-16 18:10:31 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-10-16 18:10:31 -0400 |
commit | c83b1bb923421e95e499b22b010d2f9f463c1226 (patch) | |
tree | 48860f46e83dc30d9a77fac61c979fb3625588d7 /arch | |
parent | d2a93a88631929169d3ef1c537430330404f96f7 (diff) | |
parent | d11ef4d54cab0e740efbceb9c6b5697a41770eea (diff) |
Merge tag 'dm-pull-15oct19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
binman enhancements:
- Dropping some test Elf files and building them from source instead
- Refactoring of x86 16-bit entries
- Support for SPL symbols within sections
- Handle the 'notes' sections and hidden symbols in recent binutils
- Improved error reporting with a tool fails
libfdt and documentation fixes
vboot required-key test
driver model power-domain controls
patman Message-Id enhancement
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sandbox/dts/test.dts | 24 | ||||
-rw-r--r-- | arch/sandbox/include/asm/u-boot-sandbox.h | 2 | ||||
-rw-r--r-- | arch/x86/dts/u-boot.dtsi | 9 |
3 files changed, 24 insertions, 11 deletions
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 5d9ab3724f..42b41fbf62 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -393,19 +393,21 @@ mbox-names = "other", "test"; }; - cpu-test1 { - compatible = "sandbox,cpu_sandbox"; - u-boot,dm-pre-reloc; - }; + cpus { + cpu-test1 { + compatible = "sandbox,cpu_sandbox"; + u-boot,dm-pre-reloc; + }; - cpu-test2 { - compatible = "sandbox,cpu_sandbox"; - u-boot,dm-pre-reloc; - }; + cpu-test2 { + compatible = "sandbox,cpu_sandbox"; + u-boot,dm-pre-reloc; + }; - cpu-test3 { - compatible = "sandbox,cpu_sandbox"; - u-boot,dm-pre-reloc; + cpu-test3 { + compatible = "sandbox,cpu_sandbox"; + u-boot,dm-pre-reloc; + }; }; i2s: i2s { diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h index b2b8e36455..798d003077 100644 --- a/arch/sandbox/include/asm/u-boot-sandbox.h +++ b/arch/sandbox/include/asm/u-boot-sandbox.h @@ -26,6 +26,8 @@ int cleanup_before_linux(void); /* drivers/video/sandbox_sdl.c */ int sandbox_lcd_sdl_early_init(void); +struct udevice; + /** * pci_map_physmem() - map a PCI device into memory * diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index daeb168b65..0e87b88e10 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -120,14 +120,23 @@ x86-start16-tpl { offset = <CONFIG_SYS_X86_START16>; }; + x86-reset16-tpl { + offset = <CONFIG_RESET_VEC_LOC>; + }; #elif defined(CONFIG_SPL) x86-start16-spl { offset = <CONFIG_SYS_X86_START16>; }; + x86-reset16-spl { + offset = <CONFIG_RESET_VEC_LOC>; + }; #else x86-start16 { offset = <CONFIG_SYS_X86_START16>; }; + x86-reset16 { + offset = <CONFIG_RESET_VEC_LOC>; + }; #endif }; #endif |