diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon | 2 | ||||
| -rw-r--r-- | arch/arm/mach-bcmstb/include/mach/timer.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3188-board-spl.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3288-board-spl.c | 2 | ||||
| -rw-r--r-- | arch/sandbox/config.mk | 3 | ||||
| -rw-r--r-- | arch/sandbox/cpu/u-boot.lds | 9 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 11 |
7 files changed, 19 insertions, 12 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon index 7dae9f03c3..b3c6693a42 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon +++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.falcon @@ -110,7 +110,7 @@ Example: type = "ramdisk"; arch = "arm64"; os = "linux"; - compression = "gzip"; + compression = "none"; load = <0xa0000000>; }; }; diff --git a/arch/arm/mach-bcmstb/include/mach/timer.h b/arch/arm/mach-bcmstb/include/mach/timer.h index d05b4d64fe..039dd664c2 100644 --- a/arch/arm/mach-bcmstb/include/mach/timer.h +++ b/arch/arm/mach-bcmstb/include/mach/timer.h @@ -8,6 +8,6 @@ #ifndef _BCMSTB_TIMER_H #define _BCMSTB_TIMER_H -unsigned long timer_read_counter(void); +uint64_t get_ticks(void); #endif /* _BCMSTB_TIMER_H */ diff --git a/arch/arm/mach-rockchip/rk3188-board-spl.c b/arch/arm/mach-rockchip/rk3188-board-spl.c index 59c7e4d4db..98ca971b88 100644 --- a/arch/arm/mach-rockchip/rk3188-board-spl.c +++ b/arch/arm/mach-rockchip/rk3188-board-spl.c @@ -49,7 +49,7 @@ u32 spl_boot_device(void) debug("node=%d\n", node); goto fallback; } - ret = device_get_global_by_of_offset(node, &dev); + ret = device_get_global_by_ofnode(offset_to_ofnode(node), &dev); if (ret) { debug("device at node %s/%d not found: %d\n", bootdev, node, ret); diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index ea6a14af4f..abd62e520f 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -51,7 +51,7 @@ u32 spl_boot_device(void) debug("node=%d\n", node); goto fallback; } - ret = device_get_global_by_of_offset(node, &dev); + ret = device_get_global_by_ofnode(offset_to_ofnode(node), &dev); if (ret) { debug("device at node %s/%d not found: %d\n", bootdev, node, ret); diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 5e7077bfe7..2babcde881 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -5,9 +5,6 @@ PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM PLATFORM_LIBS += -lrt -LDFLAGS_FINAL += --gc-sections -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections - # Define this to avoid linking with SDL, which requires SDL libraries # This can solve 'sdl-config: Command not found' errors ifneq ($(NO_SDL),) diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index 40c2214301..6a26c27e8e 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -22,9 +22,8 @@ SECTIONS } .efi_runtime : { - *(.text.efi_runtime*) - *(.rodata.efi_runtime*) - *(.data.efi_runtime*) + *(efi_runtime_text) + *(efi_runtime_data) } .__efi_runtime_stop : { @@ -37,8 +36,8 @@ SECTIONS } .efi_runtime_rel : { - *(.rel*.efi_runtime) - *(.rel*.efi_runtime.*) + *(.relefi_runtime_text) + *(.relefi_runtime_data) } .efi_runtime_rel_stop : diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 118ff9f685..3668263331 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -61,6 +61,17 @@ reg = <2 1>; }; + bind-test { + bind-test-child1 { + compatible = "sandbox,phy"; + #phy-cells = <1>; + }; + + bind-test-child2 { + compatible = "simple-bus"; + }; + }; + b-test { reg = <3 1>; compatible = "denx,u-boot-fdt-test"; |