diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-03 12:48:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-03 12:48:23 -0500 |
| commit | d1653548d29959a6ea6b4037a00b48a28257e6e6 (patch) | |
| tree | c5e53b262c5cfe2be50066b5b9c886c23a4ec3d6 /arch/sandbox/dts/sandbox.dts | |
| parent | f3384c6ddaab99a77895443b10d2034f17ca0014 (diff) | |
| parent | d99e6f78dedd473771d6dee1007a05b8574d5b5c (diff) | |
Merge branch '2023-03-02-kconfig-and-CONFIG-cleanups' into next
- Partial merge of a series of mine to select some framework options
that shouldn't be prompted for (and remove some unused code related to
that), and a partial merge of a series from Simon to remove some dead
code and address various CONFIG_IS_ENABLED/IS_ENABLED issues in code.
Diffstat (limited to 'arch/sandbox/dts/sandbox.dts')
| -rw-r--r-- | arch/sandbox/dts/sandbox.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index a4c1b8f6cb7..12d3eff5fa7 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -76,7 +76,7 @@ clock-frequency = <400000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c0>; - bootph-all; + bootph-pre-ram; }; pcic: pci@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 |