From 8939df092e24abdf39edb6fbca90fe9c2b44c3b1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2015 21:07:27 -0600 Subject: sandbox: Tidy up terminal restore For some reason 'u-boot -D' does not restore the terminal correctly when the 'reset' command is used. Call the terminal restore function explicitly in this case. Signed-off-by: Simon Glass Reviewed-by: Joe Hershberger --- arch/sandbox/cpu/cpu.c | 2 ++ arch/sandbox/cpu/os.c | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index b6aae37..02c4cd3 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -22,6 +22,8 @@ unsigned long map_len; void reset_cpu(ulong ignored) { + /* Do this here while it still has an effect */ + os_fd_restore(); if (state_uninit()) os_exit(2); diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index e6dd17e..8a4d719 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -107,10 +107,12 @@ void os_exit(int exit_code) static struct termios orig_term; static bool term_setup; -static void os_fd_restore(void) +void os_fd_restore(void) { - if (term_setup) + if (term_setup) { tcsetattr(0, TCSANOW, &orig_term); + term_setup = false; + } } /* Put tty into raw mode so and work */ @@ -120,7 +122,6 @@ void os_tty_raw(int fd, bool allow_sigs) if (term_setup) return; - term_setup = true; /* If not a tty, don't complain */ if (tcgetattr(fd, &orig_term)) @@ -134,6 +135,7 @@ void os_tty_raw(int fd, bool allow_sigs) if (tcsetattr(fd, TCSANOW, &term)) return; + term_setup = true; atexit(os_fd_restore); } -- cgit v1.1 From 171e991d17612bce341ad001a3d4cb7ba299f947 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2015 15:42:15 -0600 Subject: sandbox: dts: Sort the test.dts file a little There are some core test nodes near the beginning of the file which should be grouped together. But for other nodes, let's sort them. Signed-off-by: Simon Glass Acked-by: Joe Hershberger --- arch/sandbox/dts/test.dts | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'arch') diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 1bc3ca0..52ff436 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -8,9 +8,11 @@ aliases { console = &uart0; + eth0 = "/eth@10002000"; + eth5 = ð_5; i2c0 = "/i2c@0"; - spi0 = "/spi@0"; pci0 = &pci; + spi0 = "/spi@0"; testfdt6 = "/e-test"; testbus3 = "/some-bus"; testfdt0 = "/some-bus/c-test@0"; @@ -18,18 +20,11 @@ testfdt3 = "/b-test"; testfdt5 = "/some-bus/c-test@5"; testfdt8 = "/a-test"; - eth0 = "/eth@10002000"; - eth5 = ð_5; usb0 = &usb_0; usb1 = &usb_1; usb2 = &usb_2; }; - uart0: serial { - compatible = "sandbox,serial"; - u-boot,dm-pre-reloc; - }; - a-test { reg = <0>; compatible = "denx,u-boot-fdt-test"; @@ -108,6 +103,24 @@ compatible = "denx,u-boot-fdt-test"; }; + eth@10002000 { + compatible = "sandbox,eth"; + reg = <0x10002000 0x1000>; + fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x00>; + }; + + eth_5: eth@10003000 { + compatible = "sandbox,eth"; + reg = <0x10003000 0x1000>; + fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x11>; + }; + + eth@10004000 { + compatible = "sandbox,eth"; + reg = <0x10004000 0x1000>; + fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x22>; + }; + gpio_a: base-gpios { compatible = "sandbox,gpio"; gpio-controller; @@ -175,22 +188,9 @@ }; }; - eth@10002000 { - compatible = "sandbox,eth"; - reg = <0x10002000 0x1000>; - fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x00>; - }; - - eth_5: eth@10003000 { - compatible = "sandbox,eth"; - reg = <0x10003000 0x1000>; - fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x11>; - }; - - eth@10004000 { - compatible = "sandbox,eth"; - reg = <0x10004000 0x1000>; - fake-host-hwaddr = <0x00 0x00 0x66 0x44 0x22 0x22>; + uart0: serial { + compatible = "sandbox,serial"; + u-boot,dm-pre-reloc; }; usb_0: usb@0 { -- cgit v1.1 From f4d84576a4af251862f9b77693fd84d67e7db542 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2015 15:42:16 -0600 Subject: sandbox: dts: Sort the sandbox.dts file Sort this by node name for easier browsing. Signed-off-by: Simon Glass --- arch/sandbox/dts/sandbox.dts | 106 ++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 52 deletions(-) (limited to 'arch') diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index a3ebd80..8927527 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -17,30 +17,6 @@ stdout-path = "/serial"; }; - /* Needs to be available prior to relocation */ - uart0: serial { - compatible = "sandbox,serial"; - sandbox,text-colour = "cyan"; - }; - - triangle { - compatible = "demo-shape"; - colour = "cyan"; - sides = <3>; - character = <83>; - light-gpios = <&gpio_a 2>, <&gpio_b 6 0>; - }; - square { - compatible = "demo-shape"; - colour = "blue"; - sides = <4>; - }; - hexagon { - compatible = "demo-simple"; - colour = "white"; - sides = <6>; - }; - cros_ec: cros-ec@0 { reg = <0 0>; compatible = "google,cros-ec-sandbox"; @@ -70,10 +46,22 @@ }; }; - lcd { - compatible = "sandbox,lcd-sdl"; - xres = <1366>; - yres = <768>; + eth@10002000 { + compatible = "sandbox,eth"; + reg = <0x10002000 0x1000>; + fake-host-hwaddr = [00 00 66 44 22 00]; + }; + + eth@80000000 { + compatible = "sandbox,eth-raw"; + reg = <0x80000000 0x1000>; + host-raw-interface = "eth0"; + }; + + eth@90000000 { + compatible = "sandbox,eth-raw"; + reg = <0x90000000 0x1000>; + host-raw-interface = "lo"; }; gpio_a: gpios@0 { @@ -92,6 +80,12 @@ num-gpios = <10>; }; + hexagon { + compatible = "demo-simple"; + colour = "white"; + sides = <6>; + }; + i2c_0: i2c@0 { #address-cells = <1>; #size-cells = <0>; @@ -120,18 +114,10 @@ }; }; - spi@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0 0>; - compatible = "sandbox,spi"; - cs-gpios = <0>, <&gpio_a 0>; - firmware_storage_spi: flash@0 { - reg = <0>; - compatible = "spansion,m25p16", "sandbox,spi-flash"; - spi-max-frequency = <40000000>; - sandbox,filename = "spi.bin"; - }; + lcd { + compatible = "sandbox,lcd-sdl"; + xres = <1366>; + yres = <768>; }; pci: pci-controller { @@ -150,22 +136,38 @@ }; }; - eth@10002000 { - compatible = "sandbox,eth"; - reg = <0x10002000 0x1000>; - fake-host-hwaddr = [00 00 66 44 22 00]; + spi@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0 0>; + compatible = "sandbox,spi"; + cs-gpios = <0>, <&gpio_a 0>; + firmware_storage_spi: flash@0 { + reg = <0>; + compatible = "spansion,m25p16", "sandbox,spi-flash"; + spi-max-frequency = <40000000>; + sandbox,filename = "spi.bin"; + }; }; - eth@80000000 { - compatible = "sandbox,eth-raw"; - reg = <0x80000000 0x1000>; - host-raw-interface = "eth0"; + square { + compatible = "demo-shape"; + colour = "blue"; + sides = <4>; }; - eth@90000000 { - compatible = "sandbox,eth-raw"; - reg = <0x90000000 0x1000>; - host-raw-interface = "lo"; + triangle { + compatible = "demo-shape"; + colour = "cyan"; + sides = <3>; + character = <83>; + light-gpios = <&gpio_a 2>, <&gpio_b 6 0>; + }; + + /* Needs to be available prior to relocation */ + uart0: serial { + compatible = "sandbox,serial"; + sandbox,text-colour = "cyan"; }; usb@0 { -- cgit v1.1 From 52d3bc5d18ea0e3ef78715d9c0c703e458f260a0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 22 May 2015 15:42:17 -0600 Subject: sandbox: dts: Add the real-time-clock test nodes back in These were lost when the PMIC series was applied. Add them back so that the tests pass again. Reported-by: Joe Hershberger Signed-off-by: Simon Glass Acked-by: Joe Hershberger --- arch/sandbox/dts/test.dts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'arch') diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 52ff436..c25614a 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -12,6 +12,8 @@ eth5 = ð_5; i2c0 = "/i2c@0"; pci0 = &pci; + rtc0 = &rtc_0; + rtc1 = &rtc_1; spi0 = "/spi@0"; testfdt6 = "/e-test"; testbus3 = "/some-bus"; @@ -153,6 +155,22 @@ }; }; + rtc_0: rtc@43 { + reg = <0x43>; + compatible = "sandbox-rtc"; + emul { + compatible = "sandbox,i2c-rtc"; + }; + }; + + rtc_1: rtc@61 { + reg = <0x61>; + compatible = "sandbox-rtc"; + emul { + compatible = "sandbox,i2c-rtc"; + }; + }; + sandbox_pmic: sandbox_pmic { reg = <0x40>; }; -- cgit v1.1 From b14d547245bf47d861b5a9cc5327d98b89e5d0af Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 23 May 2015 11:53:57 -0600 Subject: sandbox: Compile test device tree when CONFIG_UT_DM is defined A conflict between the PMIC and unit test work means that the sandbox test device tree file is no-longer built. Fix this. Series-to: u-boot Series-cc: joe, prz Change-Id: I6616428e05713e5306f848e7dd0a645dedf0934e Signed-off-by: Simon Glass --- arch/sandbox/dts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index 562a078..517b555 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -1,5 +1,5 @@ dtb-$(CONFIG_SANDBOX) += sandbox.dtb -dtb-$(CONFIG_DM_TEST) += test.dtb +dtb-$(CONFIG_UT_DM) += test.dtb targets += $(dtb-y) -- cgit v1.1