aboutsummaryrefslogtreecommitdiff
path: root/arch/sandbox
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sandbox')
-rw-r--r--arch/sandbox/dts/sandbox.dts8
-rw-r--r--arch/sandbox/dts/sandbox.dtsi48
-rw-r--r--arch/sandbox/dts/sandbox64.dts4
-rw-r--r--arch/sandbox/dts/sandbox_vpl.dtsi4
-rw-r--r--arch/sandbox/dts/test.dts28
-rw-r--r--arch/sandbox/include/asm/rtc.h2
6 files changed, 49 insertions, 45 deletions
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 88b57bfb7e5..12d3eff5fa7 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -49,7 +49,7 @@
cros_ec: cros-ec {
reg = <0 0>;
- u-boot,dm-pre-proper;
+ bootph-some-ram;
compatible = "google,cros-ec-sandbox";
};
@@ -76,7 +76,7 @@
clock-frequency = <400000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
};
pcic: pci@0 {
@@ -90,7 +90,7 @@
};
spi: spi@0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
#address-cells = <1>;
#size-cells = <0>;
reg = <0 0>;
@@ -103,6 +103,6 @@
#include "cros-ec-keyboard.dtsi"
#include "sandbox_pmic.dtsi"
-#ifdef CONFIG_SANDBOX_VPL
+#if IS_ENABLED(CONFIG_SUPPORT_VPL)
#include "sandbox_vpl.dtsi"
#endif
diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index 7e7fcff6d28..30a305c4d20 100644
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -49,14 +49,14 @@
};
clk_fixed: clk-fixed {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,fixed-clock";
#clock-cells = <0>;
clock-frequency = <1234>;
};
clk_sandbox: clk-sbox {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,clk";
#clock-cells = <1>;
assigned-clocks = <&clk_sandbox 3>;
@@ -64,7 +64,7 @@
};
clk-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,clk-test";
clocks = <&clk_fixed>,
<&clk_sandbox 1>,
@@ -75,7 +75,7 @@
};
gpio_a: gpios@0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
gpio-controller;
compatible = "sandbox,gpio";
#gpio-cells = <1>;
@@ -84,7 +84,7 @@
};
gpio_b: gpios@1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
gpio-controller;
compatible = "sandbox,gpio";
#gpio-cells = <2>;
@@ -93,7 +93,7 @@
};
gpio-test {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,gpio-test";
test-gpios = <&gpio_b 3 0>;
};
@@ -115,7 +115,7 @@
reg = <0x43>;
compatible = "sandbox-rtc";
sandbox,emul = <&emul0>;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
};
sandbox_pmic: sandbox_pmic {
reg = <0x40>;
@@ -126,7 +126,7 @@
};
i2c_emul: emul {
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
reg = <0xff>;
compatible = "sandbox,i2c-emul-parent";
emul_eeprom: emul-eeprom {
@@ -136,7 +136,7 @@
#emul-cells = <0>;
};
emul0: emul0 {
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
compatible = "sandbox,i2c-rtc-emul";
#emul-cells = <0>;
};
@@ -149,20 +149,20 @@
};
irq_sandbox: irq-sbox {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,irq";
interrupt-controller;
#interrupt-cells = <2>;
};
irq-test {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,irq-test";
interrupts-extended = <&irq_sandbox 3 0>;
};
lcd {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
compatible = "sandbox,lcd-sdl";
xres = <1366>;
yres = <768>;
@@ -236,7 +236,7 @@
reset@1 {
compatible = "sandbox,reset";
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
rng {
@@ -260,7 +260,7 @@
spi@0 {
firmware_storage_spi: flash@0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
reg = <0>;
compatible = "spansion,m25p16", "jedec,spi-nor";
spi-max-frequency = <40000000>;
@@ -269,7 +269,7 @@
};
spl-test {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,spl-test";
boolval;
intval = <1>;
@@ -283,7 +283,7 @@
};
spl-test2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,spl-test";
intval = <3>;
intarray = <5>;
@@ -295,26 +295,26 @@
};
spl-test3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,spl-test";
stringarray = "one";
maybe-empty-int = <1>;
};
spl-test5 {
- u-boot,dm-vpl;
+ bootph-verify;
compatible = "sandbox,spl-test";
stringarray = "tpl";
};
spl-test6 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
compatible = "sandbox,spl-test";
stringarray = "pre-proper";
};
spl-test7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "sandbox,spl-test";
stringarray = "spl";
};
@@ -348,9 +348,9 @@
/* Needs to be available prior to relocation */
uart0: serial {
- u-boot,dm-spl;
- u-boot,dm-tpl;
- u-boot,dm-vpl;
+ bootph-pre-ram;
+ bootph-pre-sram;
+ bootph-verify;
compatible = "sandbox,serial";
sandbox,text-colour = "cyan";
pinctrl-names = "default";
@@ -473,6 +473,6 @@
};
keyboard-controller {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
};
diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts
index a9cd7908f83..f21fc181f37 100644
--- a/arch/sandbox/dts/sandbox64.dts
+++ b/arch/sandbox/dts/sandbox64.dts
@@ -46,7 +46,7 @@
/* ... */
cros_ec: cros-ec {
reg = <0 0 0 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "google,cros-ec-sandbox";
};
@@ -81,7 +81,7 @@
};
spi: spi@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
#address-cells = <1>;
#size-cells = <0>;
reg = <0 0 0 0>;
diff --git a/arch/sandbox/dts/sandbox_vpl.dtsi b/arch/sandbox/dts/sandbox_vpl.dtsi
index 1fba537f135..c7dc00a8d2d 100644
--- a/arch/sandbox/dts/sandbox_vpl.dtsi
+++ b/arch/sandbox/dts/sandbox_vpl.dtsi
@@ -17,8 +17,8 @@
* provide plenty of space for ELF files with debug info so that
* gdb can be used
*/
- offset = <0x400000>;
- size = <0xdffc00>;
+ offset = <0x800000>;
+ size = <0x2000000>;
fit {
fit,external-offset = <0>;
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 88d4d3cb983..7c1ee71cb7c 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -80,7 +80,7 @@
};
bootstd {
- u-boot,dm-vpl;
+ bootph-verify;
compatible = "u-boot,boot-std";
filename-prefixes = "/", "/boot/";
@@ -104,7 +104,7 @@
* before the parititon starts
*/
firmware0 {
- u-boot,dm-vpl;
+ bootph-verify;
compatible = "fwupd,vbe-simple";
storage = "mmc1";
skip-offset = <0x200>;
@@ -125,11 +125,11 @@
* running U-Boot
*/
firmware1 {
- u-boot,dm-vpl;
+ bootph-verify;
status = "disabled";
compatible = "fwupd,vbe-simple";
storage = "mmc3";
- skip-offset = <0x400000>;
+ skip-offset = <0x800000>;
area-start = <0>;
area-size = <0xe00000>;
state-offset = <0xdffc00>;
@@ -260,7 +260,7 @@
compatible = "denx,u-boot-fdt-test";
ping-expect = <0>;
ping-add = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
test-gpios = <&gpio_a 1>, <&gpio_a 4>,
<&gpio_b 5 GPIO_ACTIVE_HIGH 3 2 1>,
<0>, <&gpio_a 12>;
@@ -889,7 +889,7 @@
};
lcd {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,lcd-sdl";
pinctrl-names = "default";
pinctrl-0 = <&pinmux_lcd_pins>;
@@ -959,21 +959,21 @@
reg = <0x1>;
timebase-frequency = <3000000>;
compatible = "sandbox,cpu_sandbox";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
cpu2: cpu@2 {
device_type = "cpu";
reg = <0x2>;
compatible = "sandbox,cpu_sandbox";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
cpu3: cpu@3 {
device_type = "cpu";
reg = <0x3>;
compatible = "sandbox,cpu_sandbox";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -1213,12 +1213,12 @@
reset@0 {
compatible = "sandbox,warm-reset";
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
reset@1 {
compatible = "sandbox,reset";
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
resetc: reset-ctl {
@@ -1367,9 +1367,13 @@
compatible = "sandbox,tpm2";
};
+ tpm {
+ compatible = "google,sandbox-tpm";
+ };
+
uart0: serial {
compatible = "sandbox,serial";
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl-names = "default";
pinctrl-0 = <&pinmux_uart0_pins>;
};
diff --git a/arch/sandbox/include/asm/rtc.h b/arch/sandbox/include/asm/rtc.h
index 025cd6c67cf..bf3ac5ea1ec 100644
--- a/arch/sandbox/include/asm/rtc.h
+++ b/arch/sandbox/include/asm/rtc.h
@@ -40,7 +40,7 @@ enum {
* @reg: Register values
*/
struct sandbox_i2c_rtc_plat_data {
-#if CONFIG_IS_ENABLED(OF_PLATDATA)
+#if CONFIG_IS_ENABLED(OF_PLATDATA) && IS_ENABLED(CONFIG_RTC_SANDBOX)
struct dtd_sandbox_i2c_rtc_emul dtplat;
#endif
long base_time;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 15:49:58 +0000