diff options
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/config.mk | 2 | ||||
| -rw-r--r-- | arch/sandbox/dts/sandbox.dtsi | 4 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 34 | ||||
| -rw-r--r-- | arch/sandbox/lib/bootm.c | 2 |
4 files changed, 39 insertions, 3 deletions
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 1284ef390b5..2d184c5f652 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -44,8 +44,6 @@ cmd_u-boot-spl = (cd $(obj) && $(CC) -o $(SPL_BIN) -Wl,-T u-boot-spl.lds \ -Wl,--no-whole-archive \ $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot-spl.map -Wl,--gc-sections) -CONFIG_ARCH_DEVICE_TREE := sandbox - ifeq ($(HOST_ARCH),$(HOST_ARCH_X86_64)) EFI_LDS := ${SRCDIR}/../../../arch/x86/lib/elf_x86_64_efi.lds EFI_TARGET := --target=efi-app-x86_64 diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi index 18bf1cb5b69..7e7fcff6d28 100644 --- a/arch/sandbox/dts/sandbox.dtsi +++ b/arch/sandbox/dts/sandbox.dtsi @@ -4,6 +4,8 @@ * and sandbox64 builds. */ +#include <dt-bindings/input/input.h> + #define USB_CLASS_HUB 9 / { @@ -36,11 +38,13 @@ btn1 { gpios = <&gpio_a 3 0>; label = "button1"; + linux,code = <BTN_1>; }; btn2 { gpios = <&gpio_a 4 0>; label = "button2"; + linux,code = <BTN_2>; }; }; diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 8c059276702..88d4d3cb983 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -172,11 +172,13 @@ btn1 { gpios = <&gpio_a 3 0>; label = "button1"; + linux,code = <BTN_1>; }; btn2 { gpios = <&gpio_a 4 0>; label = "button2"; + linux,code = <BTN_2>; }; }; @@ -342,6 +344,24 @@ vsync-len = <13>; }; }; + panel-timings { + clock-frequency = <6500000>; + hactive = <240>; + vactive = <320>; + hfront-porch = <6>; + hback-porch = <7>; + hsync-len = <1>; + vback-porch = <5>; + vfront-porch = <8>; + vsync-len = <2>; + hsync-active = <1>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <1>; + interlaced; + doublescan; + doubleclk; + }; }; junk { @@ -1519,6 +1539,20 @@ }; }; + ofnode-foreach { + compatible = "foreach"; + + first { + prop1 = <1>; + prop2 = <2>; + }; + + second { + prop1 = <1>; + prop2 = <2>; + }; + }; + osd { compatible = "sandbox,sandbox_osd"; }; diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 28f4a746fb6..dc8b8e46cb4 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; |