diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-23 16:06:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-23 16:06:38 -0400 |
| commit | d584648dad691caec3ecc7777dbfa3f1936878e5 (patch) | |
| tree | ee787f8204c917526859da55840f6f159a00b8ba /arch | |
| parent | c84341f5acd6140f361300f02b354a7238f95b72 (diff) | |
| parent | a4020350289c520e896fd6180e510be557ed3bf9 (diff) | |
Merge tag 'dm-pull-22aug20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
replace devfdt_get_addr_ptr() with dev_read_addr_ptr()
binman fixes for portage
various minor fixes
'bind' command improvements
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sandbox/cpu/u-boot-spl.lds | 2 | ||||
| -rw-r--r-- | arch/sandbox/cpu/u-boot.lds | 2 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/sandbox/cpu/u-boot-spl.lds b/arch/sandbox/cpu/u-boot-spl.lds index c60eb109b1..649abeb5ee 100644 --- a/arch/sandbox/cpu/u-boot-spl.lds +++ b/arch/sandbox/cpu/u-boot-spl.lds @@ -16,8 +16,6 @@ SECTIONS __u_boot_sandbox_option_start = .; _u_boot_sandbox_getopt : { KEEP(*(.u_boot_sandbox_getopt)) } __u_boot_sandbox_option_end = .; - - __bss_start = .; } INSERT AFTER .data; diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index 6a26c27e8e..936da5e140 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -44,8 +44,6 @@ SECTIONS { *(.__efi_runtime_rel_stop) } - - __bss_start = .; } INSERT BEFORE .data; diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 692c3775dd..1d8956abbe 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -149,6 +149,7 @@ }; bind-test { + compatible = "simple-bus"; bind-test-child1 { compatible = "sandbox,phy"; #phy-cells = <1>; |