Merge tag 'v2023.04-rc4' into next
Prepare v2023.04-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 947c400..61ada4d 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -2,7 +2,7 @@
windows_vm: windows-2019
ubuntu_vm: ubuntu-22.04
macos_vm: macOS-12
- ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230126-10Feb2023
+ ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230126-17Feb2023
# Add '-u 0' options for Azure pipelines, otherwise we get "permission
# denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer",
# since our $(ci_runner_image) user is not root.
@@ -187,6 +187,13 @@
options: $(container_option)
steps:
- script: |
+ mkdir nokia_rx51_tmp
+ ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/
+ ln -s /opt/nokia/qemu-n900.tar.gz nokia_rx51_tmp/
+ ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb nokia_rx51_tmp/
+ ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/
+ ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/
+ ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/
export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH
test/nokia_rx51_test.sh
@@ -213,6 +220,28 @@
export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt
make pylint_err
+ - job: check_for_pre_schema_tags
+ displayName: 'Check for pre-schema driver model tags'
+ pool:
+ vmImage: $(ubuntu_vm)
+ container:
+ image: $(ci_runner_image)
+ options: $(container_option)
+ steps:
+ # If grep succeeds and finds a match the test fails as we should
+ # have no matches.
+ - script: git grep u-boot,dm- -- '*.dts*' && exit 1 || exit 0
+
+ - job: check_packing_of_python_tools
+ displayName: 'Check we can package the Python tools'
+ pool:
+ vmImage: $(ubuntu_vm)
+ container:
+ image: $(ci_runner_image)
+ options: $(container_option)
+ steps:
+ - script: make pip
+
- stage: test_py
jobs:
- job: test_py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 272d69e..a891387 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
# Grab our configured image. The source for this is found
# in the u-boot tree at tools/docker/Dockerfile
-image: trini/u-boot-gitlab-ci-runner:jammy-20230126-10Feb2023
+image: trini/u-boot-gitlab-ci-runner:jammy-20230126-17Feb2023
# We run some tests in different order, to catch some failures quicker.
stages:
@@ -213,7 +213,14 @@
Run tests for Nokia RX-51 (aka N900):
stage: testsuites
script:
- - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH;
+ - mkdir nokia_rx51_tmp;
+ ln -s /opt/nokia/u-boot-gen-combined nokia_rx51_tmp/;
+ ln -s /opt/nokia/qemu-n900.tar.gz nokia_rx51_tmp/;
+ ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb nokia_rx51_tmp/;
+ ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb nokia_rx51_tmp/;
+ ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb nokia_rx51_tmp/;
+ ln -s /opt/nokia/qemu-system-arm nokia_rx51_tmp/;
+ export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH;
test/nokia_rx51_test.sh
# Check for any pylint regressions
@@ -235,6 +242,21 @@
- export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"
- make pylint_err
+# Check for pre-schema driver model tags
+Check for pre-schema tags:
+ stage: testsuites
+ script:
+ - git config --global --add safe.directory "${CI_PROJECT_DIR}";
+ # If grep succeeds and finds a match the test fails as we should
+ # have no matches.
+ - git grep u-boot,dm- -- '*.dts*' && exit 1 || exit 0
+
+# Check we can package the Python tools
+Check packing of Python tools:
+ stage: testsuites
+ script:
+ - make pip
+
# Test sandbox with test.py
sandbox test.py:
variables:
diff --git a/Makefile b/Makefile
index 669be7c..613b2c6 100644
--- a/Makefile
+++ b/Makefile
@@ -522,7 +522,7 @@
no-dot-config-targets := clean clobber mrproper distclean \
help %docs check% coccicheck \
ubootversion backup tests check pcheck qcheck tcheck \
- pylint pylint_err
+ pylint pylint_err _pip pip pip_test pip_release
config-targets := 0
mixed-targets := 0
@@ -957,7 +957,6 @@
# Always append INPUTS so that arch config.mk's can add custom ones
INPUTS-y += u-boot.srec u-boot.bin u-boot.sym System.map binary_size_check
-INPUTS-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
ifeq ($(CONFIG_SPL_FSL_PBL),y)
INPUTS-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin
else
@@ -2274,6 +2273,21 @@
F=`basename $(srctree)` ; cd .. ; \
gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
+PHONY += _pip pip pip_release
+
+pip_release: PIP_ARGS="--real"
+pip_test: PIP_ARGS=""
+pip: PIP_ARGS="-n"
+
+pip pip_test pip_release: _pip
+
+_pip:
+ scripts/make_pip.sh u_boot_pylib ${PIP_ARGS}
+ scripts/make_pip.sh patman ${PIP_ARGS}
+ scripts/make_pip.sh buildman ${PIP_ARGS}
+ scripts/make_pip.sh dtoc ${PIP_ARGS}
+ scripts/make_pip.sh binman ${PIP_ARGS}
+
help:
@echo 'Cleaning targets:'
@echo ' clean - Remove most generated files but keep the config'
@@ -2307,6 +2321,11 @@
@echo " cfg - Don't build, just create the .cfg files"
@echo " envtools - Build only the target-side environment tools"
@echo ''
+ @echo 'PyPi / pip targets:'
+ @echo ' pip - Check building of PyPi packages'
+ @echo ' pip_test - Build PyPi pakages and upload to test server'
+ @echo ' pip_release - Build PyPi pakages and upload to release server'
+ @echo ''
@echo 'Static analysers'
@echo ' checkstack - Generate a list of stack hogs'
@echo ' coccicheck - Execute static code analysis with Coccinelle'
diff --git a/arch/arc/dts/abilis_tb100.dts b/arch/arc/dts/abilis_tb100.dts
index 19e45b9..8f72e1a 100644
--- a/arch/arc/dts/abilis_tb100.dts
+++ b/arch/arc/dts/abilis_tb100.dts
@@ -18,7 +18,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <500000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arc/dts/axc001.dtsi b/arch/arc/dts/axc001.dtsi
index 412580a..93d9918 100644
--- a/arch/arc/dts/axc001.dtsi
+++ b/arch/arc/dts/axc001.dtsi
@@ -11,7 +11,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <750000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arc/dts/axc003.dtsi b/arch/arc/dts/axc003.dtsi
index 75a9de6..7765d8e 100644
--- a/arch/arc/dts/axc003.dtsi
+++ b/arch/arc/dts/axc003.dtsi
@@ -11,7 +11,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <100000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi
index d4ff4f7..3a7f939 100644
--- a/arch/arc/dts/axs10x_mb.dtsi
+++ b/arch/arc/dts/axs10x_mb.dtsi
@@ -13,11 +13,11 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x00000000 0xe0000000 0x10000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
clocks {
compatible = "simple-bus";
- u-boot,dm-pre-reloc;
+ bootph-all;
apbclk: apbclk {
compatible = "fixed-clock";
@@ -29,7 +29,7 @@
compatible = "fixed-clock";
clock-frequency = <33333333>;
#clock-cells = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
mmcclk_ciu: mmcclk-ciu {
diff --git a/arch/arc/dts/emsdp.dts b/arch/arc/dts/emsdp.dts
index dbebdb4..8222d3e 100644
--- a/arch/arc/dts/emsdp.dts
+++ b/arch/arc/dts/emsdp.dts
@@ -21,7 +21,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <40000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi
index 3fc82e5..eef3ee0 100644
--- a/arch/arc/dts/hsdk-common.dtsi
+++ b/arch/arc/dts/hsdk-common.dtsi
@@ -23,7 +23,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <500000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arc/dts/iot_devkit.dts b/arch/arc/dts/iot_devkit.dts
index 2122827..a33cf1d 100644
--- a/arch/arc/dts/iot_devkit.dts
+++ b/arch/arc/dts/iot_devkit.dts
@@ -19,7 +19,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <144000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arc/dts/nsim.dts b/arch/arc/dts/nsim.dts
index c2899ef..2d3a7ec 100644
--- a/arch/arc/dts/nsim.dts
+++ b/arch/arc/dts/nsim.dts
@@ -18,7 +18,7 @@
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <70000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arc/dts/skeleton.dtsi b/arch/arc/dts/skeleton.dtsi
index 279fc6c..d32ca3b 100644
--- a/arch/arc/dts/skeleton.dtsi
+++ b/arch/arc/dts/skeleton.dtsi
@@ -14,7 +14,7 @@
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
timer@0 {
compatible = "snps,arc-timer";
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index bd7fffc..c51f15f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -588,6 +588,7 @@
config ARCH_MVEBU
bool "Marvell MVEBU family (Armada XP/375/38x/3700/7K/8K)"
+ select ARCH_EARLY_INIT_R if ARM64
select DM
select DM_SERIAL
select DM_SPI
@@ -1208,6 +1209,7 @@
config ARCH_ZYNQ
bool "Xilinx Zynq based platform"
select ARM_TWD_TIMER
+ select ARCH_EARLY_INIT_R if FPGA || (SPL && SPL_FPGA)
select CLK
select CLK_ZYNQ
select CPU_V7A
@@ -1229,7 +1231,6 @@
select SPL_TIMER if SPL
select SUPPORT_SPL
select TIMER
- imply ARCH_EARLY_INIT_R
imply BOARD_LATE_INIT
imply CMD_CLK
imply CMD_DM
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index 7e7ad4f..8cfe3f0 100644
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -13,7 +13,6 @@
endif
obj-$(if $(filter mxs,$(SOC)),y) += mxs/
-obj-$(if $(filter spear,$(SOC)),y) += spear/
obj-$(CONFIG_ARCH_SUNXI) += sunxi/
# some files can only build in ARM or THUMB2, not THUMB1
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c
index 599b7e1..a5c5c78 100644
--- a/arch/arm/cpu/armv7/ls102xa/fdt.c
+++ b/arch/arm/cpu/armv7/ls102xa/fdt.c
@@ -25,11 +25,7 @@
void ft_fixup_enet_phy_connect_type(void *fdt)
{
-#ifdef CONFIG_DM_ETH
struct udevice *dev;
-#else
- struct eth_device *dev;
-#endif
struct tsec_private *priv;
const char *enet_path, *phy_path;
char enet[16];
@@ -37,12 +33,8 @@
int phy_node;
int i = 0;
uint32_t ph;
-#ifdef CONFIG_DM_ETH
char *name[3] = { "ethernet@2d10000", "ethernet@2d50000",
"ethernet@2d90000" };
-#else
- char *name[3] = { "eTSEC1", "eTSEC2", "eTSEC3" };
-#endif
for (; i < ARRAY_SIZE(name); i++) {
dev = eth_get_dev_by_name(name[i]);
@@ -53,11 +45,7 @@
continue;
}
-#ifdef CONFIG_DM_ETH
priv = dev_get_priv(dev);
-#else
- priv = dev->priv;
-#endif
if (priv->flags & TSEC_SGMII)
continue;
diff --git a/arch/arm/cpu/armv7/s5p4418/cpu.c b/arch/arm/cpu/armv7/s5p4418/cpu.c
index fcaafc0..8febfe5 100644
--- a/arch/arm/cpu/armv7/s5p4418/cpu.c
+++ b/arch/arm/cpu/armv7/s5p4418/cpu.c
@@ -84,10 +84,3 @@
/* Enable D-cache. I-cache is already enabled in start.S */
dcache_enable();
}
-
-#if defined(CONFIG_ARCH_MISC_INIT)
-int arch_misc_init(void)
-{
- return 0;
-}
-#endif /* CONFIG_ARCH_MISC_INIT */
diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
index 1305238..7d5cf15 100644
--- a/arch/arm/cpu/armv8/Kconfig
+++ b/arch/arm/cpu/armv8/Kconfig
@@ -1,5 +1,9 @@
if ARM64
+config CMO_BY_VA_ONLY
+ bool "Force cache maintenance to be exclusively by VA"
+ depends on !SYS_DISABLE_DCACHE_OPS
+
config ARMV8_SPL_EXCEPTION_VECTORS
bool "Install crash dump exception vectors"
depends on SPL
diff --git a/arch/arm/cpu/armv8/cache.S b/arch/arm/cpu/armv8/cache.S
index d1cee23..3fe935c 100644
--- a/arch/arm/cpu/armv8/cache.S
+++ b/arch/arm/cpu/armv8/cache.S
@@ -12,6 +12,7 @@
#include <asm/system.h>
#include <linux/linkage.h>
+#ifndef CONFIG_CMO_BY_VA_ONLY
/*
* void __asm_dcache_level(level)
*
@@ -116,6 +117,41 @@
ENDPROC(__asm_invalidate_dcache_all)
.popsection
+.pushsection .text.__asm_flush_l3_dcache, "ax"
+WEAK(__asm_flush_l3_dcache)
+ mov x0, #0 /* return status as success */
+ ret
+ENDPROC(__asm_flush_l3_dcache)
+.popsection
+
+.pushsection .text.__asm_invalidate_l3_icache, "ax"
+WEAK(__asm_invalidate_l3_icache)
+ mov x0, #0 /* return status as success */
+ ret
+ENDPROC(__asm_invalidate_l3_icache)
+.popsection
+
+#else /* CONFIG_CMO_BY_VA */
+
+/*
+ * Define these so that they actively clash with in implementation
+ * accidentally selecting CONFIG_CMO_BY_VA
+ */
+
+.pushsection .text.__asm_invalidate_l3_icache, "ax"
+ENTRY(__asm_invalidate_l3_icache)
+ mov x0, xzr
+ ret
+ENDPROC(__asm_invalidate_l3_icache)
+.popsection
+.pushsection .text.__asm_flush_l3_dcache, "ax"
+ENTRY(__asm_flush_l3_dcache)
+ mov x0, xzr
+ ret
+ENDPROC(__asm_flush_l3_dcache)
+.popsection
+#endif /* CONFIG_CMO_BY_VA */
+
/*
* void __asm_flush_dcache_range(start, end)
*
@@ -189,20 +225,6 @@
ENDPROC(__asm_invalidate_l3_dcache)
.popsection
-.pushsection .text.__asm_flush_l3_dcache, "ax"
-WEAK(__asm_flush_l3_dcache)
- mov x0, #0 /* return status as success */
- ret
-ENDPROC(__asm_flush_l3_dcache)
-.popsection
-
-.pushsection .text.__asm_invalidate_l3_icache, "ax"
-WEAK(__asm_invalidate_l3_icache)
- mov x0, #0 /* return status as success */
- ret
-ENDPROC(__asm_invalidate_l3_icache)
-.popsection
-
/*
* void __asm_switch_ttbr(ulong new_ttbr)
*
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c
index 2a226fd..6973340 100644
--- a/arch/arm/cpu/armv8/cache_v8.c
+++ b/arch/arm/cpu/armv8/cache_v8.c
@@ -163,6 +163,83 @@
return NULL;
}
+#ifdef CONFIG_CMO_BY_VA_ONLY
+static void __cmo_on_leaves(void (*cmo_fn)(unsigned long, unsigned long),
+ u64 pte, int level, u64 base)
+{
+ u64 *ptep;
+ int i;
+
+ ptep = (u64 *)(pte & GENMASK_ULL(47, PAGE_SHIFT));
+ for (i = 0; i < PAGE_SIZE / sizeof(u64); i++) {
+ u64 end, va = base + i * BIT(level2shift(level));
+ u64 type, attrs;
+
+ pte = ptep[i];
+ type = pte & PTE_TYPE_MASK;
+ attrs = pte & PMD_ATTRINDX_MASK;
+ debug("PTE %llx at level %d VA %llx\n", pte, level, va);
+
+ /* Not valid? next! */
+ if (!(type & PTE_TYPE_VALID))
+ continue;
+
+ /* Not a leaf? Recurse on the next level */
+ if (!(type == PTE_TYPE_BLOCK ||
+ (level == 3 && type == PTE_TYPE_PAGE))) {
+ __cmo_on_leaves(cmo_fn, pte, level + 1, va);
+ continue;
+ }
+
+ /*
+ * From this point, this must be a leaf.
+ *
+ * Start excluding non memory mappings
+ */
+ if (attrs != PTE_BLOCK_MEMTYPE(MT_NORMAL) &&
+ attrs != PTE_BLOCK_MEMTYPE(MT_NORMAL_NC))
+ continue;
+
+ end = va + BIT(level2shift(level)) - 1;
+
+ /* No intersection with RAM? */
+ if (end < gd->ram_base ||
+ va >= (gd->ram_base + gd->ram_size))
+ continue;
+
+ /*
+ * OK, we have a partial RAM mapping. However, this
+ * can cover *more* than the RAM. Yes, u-boot is
+ * *that* braindead. Compute the intersection we care
+ * about, and not a byte more.
+ */
+ va = max(va, (u64)gd->ram_base);
+ end = min(end, gd->ram_base + gd->ram_size);
+
+ debug("Flush PTE %llx at level %d: %llx-%llx\n",
+ pte, level, va, end);
+ cmo_fn(va, end);
+ }
+}
+
+static void apply_cmo_to_mappings(void (*cmo_fn)(unsigned long, unsigned long))
+{
+ u64 va_bits;
+ int sl = 0;
+
+ if (!gd->arch.tlb_addr)
+ return;
+
+ get_tcr(NULL, &va_bits);
+ if (va_bits < 39)
+ sl = 1;
+
+ __cmo_on_leaves(cmo_fn, gd->arch.tlb_addr, sl, 0);
+}
+#else
+static inline void apply_cmo_to_mappings(void *dummy) {}
+#endif
+
/* Returns and creates a new full table (512 entries) */
static u64 *create_table(void)
{
@@ -222,153 +299,110 @@
set_pte_table(pte, new_table);
}
-/* Add one mm_region map entry to the page tables */
-static void add_map(struct mm_region *map)
+static void map_range(u64 virt, u64 phys, u64 size, int level,
+ u64 *table, u64 attrs)
{
- u64 *pte;
- u64 virt = map->virt;
- u64 phys = map->phys;
- u64 size = map->size;
- u64 attrs = map->attrs | PTE_TYPE_BLOCK | PTE_BLOCK_AF;
- u64 blocksize;
- int level;
- u64 *new_table;
+ u64 map_size = BIT_ULL(level2shift(level));
+ int i, idx;
- while (size) {
- pte = find_pte(virt, 0);
- if (pte && (pte_type(pte) == PTE_TYPE_FAULT)) {
- debug("Creating table for virt 0x%llx\n", virt);
- new_table = create_table();
- set_pte_table(pte, new_table);
+ idx = (virt >> level2shift(level)) & (MAX_PTE_ENTRIES - 1);
+ for (i = idx; size; i++) {
+ u64 next_size, *next_table;
+
+ if (level >= 1 &&
+ size >= map_size && !(virt & (map_size - 1))) {
+ if (level == 3)
+ table[i] = phys | attrs | PTE_TYPE_PAGE;
+ else
+ table[i] = phys | attrs;
+
+ virt += map_size;
+ phys += map_size;
+ size -= map_size;
+
+ continue;
}
- for (level = 1; level < 4; level++) {
- pte = find_pte(virt, level);
- if (!pte)
- panic("pte not found\n");
+ /* Going one level down */
+ if (pte_type(&table[i]) == PTE_TYPE_FAULT)
+ set_pte_table(&table[i], create_table());
- blocksize = 1ULL << level2shift(level);
- debug("Checking if pte fits for virt=%llx size=%llx blocksize=%llx\n",
- virt, size, blocksize);
- if (size >= blocksize && !(virt & (blocksize - 1))) {
- /* Page fits, create block PTE */
- debug("Setting PTE %p to block virt=%llx\n",
- pte, virt);
- if (level == 3)
- *pte = phys | attrs | PTE_TYPE_PAGE;
- else
- *pte = phys | attrs;
- virt += blocksize;
- phys += blocksize;
- size -= blocksize;
- break;
- } else if (pte_type(pte) == PTE_TYPE_FAULT) {
- /* Page doesn't fit, create subpages */
- debug("Creating subtable for virt 0x%llx blksize=%llx\n",
- virt, blocksize);
- new_table = create_table();
- set_pte_table(pte, new_table);
- } else if (pte_type(pte) == PTE_TYPE_BLOCK) {
- debug("Split block into subtable for virt 0x%llx blksize=0x%llx\n",
- virt, blocksize);
- split_block(pte, level);
- }
- }
+ next_table = (u64 *)(table[i] & GENMASK_ULL(47, PAGE_SHIFT));
+ next_size = min(map_size - (virt & (map_size - 1)), size);
+
+ map_range(virt, phys, next_size, level + 1, next_table, attrs);
+
+ virt += next_size;
+ phys += next_size;
+ size -= next_size;
}
}
-enum pte_type {
- PTE_INVAL,
- PTE_BLOCK,
- PTE_LEVEL,
-};
-
-/*
- * This is a recursively called function to count the number of
- * page tables we need to cover a particular PTE range. If you
- * call this with level = -1 you basically get the full 48 bit
- * coverage.
- */
-static int count_required_pts(u64 addr, int level, u64 maxaddr)
+static void add_map(struct mm_region *map)
{
- int levelshift = level2shift(level);
- u64 levelsize = 1ULL << levelshift;
- u64 levelmask = levelsize - 1;
- u64 levelend = addr + levelsize;
- int r = 0;
- int i;
- enum pte_type pte_type = PTE_INVAL;
+ u64 attrs = map->attrs | PTE_TYPE_BLOCK | PTE_BLOCK_AF;
+ u64 va_bits;
+ int level = 0;
- for (i = 0; mem_map[i].size || mem_map[i].attrs; i++) {
- struct mm_region *map = &mem_map[i];
- u64 start = map->virt;
- u64 end = start + map->size;
+ get_tcr(NULL, &va_bits);
+ if (va_bits < 39)
+ level = 1;
- /* Check if the PTE would overlap with the map */
- if (max(addr, start) <= min(levelend, end)) {
- start = max(addr, start);
- end = min(levelend, end);
+ map_range(map->virt, map->phys, map->size, level,
+ (u64 *)gd->arch.tlb_addr, attrs);
+}
- /* We need a sub-pt for this level */
- if ((start & levelmask) || (end & levelmask)) {
- pte_type = PTE_LEVEL;
- break;
- }
+static void count_range(u64 virt, u64 size, int level, int *cntp)
+{
+ u64 map_size = BIT_ULL(level2shift(level));
+ int i, idx;
- /* Lv0 can not do block PTEs, so do levels here too */
- if (level <= 0) {
- pte_type = PTE_LEVEL;
- break;
- }
+ idx = (virt >> level2shift(level)) & (MAX_PTE_ENTRIES - 1);
+ for (i = idx; size; i++) {
+ u64 next_size;
- /* PTE is active, but fits into a block */
- pte_type = PTE_BLOCK;
+ if (level >= 1 &&
+ size >= map_size && !(virt & (map_size - 1))) {
+ virt += map_size;
+ size -= map_size;
+
+ continue;
}
+
+ /* Going one level down */
+ (*cntp)++;
+ next_size = min(map_size - (virt & (map_size - 1)), size);
+
+ count_range(virt, next_size, level + 1, cntp);
+
+ virt += next_size;
+ size -= next_size;
}
+}
- /*
- * Block PTEs at this level are already covered by the parent page
- * table, so we only need to count sub page tables.
- */
- if (pte_type == PTE_LEVEL) {
- int sublevel = level + 1;
- u64 sublevelsize = 1ULL << level2shift(sublevel);
+static int count_ranges(void)
+{
+ int i, count = 0, level = 0;
+ u64 va_bits;
- /* Account for the new sub page table ... */
- r = 1;
+ get_tcr(NULL, &va_bits);
+ if (va_bits < 39)
+ level = 1;
- /* ... and for all child page tables that one might have */
- for (i = 0; i < MAX_PTE_ENTRIES; i++) {
- r += count_required_pts(addr, sublevel, maxaddr);
- addr += sublevelsize;
+ for (i = 0; mem_map[i].size || mem_map[i].attrs; i++)
+ count_range(mem_map[i].virt, mem_map[i].size, level, &count);
- if (addr >= maxaddr) {
- /*
- * We reached the end of address space, no need
- * to look any further.
- */
- break;
- }
- }
- }
-
- return r;
+ return count;
}
/* Returns the estimated required size of all page tables */
__weak u64 get_page_table_size(void)
{
u64 one_pt = MAX_PTE_ENTRIES * sizeof(u64);
- u64 size = 0;
- u64 va_bits;
- int start_level = 0;
-
- get_tcr(NULL, &va_bits);
- if (va_bits < 39)
- start_level = 1;
+ u64 size;
/* Account for all page tables we would need to cover our memory map */
- size = one_pt * count_required_pts(0, start_level - 1, 1ULL << va_bits);
+ size = one_pt * count_ranges();
/*
* We need to duplicate our page table once to have an emergency pt to
@@ -447,8 +481,12 @@
*/
void invalidate_dcache_all(void)
{
+#ifndef CONFIG_CMO_BY_VA_ONLY
__asm_invalidate_dcache_all();
__asm_invalidate_l3_dcache();
+#else
+ apply_cmo_to_mappings(invalidate_dcache_range);
+#endif
}
/*
@@ -458,6 +496,7 @@
*/
inline void flush_dcache_all(void)
{
+#ifndef CONFIG_CMO_BY_VA_ONLY
int ret;
__asm_flush_dcache_all();
@@ -466,6 +505,9 @@
debug("flushing dcache returns 0x%x\n", ret);
else
debug("flushing dcache successfully.\n");
+#else
+ apply_cmo_to_mappings(flush_dcache_range);
+#endif
}
#ifndef CONFIG_SYS_DISABLE_DCACHE_OPS
@@ -520,9 +562,19 @@
if (!(sctlr & CR_C))
return;
+ if (IS_ENABLED(CONFIG_CMO_BY_VA_ONLY)) {
+ /*
+ * When invalidating by VA, do it *before* turning the MMU
+ * off, so that at least our stack is coherent.
+ */
+ flush_dcache_all();
+ }
+
set_sctlr(sctlr & ~(CR_C|CR_M));
- flush_dcache_all();
+ if (!IS_ENABLED(CONFIG_CMO_BY_VA_ONLY))
+ flush_dcache_all();
+
__asm_invalidate_tlb_all();
}
diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c
index db5d460..3c7f36a 100644
--- a/arch/arm/cpu/armv8/cpu.c
+++ b/arch/arm/cpu/armv8/cpu.c
@@ -48,18 +48,26 @@
disable_interrupts();
- /*
- * Turn off I-cache and invalidate it
- */
- icache_disable();
- invalidate_icache_all();
+ if (IS_ENABLED(CONFIG_CMO_BY_VA_ONLY)) {
+ /*
+ * Disable D-cache.
+ */
+ dcache_disable();
+ } else {
+ /*
+ * Turn off I-cache and invalidate it
+ */
+ icache_disable();
+ invalidate_icache_all();
- /*
- * turn off D-cache
- * dcache_disable() in turn flushes the d-cache and disables MMU
- */
- dcache_disable();
- invalidate_dcache_all();
+ /*
+ * turn off D-cache
+ * dcache_disable() in turn flushes the d-cache and disables
+ * MMU
+ */
+ dcache_disable();
+ invalidate_dcache_all();
+ }
return 0;
}
diff --git a/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi b/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi
index a3d5650..fe28ded 100644
--- a/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi
+++ b/arch/arm/dts/am335x-brppt1-mmc-u-boot.dtsi
@@ -6,69 +6,69 @@
/ {
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&l4_wkup {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@200000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
target-module@0
{
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
};
target-module@7000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
};
target-module@9000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
};
};
};
&wkup_cm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&l4_wkup_clkctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&l4_per {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
target-module@4c000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
};
};
segment@100000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
target-module@ac000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
};
target-module@ae000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "simple-bus";
};
};
};
&prcm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio0_target {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&prcm_clocks {
@@ -80,33 +80,33 @@
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/am335x-brsmarc1.dts b/arch/arm/dts/am335x-brsmarc1.dts
index 25cdb11..2c525c6 100644
--- a/arch/arm/dts/am335x-brsmarc1.dts
+++ b/arch/arm/dts/am335x-brsmarc1.dts
@@ -122,7 +122,7 @@
};
&uart0 { /* console uart */
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
@@ -139,12 +139,12 @@
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
clock-frequency = <100000>;
tps: tps@24 { /* PMIC controller */
- u-boot,dm-spl;
+ bootph-pre-ram;
reg = <0x24>;
compatible = "ti,tps65217";
};
@@ -176,12 +176,12 @@
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&spi0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
cs-gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>,
@@ -192,8 +192,8 @@
spi-max-frequency = <24000000>;
spi_flash: spiflash@0 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
compatible = "spidev", "spi-flash";
spi-max-frequency = <24000000>;
reg = <0>;
@@ -201,7 +201,7 @@
};
&spi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
cs-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>,
<&gpio0 19 GPIO_ACTIVE_HIGH>,
@@ -302,10 +302,10 @@
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
ti,no-reset-on-init;
ti,no-idle-on-init;
@@ -327,22 +327,22 @@
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
diff --git a/arch/arm/dts/am335x-brxre1.dts b/arch/arm/dts/am335x-brxre1.dts
index 485c8e3..544dc51 100644
--- a/arch/arm/dts/am335x-brxre1.dts
+++ b/arch/arm/dts/am335x-brxre1.dts
@@ -113,7 +113,7 @@
};
&uart0 { /* console uart */
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
@@ -130,12 +130,12 @@
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
clock-frequency = <100000>;
tps: tps@24 { /* PMIC controller */
- u-boot,dm-spl;
+ bootph-pre-ram;
reg = <0x24>;
compatible = "ti,tps65217";
@@ -233,7 +233,7 @@
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <0x4>;
ti,non-removable;
@@ -243,7 +243,7 @@
};
&mmc2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
vmmc-supply = <&vmmcsd_fixed>;
bus-width = <0x8>;
ti,non-removable;
@@ -257,10 +257,10 @@
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
ti,no-reset-on-init;
ti,no-idle-on-init;
@@ -282,22 +282,22 @@
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,no-reset-on-init;
};
diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi
index 8fc65df..82a483a 100644
--- a/arch/arm/dts/am335x-evm-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi
@@ -6,14 +6,14 @@
#include "am33xx-u-boot.dtsi"
&l4_per {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@300000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -28,27 +28,27 @@
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&l4_wkup {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@200000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
target-module@9000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/am335x-evmsk-u-boot.dtsi b/arch/arm/dts/am335x-evmsk-u-boot.dtsi
index 1003f4d..669cb6b 100644
--- a/arch/arm/dts/am335x-evmsk-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evmsk-u-boot.dtsi
@@ -12,10 +12,10 @@
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/am335x-guardian-u-boot.dtsi b/arch/arm/dts/am335x-guardian-u-boot.dtsi
index 29d8147..26c011d 100644
--- a/arch/arm/dts/am335x-guardian-u-boot.dtsi
+++ b/arch/arm/dts/am335x-guardian-u-boot.dtsi
@@ -8,12 +8,12 @@
/ {
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&l4_wkup {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&l4_per {
@@ -21,25 +21,25 @@
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&scm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&spi0 {
@@ -54,31 +54,31 @@
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb_ctrl_mod {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb0_phy {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&am33xx_pinmux {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcd0_pins: pinmux_lcd0_pins {
pinctrl-single,pins = <
diff --git a/arch/arm/dts/am335x-pdu001-u-boot.dtsi b/arch/arm/dts/am335x-pdu001-u-boot.dtsi
index f1860ee..4bb4bed 100644
--- a/arch/arm/dts/am335x-pdu001-u-boot.dtsi
+++ b/arch/arm/dts/am335x-pdu001-u-boot.dtsi
@@ -6,65 +6,65 @@
#include "am33xx-u-boot.dtsi"
&l4_wkup {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@200000 {
target-module@10000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&l4_per {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@100000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
target-module@a6000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
};
&scm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&am33xx_pinmux {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart3_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc2_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/am335x-pxm50-u-boot.dtsi b/arch/arm/dts/am335x-pxm50-u-boot.dtsi
index e5af9fd..d8c21b6 100644
--- a/arch/arm/dts/am335x-pxm50-u-boot.dtsi
+++ b/arch/arm/dts/am335x-pxm50-u-boot.dtsi
@@ -12,10 +12,10 @@
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/am335x-regor-rdk-u-boot.dtsi b/arch/arm/dts/am335x-regor-rdk-u-boot.dtsi
index 4052d0e..e07e3aa 100644
--- a/arch/arm/dts/am335x-regor-rdk-u-boot.dtsi
+++ b/arch/arm/dts/am335x-regor-rdk-u-boot.dtsi
@@ -15,19 +15,19 @@
};
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm/dts/am335x-rut-u-boot.dtsi b/arch/arm/dts/am335x-rut-u-boot.dtsi
index a38c2dc..62638c7 100644
--- a/arch/arm/dts/am335x-rut-u-boot.dtsi
+++ b/arch/arm/dts/am335x-rut-u-boot.dtsi
@@ -12,10 +12,10 @@
segment@300000 {
target-module@e000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
lcdc: lcdc@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi
index 01c105e..fd47bc2 100644
--- a/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi
+++ b/arch/arm/dts/am335x-sancloud-bbe-lite-u-boot.dtsi
@@ -9,36 +9,36 @@
&l4_wkup {
segment@200000 {
target-module@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&prcm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&per_cm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&l4ls_clkctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&l4_per {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
target-module@30000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&spi0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
channel@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/am335x-shc-u-boot.dtsi b/arch/arm/dts/am335x-shc-u-boot.dtsi
index 359ae05..f9b6cb3 100644
--- a/arch/arm/dts/am335x-shc-u-boot.dtsi
+++ b/arch/arm/dts/am335x-shc-u-boot.dtsi
@@ -7,45 +7,45 @@
/ {
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&l4_wkup {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&scm {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&am33xx_pinmux {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
};
&emmc_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc3 {
diff --git a/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi b/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi
index b3f21e7..0e9804b 100644
--- a/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi
+++ b/arch/arm/dts/am335x-wega-rdk-u-boot.dtsi
@@ -15,16 +15,16 @@
};
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
l4_wkup@44c00000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
segment@200000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
target-module@9000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -32,14 +32,14 @@
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
};
diff --git a/arch/arm/dts/am33xx-u-boot.dtsi b/arch/arm/dts/am33xx-u-boot.dtsi
index 61d10b8..1d09f48 100644
--- a/arch/arm/dts/am33xx-u-boot.dtsi
+++ b/arch/arm/dts/am33xx-u-boot.dtsi
@@ -6,7 +6,7 @@
/ {
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/am3517-evm-u-boot.dtsi b/arch/arm/dts/am3517-evm-u-boot.dtsi
index 1a70630..8d486f0 100644
--- a/arch/arm/dts/am3517-evm-u-boot.dtsi
+++ b/arch/arm/dts/am3517-evm-u-boot.dtsi
@@ -18,37 +18,37 @@
};
&gpio1 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio3 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio5 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio6 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&mmc2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&mmc3 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&uart1 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&uart2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
diff --git a/arch/arm/dts/am4372-generic-u-boot.dtsi b/arch/arm/dts/am4372-generic-u-boot.dtsi
index 6ba5c16..1dd0a5d 100644
--- a/arch/arm/dts/am4372-generic-u-boot.dtsi
+++ b/arch/arm/dts/am4372-generic-u-boot.dtsi
@@ -7,10 +7,10 @@
/{
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/am4372-u-boot.dtsi b/arch/arm/dts/am4372-u-boot.dtsi
index 986ae17..2fac2fc 100644
--- a/arch/arm/dts/am4372-u-boot.dtsi
+++ b/arch/arm/dts/am4372-u-boot.dtsi
@@ -27,41 +27,41 @@
};
&dwc3_1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb2_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&am43xx_control_usb2phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ocp2scp0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dwc3_2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb2_phy2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&am43xx_control_usb2phy2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ocp2scp1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi
index b55aa8e..da0b136 100644
--- a/arch/arm/dts/am437x-gp-evm-u-boot.dtsi
+++ b/arch/arm/dts/am437x-gp-evm-u-boot.dtsi
@@ -11,50 +11,50 @@
/{
ocp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mac {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&davinci_mdio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cpsw_emac0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&phy_sel {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&l4_wkup {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
ðphy0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/am437x-idk-evm-u-boot.dtsi b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi
index 50fe09c..4e6ad94 100644
--- a/arch/arm/dts/am437x-idk-evm-u-boot.dtsi
+++ b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi
@@ -7,7 +7,7 @@
/{
ocp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
xtal25mhz: xtal25mhz {
@@ -18,11 +18,11 @@
};
&uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
cdce913: cdce913@65 {
compatible = "ti,cdce913";
@@ -34,5 +34,5 @@
};
&mmc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/am437x-sk-evm-u-boot.dtsi b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi
index 3aa9195..43e519c 100644
--- a/arch/arm/dts/am437x-sk-evm-u-boot.dtsi
+++ b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi
@@ -7,18 +7,18 @@
/{
ocp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
index 1b2648f..cb02b70 100644
--- a/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
+++ b/arch/arm/dts/armada-3720-eDPU-u-boot.dtsi
@@ -21,15 +21,15 @@
};
&spi0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
spi-flash@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&sdhci0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ð0 {
diff --git a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
index 47d87d4..485f1c5 100644
--- a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
+++ b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
@@ -21,15 +21,15 @@
};
&spi0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
spi-flash@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&sdhci0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_sb {
diff --git a/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi b/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
index 4a3fb2c..8fd829d 100644
--- a/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
&watchdog {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
index 3f1e761..509d6ca 100644
--- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
@@ -12,24 +12,24 @@
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
i2cmux: i2cmux@70 {
- u-boot,dm-pre-reloc;
+ bootph-all;
i2c@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
i2c@1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
i2c@5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
crypto@64 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi
index 9662929..fb27a3b 100644
--- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi
@@ -1,38 +1,38 @@
// SPDX-License-Identifier: GPL-2.0+
&spi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
spi-flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&sdhci {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ahci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ahci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
eeprom@52 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
eeprom@53 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
index bac4b06..363056a 100644
--- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
@@ -5,41 +5,41 @@
};
&spi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
spi-flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&w25q32 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ahci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ahci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
eeprom@52 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
eeprom@53 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
diff --git a/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
index 0a94df9..efeb16c 100644
--- a/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
+++ b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
@@ -1,25 +1,25 @@
&gpio0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&spi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&I2C0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&PCA22 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-ap80x-quad.dtsi b/arch/arm/dts/armada-ap80x-quad.dtsi
index 1220e98..19e27e4 100644
--- a/arch/arm/dts/armada-ap80x-quad.dtsi
+++ b/arch/arm/dts/armada-ap80x-quad.dtsi
@@ -18,7 +18,7 @@
cpu@000 {
clocks;
- u-boot,dm-pre-reloc;
+ bootph-all;
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
reg = <0x000>;
@@ -26,7 +26,7 @@
};
cpu@001 {
clocks;
- u-boot,dm-pre-reloc;
+ bootph-all;
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
reg = <0x001>;
@@ -34,7 +34,7 @@
};
cpu@100 {
clocks;
- u-boot,dm-pre-reloc;
+ bootph-all;
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
reg = <0x100>;
@@ -42,7 +42,7 @@
};
cpu@101 {
clocks;
- u-boot,dm-pre-reloc;
+ bootph-all;
device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8";
reg = <0x101>;
diff --git a/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi b/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
index c98bfa1..48426f6 100644
--- a/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
+++ b/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
@@ -1,5 +1,5 @@
&lcd0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/ast2500-evb.dts b/arch/arm/dts/ast2500-evb.dts
index 1fbacf9..d481ead 100644
--- a/arch/arm/dts/ast2500-evb.dts
+++ b/arch/arm/dts/ast2500-evb.dts
@@ -19,7 +19,7 @@
};
&uart5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
@@ -28,17 +28,17 @@
};
&wdt1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
&wdt2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
&wdt3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/ast2500-u-boot.dtsi b/arch/arm/dts/ast2500-u-boot.dtsi
index 057390f..ee14db3 100644
--- a/arch/arm/dts/ast2500-u-boot.dtsi
+++ b/arch/arm/dts/ast2500-u-boot.dtsi
@@ -8,19 +8,19 @@
scu: clock-controller@1e6e2000 {
compatible = "aspeed,ast2500-scu";
reg = <0x1e6e2000 0x1000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <1>;
#reset-cells = <1>;
};
rst: reset-controller {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "aspeed,ast2500-reset";
#reset-cells = <1>;
};
sdrammc: sdrammc@1e6e0000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "aspeed,ast2500-sdrammc";
reg = <0x1e6e0000 0x174
0x1e6e0200 0x1d4 >;
@@ -51,7 +51,7 @@
};
&timer {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mac0 {
diff --git a/arch/arm/dts/ast2600-evb.dts b/arch/arm/dts/ast2600-evb.dts
index a097f32..9aac0e2 100644
--- a/arch/arm/dts/ast2600-evb.dts
+++ b/arch/arm/dts/ast2600-evb.dts
@@ -58,7 +58,7 @@
};
&uart5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
@@ -258,11 +258,11 @@
};
&hace {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
&acry {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/ast2600-u-boot.dtsi b/arch/arm/dts/ast2600-u-boot.dtsi
index 4648c07..f06f582 100644
--- a/arch/arm/dts/ast2600-u-boot.dtsi
+++ b/arch/arm/dts/ast2600-u-boot.dtsi
@@ -8,21 +8,21 @@
scu: clock-controller@1e6e2000 {
compatible = "aspeed,ast2600-scu";
reg = <0x1e6e2000 0x1000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <1>;
#reset-cells = <1>;
uart-clk-source = <0x0>; /* uart clock source selection: 0: uxclk 1: huxclk*/
};
rst: reset-controller {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "aspeed,ast2600-reset";
aspeed,wdt = <&wdt1>;
#reset-cells = <1>;
};
sdrammc: sdrammc@1e6e0000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "aspeed,ast2600-sdrammc";
reg = <0x1e6e0000 0x100
0x1e6e0100 0x300
@@ -33,10 +33,10 @@
};
ahb {
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi
index d176e20..0c3c040 100644
--- a/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi
+++ b/arch/arm/dts/at91-sam9x60_curiosity-u-boot.dtsi
@@ -10,70 +10,70 @@
/ {
ahb {
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&clk32 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&main_rc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&main_xtal {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_sdhci0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pioA {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pioB {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pit64b0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdhci0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&slow_rc_osc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&slow_xtal {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/at91-sama5d27_giantboard.dts b/arch/arm/dts/at91-sama5d27_giantboard.dts
index 2625f81..767766d 100644
--- a/arch/arm/dts/at91-sama5d27_giantboard.dts
+++ b/arch/arm/dts/at91-sama5d27_giantboard.dts
@@ -22,7 +22,7 @@
};
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart1;
};
@@ -32,7 +32,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
apb {
@@ -41,7 +41,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
i2c0: i2c@f8028000 {
@@ -65,12 +65,12 @@
pit: timer@f8048030 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
sfr: sfr@f8030000 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioA: pinctrl@fc038000 {
@@ -82,14 +82,14 @@
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -97,7 +97,7 @@
pinmux = <PIN_PD2__URXD1>,
<PIN_PD3__UTXD1>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_i2c0_default: i2c0_default {
diff --git a/arch/arm/dts/at91-sama5d27_som1_ek.dts b/arch/arm/dts/at91-sama5d27_som1_ek.dts
index 70d15c8..861471d 100644
--- a/arch/arm/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/dts/at91-sama5d27_som1_ek.dts
@@ -51,7 +51,7 @@
compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d2", "atmel,sama5";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart1;
};
@@ -85,7 +85,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
sdmmc1: sdio-host@b0000000 {
@@ -93,7 +93,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "okay"; /* conflict with qspi0 */
- u-boot,dm-pre-reloc;
+ bootph-all;
};
apb {
@@ -103,10 +103,10 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
display-timings {
- u-boot,dm-pre-reloc;
+ bootph-all;
480x272 {
clock-frequency = <9000000>;
hactive = <480>;
@@ -117,7 +117,7 @@
vfront-porch = <2>;
vback-porch = <2>;
vsync-len = <11>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -126,7 +126,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioA: pinctrl@fc038000 {
@@ -178,7 +178,7 @@
<PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd {
@@ -186,7 +186,7 @@
<PIN_PA10__SDMMC0_RSTN>,
<PIN_PA13__SDMMC0_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -198,14 +198,14 @@
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -213,7 +213,7 @@
pinmux = <PIN_PD2__URXD1>,
<PIN_PD3__UTXD1>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_usb_default: usb_default {
diff --git a/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi b/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi
index 41cf906..8254392 100644
--- a/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi
+++ b/arch/arm/dts/at91-sama5d27_wlsom1_ek-u-boot.dtsi
@@ -9,42 +9,42 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&hlcdc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi1_flash {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sfr {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_sdmmc0_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart0_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_qspi1_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
index b45de97..cd8976f 100644
--- a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
+++ b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi
@@ -9,39 +9,39 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&pinctrl_mikrobus1_uart {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_qspi1_sck_cs_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_qspi1_dat_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_sdmmc0_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
flash@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&sdmmc0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 { /* mikrobus1 uart */
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/at91-sama5d2_ptc_ek.dts b/arch/arm/dts/at91-sama5d2_ptc_ek.dts
index 36d52c2..b62b8a7 100644
--- a/arch/arm/dts/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/dts/at91-sama5d2_ptc_ek.dts
@@ -52,7 +52,7 @@
compatible = "atmel,sama5d2-ptc_ek", "atmel,sama5d2", "atmel,sama5";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart0;
};
@@ -96,7 +96,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
sdmmc1: sdio-host@b0000000 {
@@ -104,7 +104,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "disabled"; /* conflicts with nand and qspi0*/
- u-boot,dm-pre-reloc;
+ bootph-all;
};
apb {
@@ -123,7 +123,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
i2c1: i2c@fc028000 {
@@ -175,7 +175,7 @@
<PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd {
@@ -184,7 +184,7 @@
<PIN_PA11__SDMMC0_VDDSEL>,
<PIN_PA13__SDMMC0_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -196,14 +196,14 @@
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -211,7 +211,7 @@
pinmux = <PIN_PB26__URXD0>,
<PIN_PB27__UTXD0>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_usb_default: usb_default {
diff --git a/arch/arm/dts/at91-sama5d2_xplained.dts b/arch/arm/dts/at91-sama5d2_xplained.dts
index 78a3a85..4d28af6 100644
--- a/arch/arm/dts/at91-sama5d2_xplained.dts
+++ b/arch/arm/dts/at91-sama5d2_xplained.dts
@@ -8,7 +8,7 @@
compatible = "atmel,sama5d2-xplained", "atmel,sama5d2", "atmel,sama5";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart1;
};
@@ -46,7 +46,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc0_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
sdmmc1: sdio-host@b0000000 {
@@ -54,7 +54,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sdmmc1_default>;
status = "okay"; /* conflict with qspi0 */
- u-boot,dm-pre-reloc;
+ bootph-all;
};
apb {
@@ -64,10 +64,10 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
display-timings {
- u-boot,dm-pre-reloc;
+ bootph-all;
480x272 {
clock-frequency = <9000000>;
hactive = <480>;
@@ -78,7 +78,7 @@
vfront-porch = <2>;
vback-porch = <2>;
vsync-len = <11>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -87,7 +87,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_qspi0_sck_cs_default &pinctrl_qspi0_dat_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
flash@0 {
compatible = "jedec,spi-nor";
@@ -95,7 +95,7 @@
spi-max-frequency = <83000000>;
spi-rx-bus-width = <4>;
spi-tx-bus-width = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -104,13 +104,13 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
spi_flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -129,7 +129,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1_default>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
i2c1: i2c@fc028000 {
@@ -208,7 +208,7 @@
pinmux = <PIN_PA22__QSPI0_SCK>,
<PIN_PA23__QSPI0_CS>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_qspi0_dat_default: qspi0_dat_default {
@@ -217,7 +217,7 @@
<PIN_PA26__QSPI0_IO2>,
<PIN_PA27__QSPI0_IO3>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_sdmmc0_default: sdmmc0_default {
@@ -232,7 +232,7 @@
<PIN_PA8__SDMMC0_DAT6>,
<PIN_PA9__SDMMC0_DAT7>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd_default {
@@ -241,7 +241,7 @@
<PIN_PA11__SDMMC0_VDDSEL>,
<PIN_PA13__SDMMC0_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -253,14 +253,14 @@
<PIN_PA20__SDMMC1_DAT2>,
<PIN_PA21__SDMMC1_DAT3>;
bias-pull-up;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ck_cd {
pinmux = <PIN_PA22__SDMMC1_CK>,
<PIN_PA30__SDMMC1_CD>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -269,14 +269,14 @@
<PIN_PA15__SPI0_MOSI>,
<PIN_PA16__SPI0_MISO>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_uart1_default: uart1_default {
pinmux = <PIN_PD2__URXD1>,
<PIN_PD3__UTXD1>;
bias-disable;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_usb_default: usb_default {
diff --git a/arch/arm/dts/at91-sama5d3_xplained.dts b/arch/arm/dts/at91-sama5d3_xplained.dts
index fc50800..d291deb 100644
--- a/arch/arm/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/dts/at91-sama5d3_xplained.dts
@@ -14,7 +14,7 @@
compatible = "atmel,sama5d3-xplained", "atmel,sama5d3", "atmel,sama5";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &dbgu;
};
@@ -51,7 +51,7 @@
ahb {
apb {
mmc0: mmc@f0000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7 &pinctrl_mmc0_cd>;
vmmc-supply = <&vcc_mmc0_reg>;
vqmmc-supply = <&vcc_3v3_reg>;
@@ -64,7 +64,7 @@
};
mmc1: mmc@f8000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
vmmc-supply = <&vcc_3v3_reg>;
vqmmc-supply = <&vcc_3v3_reg>;
status = "disabled";
@@ -215,13 +215,13 @@
};
dbgu: serial@ffffee00 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
pinctrl@fffff200 {
board {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_i2c0_pu: i2c0_pu {
atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
@@ -240,13 +240,13 @@
};
pinctrl_mmc0_cd: mmc0_cd {
- u-boot,dm-pre-reloc;
+ bootph-all;
atmel,pins =
<AT91_PIOE 0 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
pinctrl_mmc1_cd: mmc1_cd {
- u-boot,dm-pre-reloc;
+ bootph-all;
atmel,pins =
<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
diff --git a/arch/arm/dts/at91-sama5d4_xplained.dts b/arch/arm/dts/at91-sama5d4_xplained.dts
index 7495925..95f2091 100644
--- a/arch/arm/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/dts/at91-sama5d4_xplained.dts
@@ -54,7 +54,7 @@
};
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &usart3;
};
@@ -92,10 +92,10 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
display-timings {
- u-boot,dm-pre-reloc;
+ bootph-all;
480x272 {
clock-frequency = <9000000>;
hactive = <480>;
@@ -106,17 +106,17 @@
vfront-porch = <2>;
vback-porch = <2>;
vsync-len = <11>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
spi0: spi@f8010000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
status = "okay";
spi_flash@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
@@ -146,7 +146,7 @@
};
mmc1: mmc@fc000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
vmmc-supply = <&vcc_mmc1_reg>;
@@ -160,7 +160,7 @@
};
usart3: serial@fc00c000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
@@ -193,9 +193,9 @@
pinctrl@fc06a000 {
board {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_mmc1_cd: mmc1_cd {
- u-boot,dm-pre-reloc;
+ bootph-all;
atmel,pins =
<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
diff --git a/arch/arm/dts/at91-sama5d4ek.dts b/arch/arm/dts/at91-sama5d4ek.dts
index c1d6578..687a1d0 100644
--- a/arch/arm/dts/at91-sama5d4ek.dts
+++ b/arch/arm/dts/at91-sama5d4ek.dts
@@ -54,7 +54,7 @@
};
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &usart3;
};
@@ -82,10 +82,10 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
display-timings {
- u-boot,dm-pre-reloc;
+ bootph-all;
800x480 {
clock-frequency = <33260000>;
hactive = <800>;
@@ -96,7 +96,7 @@
vfront-porch = <23>;
vback-porch = <22>;
vsync-len = <5>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -132,11 +132,11 @@
};
spi0: spi@f8010000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
status = "okay";
spi_flash@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
@@ -186,7 +186,7 @@
};
mmc1: mmc@fc000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3 &pinctrl_mmc1_cd>;
status = "okay";
@@ -202,7 +202,7 @@
};
usart3: serial@fc00c000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
@@ -216,7 +216,7 @@
pinctrl@fc06a000 {
board {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_macb0_phy_irq: macb0_phy_irq {
atmel,pins =
<AT91_PIOE 1 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
@@ -226,7 +226,7 @@
<AT91_PIOE 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
pinctrl_mmc1_cd: mmc1_cd {
- u-boot,dm-pre-reloc;
+ bootph-all;
atmel,pins =
<AT91_PIOE 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
};
diff --git a/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi b/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
index a54cfac..8b2e990 100644
--- a/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
+++ b/arch/arm/dts/at91-sama7g5ek-u-boot.dtsi
@@ -16,7 +16,7 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
utmi {
@@ -68,7 +68,7 @@
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
usb2: usb@400000 {
compatible = "microchip,sama7g5-ohci", "usb-ohci";
@@ -96,23 +96,23 @@
};
&main_rc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&main_xtal {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pioA {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_flx3_default {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pioA {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_usb_default: usb_default {
pinmux = <PIN_PC6__GPIO>;
@@ -121,23 +121,23 @@
};
&pit64b0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&slow_rc_osc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&slow_xtal {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb2 {
diff --git a/arch/arm/dts/at91sam9260-smartweb.dts b/arch/arm/dts/at91sam9260-smartweb.dts
index a22de2d..1f21762 100644
--- a/arch/arm/dts/at91sam9260-smartweb.dts
+++ b/arch/arm/dts/at91sam9260-smartweb.dts
@@ -18,7 +18,7 @@
compatible = "atmel,at91sam9260", "atmel,at91sam9";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &dbgu;
};
@@ -49,7 +49,7 @@
};
dbgu: serial@fffff200 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9260.dtsi b/arch/arm/dts/at91sam9260.dtsi
index 800d96e..4ea4202 100644
--- a/arch/arm/dts/at91sam9260.dtsi
+++ b/arch/arm/dts/at91sam9260.dtsi
@@ -77,14 +77,14 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
aic: interrupt-controller@fffff000 {
#interrupt-cells = <3>;
@@ -107,7 +107,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main_osc: main_osc {
compatible = "atmel,at91rm9200-clk-main-osc";
@@ -165,7 +165,7 @@
clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
atmel,clk-output-range = <0 105000000>;
atmel,clk-divisors = <1 2 4 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usb: usbck {
@@ -230,24 +230,24 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
- u-boot,dm-pre-reloc;
+ bootph-all;
pioA_clk: pioA_clk@2 {
#clock-cells = <0>;
reg = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB_clk: pioB_clk@3 {
#clock-cells = <0>;
reg = <3>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC_clk: pioC_clk@4 {
#clock-cells = <0>;
reg = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
adc_clk: adc_clk@5 {
@@ -410,7 +410,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioA_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB: gpio@fffff600 {
@@ -422,7 +422,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioB_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC: gpio@fffff800 {
@@ -434,7 +434,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioC_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl: pinctrl@fffff400 {
@@ -453,11 +453,11 @@
0xffffffff 0x7fff3ccf /* pioB */
0xffffffff 0x007fffff /* pioC */
>;
- u-boot,dm-pre-reloc;
+ bootph-all;
/* shared pinctrl settings */
dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_dbgu: dbgu-0 {
atmel,pins =
<AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A */
diff --git a/arch/arm/dts/at91sam9260ek.dts b/arch/arm/dts/at91sam9260ek.dts
index 47606cb..d1de5e0 100644
--- a/arch/arm/dts/at91sam9260ek.dts
+++ b/arch/arm/dts/at91sam9260ek.dts
@@ -50,7 +50,7 @@
compatible = "atmel,at91sam9260ek", "atmel,at91sam9260", "atmel,at91sam9";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &dbgu;
};
@@ -124,7 +124,7 @@
};
dbgu: serial@fffff200 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9261.dtsi b/arch/arm/dts/at91sam9261.dtsi
index b6357d3..804340e 100644
--- a/arch/arm/dts/at91sam9261.dtsi
+++ b/arch/arm/dts/at91sam9261.dtsi
@@ -68,7 +68,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
usb0: ohci@00500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci";
@@ -111,7 +111,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
tcb0: timer@fffa0000 {
compatible = "atmel,at91rm9200-tcb";
@@ -295,7 +295,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioA_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB: gpio@fffff600 {
@@ -307,7 +307,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioB_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC: gpio@fffff800 {
@@ -319,7 +319,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioC_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl@fffff400 {
@@ -336,11 +336,11 @@
<0xffffffff 0xfffffff7>, /* pioA */
<0xffffffff 0xfffffff4>, /* pioB */
<0xffffffff 0xffffff07>; /* pioC */
- u-boot,dm-pre-reloc;
+ bootph-all;
/* shared pinctrl settings */
dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_dbgu: dbgu-0 {
atmel,pins =
<AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE>,
@@ -583,7 +583,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main_osc: main_osc {
compatible = "atmel,at91rm9200-clk-main-osc";
@@ -628,7 +628,7 @@
clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
atmel,clk-output-range = <0 94000000>;
atmel,clk-divisors = <1 2 4 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usb: usbck {
@@ -729,24 +729,24 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
- u-boot,dm-pre-reloc;
+ bootph-all;
pioA_clk: pioA_clk@2 {
#clock-cells = <0>;
reg = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB_clk: pioB_clk@3 {
#clock-cells = <0>;
reg = <3>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC_clk: pioC_clk@4 {
#clock-cells = <0>;
reg = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usart0_clk: usart0_clk@6 {
diff --git a/arch/arm/dts/at91sam9263.dtsi b/arch/arm/dts/at91sam9263.dtsi
index 61b0562..98cdd8e 100644
--- a/arch/arm/dts/at91sam9263.dtsi
+++ b/arch/arm/dts/at91sam9263.dtsi
@@ -75,14 +75,14 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
aic: interrupt-controller@fffff000 {
#interrupt-cells = <3>;
@@ -100,7 +100,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main_osc: main_osc {
compatible = "atmel,at91rm9200-clk-main-osc";
@@ -146,7 +146,7 @@
clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
atmel,clk-output-range = <0 120000000>;
atmel,clk-divisors = <1 2 4 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usb: usbck {
@@ -235,24 +235,24 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
- u-boot,dm-pre-reloc;
+ bootph-all;
pioA_clk: pioA_clk@2 {
#clock-cells = <0>;
reg = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB_clk: pioB_clk@3 {
#clock-cells = <0>;
reg = <3>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioCDE_clk: pioCDE_clk@4 {
#clock-cells = <0>;
reg = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usart0_clk: usart0_clk@7 {
@@ -730,7 +730,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioA_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB: gpio@fffff400 {
@@ -742,7 +742,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioB_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC: gpio@fffff600 {
@@ -754,7 +754,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioCDE_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioD: gpio@fffff800 {
@@ -766,7 +766,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioCDE_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioE: gpio@fffffa00 {
@@ -778,7 +778,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioCDE_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
dbgu: serial@ffffee00 {
diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts
index 35799b8..fce8d77 100644
--- a/arch/arm/dts/at91sam9263ek.dts
+++ b/arch/arm/dts/at91sam9263ek.dts
@@ -15,7 +15,7 @@
chosen {
bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
stdout-path = "serial0:115200n8";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
memory {
@@ -35,7 +35,7 @@
ahb {
apb {
dbgu: serial@ffffee00 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9g15ek.dts b/arch/arm/dts/at91sam9g15ek.dts
index 9fae925..33f93fb 100644
--- a/arch/arm/dts/at91sam9g15ek.dts
+++ b/arch/arm/dts/at91sam9g15ek.dts
@@ -18,7 +18,7 @@
ahb {
apb {
hlcdc: hlcdc@f8038000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts
index ca982737..c30ad88 100644
--- a/arch/arm/dts/at91sam9g20-taurus.dts
+++ b/arch/arm/dts/at91sam9g20-taurus.dts
@@ -18,7 +18,7 @@
compatible = "atmel,at91sam9g20", "atmel,at91sam9";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &dbgu;
};
@@ -58,7 +58,7 @@
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
board {
pinctrl_pck0_as_mck: pck0_as_mck {
atmel,pins =
@@ -114,7 +114,7 @@
};
&watchdog {
- u-boot,dm-pre-reloc;
+ bootph-all;
timeout-sec = <15>;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9g20ek_common.dtsi b/arch/arm/dts/at91sam9g20ek_common.dtsi
index 7195454..249c88d 100644
--- a/arch/arm/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/dts/at91sam9g20ek_common.dtsi
@@ -9,7 +9,7 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &dbgu;
};
@@ -47,7 +47,7 @@
};
dbgu: serial@fffff200 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi b/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi
index 732dee6..ebb78c5 100644
--- a/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi
+++ b/arch/arm/dts/at91sam9g25-gardena-smart-gateway-u-boot.dtsi
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0+
&dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/at91sam9g35ek.dts b/arch/arm/dts/at91sam9g35ek.dts
index 0cc084e..a62ae91 100644
--- a/arch/arm/dts/at91sam9g35ek.dts
+++ b/arch/arm/dts/at91sam9g35ek.dts
@@ -23,7 +23,7 @@
};
hlcdc: hlcdc@f8038000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/at91sam9g45-corvus.dts b/arch/arm/dts/at91sam9g45-corvus.dts
index 172d185..67be80b 100644
--- a/arch/arm/dts/at91sam9g45-corvus.dts
+++ b/arch/arm/dts/at91sam9g45-corvus.dts
@@ -17,7 +17,7 @@
compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9";
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &dbgu;
};
@@ -38,7 +38,7 @@
ahb {
apb {
dbgu: serial@ffffee00 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9g45-gurnard.dts b/arch/arm/dts/at91sam9g45-gurnard.dts
index 2bc55f0..cf0c19c 100644
--- a/arch/arm/dts/at91sam9g45-gurnard.dts
+++ b/arch/arm/dts/at91sam9g45-gurnard.dts
@@ -32,10 +32,10 @@
};
ahb {
- u-boot,dm-pre-reloc;
+ bootph-all;
fb@0x00500000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
display-timings {
rev1 {
diff --git a/arch/arm/dts/at91sam9g45.dtsi b/arch/arm/dts/at91sam9g45.dtsi
index c9b2e46..d0bcd79 100644
--- a/arch/arm/dts/at91sam9g45.dtsi
+++ b/arch/arm/dts/at91sam9g45.dtsi
@@ -81,14 +81,14 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
aic: interrupt-controller@fffff000 {
#interrupt-cells = <3>;
@@ -120,7 +120,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main_osc: main_osc {
compatible = "atmel,at91rm9200-clk-main-osc";
@@ -173,7 +173,7 @@
clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>;
atmel,clk-output-range = <0 133333333>;
atmel,clk-divisors = <1 2 4 3>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usb: usbck {
@@ -441,7 +441,7 @@
0xfffff800 0x200
0xfffffa00 0x200
>;
- u-boot,dm-pre-reloc;
+ bootph-all;
atmel,mux-mask = <
/* A B */
@@ -484,7 +484,7 @@
};
dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_dbgu: dbgu-0 {
atmel,pins =
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
diff --git a/arch/arm/dts/at91sam9m10g45ek.dts b/arch/arm/dts/at91sam9m10g45ek.dts
index 52a76fe..bf38e1a 100644
--- a/arch/arm/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/dts/at91sam9m10g45ek.dts
@@ -17,7 +17,7 @@
chosen {
bootargs = "mem=64M root=/dev/mtdblock1 rw rootfstype=jffs2";
stdout-path = "serial0:115200n8";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
memory {
@@ -38,7 +38,7 @@
apb {
dbgu: serial@ffffee00 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usart1: serial@fff90000 {
diff --git a/arch/arm/dts/at91sam9n12.dtsi b/arch/arm/dts/at91sam9n12.dtsi
index 024be13..cb3a037 100644
--- a/arch/arm/dts/at91sam9n12.dtsi
+++ b/arch/arm/dts/at91sam9n12.dtsi
@@ -72,14 +72,14 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
aic: interrupt-controller@fffff000 {
#interrupt-cells = <3>;
@@ -104,7 +104,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main_rc_osc: main_rc_osc {
compatible = "atmel,at91sam9x5-clk-main-rc-osc";
@@ -171,7 +171,7 @@
atmel,clk-output-range = <0 133333333>;
atmel,clk-divisors = <1 2 4 3>;
atmel,master-clk-have-div3-pres;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usb: usbck {
@@ -247,18 +247,18 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
- u-boot,dm-pre-reloc;
+ bootph-all;
pioAB_clk: pioAB_clk@2 {
#clock-cells = <0>;
reg = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioCD_clk: pioCD_clk@3 {
#clock-cells = <0>;
reg = <3>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
fuse_clk: fuse_clk@4 {
@@ -505,11 +505,11 @@
0xfdffffff 0x07c00000 0xb83fffff /* pioC */
0x003fffff 0x003f8000 0x00000000 /* pioD */
>;
- u-boot,dm-pre-reloc;
+ bootph-all;
/* shared pinctrl settings */
dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_dbgu: dbgu-0 {
atmel,pins =
<AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
@@ -806,7 +806,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioAB_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB: gpio@fffff600 {
@@ -818,7 +818,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioAB_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC: gpio@fffff800 {
@@ -830,7 +830,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioCD_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioD: gpio@fffffa00 {
@@ -842,7 +842,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioCD_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
dbgu: serial@fffff200 {
diff --git a/arch/arm/dts/at91sam9n12ek.dts b/arch/arm/dts/at91sam9n12ek.dts
index 64a7abf..67578b5 100644
--- a/arch/arm/dts/at91sam9n12ek.dts
+++ b/arch/arm/dts/at91sam9n12ek.dts
@@ -16,7 +16,7 @@
chosen {
bootargs = "root=/dev/mtdblock1 rw rootfstype=jffs2";
stdout-path = "serial0:115200n8";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
memory {
@@ -36,7 +36,7 @@
ahb {
apb {
dbgu: serial@fffff200 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9rl.dtsi b/arch/arm/dts/at91sam9rl.dtsi
index 6d6aee5..b855c8f 100644
--- a/arch/arm/dts/at91sam9rl.dtsi
+++ b/arch/arm/dts/at91sam9rl.dtsi
@@ -78,7 +78,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
fb0: fb@00500000 {
compatible = "atmel,at91sam9rl-lcdc";
@@ -113,7 +113,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
tcb0: timer@fffa0000 {
compatible = "atmel,at91rm9200-tcb";
@@ -398,7 +398,7 @@
<0xffffffff 0x0000c780>, /* pioB */
<0xffffffff 0xe3ffff0e>, /* pioC */
<0x003fffff 0x0001ff3c>; /* pioD */
- u-boot,dm-pre-reloc;
+ bootph-all;
/* shared pinctrl settings */
adc0 {
@@ -440,7 +440,7 @@
};
dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_dbgu: dbgu-0 {
atmel,pins =
<AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
@@ -779,7 +779,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioA_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB: gpio@fffff600 {
@@ -791,7 +791,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioB_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC: gpio@fffff800 {
@@ -803,7 +803,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioC_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioD: gpio@fffffa00 {
@@ -815,7 +815,7 @@
interrupt-controller;
#interrupt-cells = <2>;
clocks = <&pioD_clk>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pmc: pmc@fffffc00 {
@@ -826,7 +826,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main: mainck {
compatible = "atmel,at91rm9200-clk-main";
@@ -862,7 +862,7 @@
clocks = <&clk32k>, <&main>, <&plla>, <&utmi>;
atmel,clk-output-range = <0 94000000>;
atmel,clk-divisors = <1 2 4 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
prog: progck {
@@ -909,30 +909,30 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
- u-boot,dm-pre-reloc;
+ bootph-all;
pioA_clk: pioA_clk@2 {
#clock-cells = <0>;
reg = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioB_clk: pioB_clk@3 {
#clock-cells = <0>;
reg = <3>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioC_clk: pioC_clk@4 {
#clock-cells = <0>;
reg = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pioD_clk: pioD_clk@5 {
#clock-cells = <0>;
reg = <5>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
usart0_clk: usart0_clk@6 {
diff --git a/arch/arm/dts/at91sam9rlek.dts b/arch/arm/dts/at91sam9rlek.dts
index ae42697..c94cc68 100644
--- a/arch/arm/dts/at91sam9rlek.dts
+++ b/arch/arm/dts/at91sam9rlek.dts
@@ -15,7 +15,7 @@
chosen {
bootargs = "rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw";
stdout-path = "serial0:115200n8";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
memory {
@@ -162,7 +162,7 @@
};
dbgu: serial@fffff200 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/at91sam9x35ek.dts b/arch/arm/dts/at91sam9x35ek.dts
index 3ca70c0..498c4da 100644
--- a/arch/arm/dts/at91sam9x35ek.dts
+++ b/arch/arm/dts/at91sam9x35ek.dts
@@ -22,7 +22,7 @@
status = "okay";
};
hlcdc: hlcdc@f8038000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/at91sam9x5.dtsi b/arch/arm/dts/at91sam9x5.dtsi
index bd4abe0..5fca9b1 100644
--- a/arch/arm/dts/at91sam9x5.dtsi
+++ b/arch/arm/dts/at91sam9x5.dtsi
@@ -81,14 +81,14 @@
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
apb {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
- u-boot,dm-pre-reloc;
+ bootph-all;
aic: interrupt-controller@fffff000 {
#interrupt-cells = <3>;
@@ -113,7 +113,7 @@
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
main_rc_osc: main_rc_osc {
compatible = "atmel,at91sam9x5-clk-main-rc-osc";
@@ -176,7 +176,7 @@
atmel,clk-output-range = <0 133333333>;
atmel,clk-divisors = <1 2 4 3>;
atmel,master-clk-have-div3-pres;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
@@ -259,7 +259,7 @@
#address-cells = <1>;
#size-cells = <0>;
clocks = <&mck>;
- u-boot,dm-pre-reloc;
+ bootph-all;
pioAB_clk: pioAB_clk@2 {
@@ -466,12 +466,12 @@
0xfffff800 0x200 /* pioC */
0xfffffa00 0x200 /* pioD */
>;
- u-boot,dm-pre-reloc;
+ bootph-all;
/* shared pinctrl settings */
dbgu {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_dbgu: dbgu-0 {
atmel,pins =
<AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
diff --git a/arch/arm/dts/at91sam9x5dm.dtsi b/arch/arm/dts/at91sam9x5dm.dtsi
index a620366..84ec9bc 100644
--- a/arch/arm/dts/at91sam9x5dm.dtsi
+++ b/arch/arm/dts/at91sam9x5dm.dtsi
@@ -31,7 +31,7 @@
pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888>;
display-timings {
- u-boot,dm-pre-reloc;
+ bootph-all;
800x480 {
clock-frequency = <24000000>;
hactive = <800>;
@@ -42,7 +42,7 @@
vfront-porch = <22>;
vback-porch = <21>;
vsync-len = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/at91sam9x5ek.dtsi b/arch/arm/dts/at91sam9x5ek.dtsi
index 1f7f37b..9d4e853 100644
--- a/arch/arm/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/dts/at91sam9x5ek.dtsi
@@ -15,7 +15,7 @@
chosen {
bootargs = "root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
stdout-path = "serial0:115200n8";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
ahb {
@@ -47,7 +47,7 @@
};
dbgu: serial@fffff200 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/bcm283x-u-boot.dtsi b/arch/arm/dts/bcm283x-u-boot.dtsi
index 22c67c4..8c17c6f 100644
--- a/arch/arm/dts/bcm283x-u-boot.dtsi
+++ b/arch/arm/dts/bcm283x-u-boot.dtsi
@@ -27,22 +27,22 @@
&uart0 {
skip-init;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1 {
skip-init;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0_gpio14 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1_gpio14 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/bcm63158.dtsi b/arch/arm/dts/bcm63158.dtsi
index 8b179ba..4bed1f9 100644
--- a/arch/arm/dts/bcm63158.dtsi
+++ b/arch/arm/dts/bcm63158.dtsi
@@ -74,7 +74,7 @@
};
clocks {
- u-boot,dm-pre-reloc;
+ bootph-all;
periph_clk: periph-clk {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -134,7 +134,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0xff800000 0x800000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
diff --git a/arch/arm/dts/bcm6855.dtsi b/arch/arm/dts/bcm6855.dtsi
index 05e0a4e..10c003a 100644
--- a/arch/arm/dts/bcm6855.dtsi
+++ b/arch/arm/dts/bcm6855.dtsi
@@ -65,7 +65,7 @@
};
clocks: clocks {
- u-boot,dm-pre-reloc;
+ bootph-all;
periph_clk: periph-clk {
compatible = "fixed-clock";
@@ -126,7 +126,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0xff800000 0x800000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
diff --git a/arch/arm/dts/bcm6856.dtsi b/arch/arm/dts/bcm6856.dtsi
index 99185ab..38c88f8 100644
--- a/arch/arm/dts/bcm6856.dtsi
+++ b/arch/arm/dts/bcm6856.dtsi
@@ -55,7 +55,7 @@
};
clocks: clocks {
- u-boot,dm-pre-reloc;
+ bootph-all;
periph_clk:periph-clk {
compatible = "fixed-clock";
@@ -109,7 +109,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0xff800000 0x800000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
uart0: serial@640 {
compatible = "brcm,bcm6345-uart";
diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi
index 19c4dd6..dc95047 100644
--- a/arch/arm/dts/bcm6858.dtsi
+++ b/arch/arm/dts/bcm6858.dtsi
@@ -74,7 +74,7 @@
};
clocks {
- u-boot,dm-pre-reloc;
+ bootph-all;
periph_clk: periph_clk {
compatible = "fixed-clock";
@@ -128,7 +128,7 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0xff800000 0x800000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
uart0: serial@640 {
compatible = "brcm,bcm6345-uart";
diff --git a/arch/arm/dts/bcm96753ref.dts b/arch/arm/dts/bcm96753ref.dts
index f74137f..ebc8c8e 100644
--- a/arch/arm/dts/bcm96753ref.dts
+++ b/arch/arm/dts/bcm96753ref.dts
@@ -28,7 +28,7 @@
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/bcm968360bg.dts b/arch/arm/dts/bcm968360bg.dts
index 6f1090a..1335f48 100644
--- a/arch/arm/dts/bcm968360bg.dts
+++ b/arch/arm/dts/bcm968360bg.dts
@@ -26,7 +26,7 @@
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/bcm968580xref.dts b/arch/arm/dts/bcm968580xref.dts
index 6d787bd..9aa4587 100644
--- a/arch/arm/dts/bcm968580xref.dts
+++ b/arch/arm/dts/bcm968580xref.dts
@@ -26,7 +26,7 @@
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/bitmain-antminer-s9.dts b/arch/arm/dts/bitmain-antminer-s9.dts
index 408862b..6c47396 100644
--- a/arch/arm/dts/bitmain-antminer-s9.dts
+++ b/arch/arm/dts/bitmain-antminer-s9.dts
@@ -70,13 +70,13 @@
};
&sdhci0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
disable-wp;
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts
index 8c1e379..cbc9213 100644
--- a/arch/arm/dts/ca-presidio-engboard.dts
+++ b/arch/arm/dts/ca-presidio-engboard.dts
@@ -40,7 +40,7 @@
};
uart0: serial@0xf4329148 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "cortina,ca-uart";
reg = <0x0 0xf4329148 0x30>;
status = "okay";
diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi
index d588628..3091304 100644
--- a/arch/arm/dts/da850-evm-u-boot.dtsi
+++ b/arch/arm/dts/da850-evm-u-boot.dtsi
@@ -8,7 +8,7 @@
/ {
soc@1c00000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
nand {
@@ -16,7 +16,7 @@
};
panel {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -29,17 +29,17 @@
};
&mmc0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serial2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&spi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/da850-lcdk-u-boot.dtsi b/arch/arm/dts/da850-lcdk-u-boot.dtsi
index d50775c..bbaebcb 100644
--- a/arch/arm/dts/da850-lcdk-u-boot.dtsi
+++ b/arch/arm/dts/da850-lcdk-u-boot.dtsi
@@ -13,7 +13,7 @@
};
soc@1c00000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
nand {
@@ -22,13 +22,13 @@
};
&mmc0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serial2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dm8168-evm-u-boot.dtsi b/arch/arm/dts/dm8168-evm-u-boot.dtsi
index de0bb9b..f939df2 100644
--- a/arch/arm/dts/dm8168-evm-u-boot.dtsi
+++ b/arch/arm/dts/dm8168-evm-u-boot.dtsi
@@ -7,6 +7,6 @@
/ {
ocp {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/dra7-evm-u-boot.dtsi b/arch/arm/dts/dra7-evm-u-boot.dtsi
index 5622512..f1ff5f6 100644
--- a/arch/arm/dts/dra7-evm-u-boot.dtsi
+++ b/arch/arm/dts/dra7-evm-u-boot.dtsi
@@ -15,38 +15,38 @@
};
&mmc2_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_ddr_rev20 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs200 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_iodelay_hs200_rev20_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&omap_dwc3_1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
dr_mode = "peripheral";
};
&usb2_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb3_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dra7-ipu-common-early-boot.dtsi b/arch/arm/dts/dra7-ipu-common-early-boot.dtsi
index ec6040f..90fc4cb 100644
--- a/arch/arm/dts/dra7-ipu-common-early-boot.dtsi
+++ b/arch/arm/dts/dra7-ipu-common-early-boot.dtsi
@@ -9,7 +9,7 @@
};
fs_loader0: fs_loader@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
phandlepart = <&mmc1 1>;
};
@@ -18,14 +18,14 @@
#address-cells = <2>;
#size-cells = <2>;
ranges;
- u-boot,dm-spl;
+ bootph-pre-ram;
ipu2_memory_region: ipu2-memory@95800000 {
compatible = "shared-dma-pool";
reg = <0x0 0x95800000 0x0 0x3800000>;
reusable;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
ipu1_memory_region: ipu1-memory@9d000000 {
@@ -33,81 +33,81 @@
reg = <0x0 0x9d000000 0x0 0x2000000>;
reusable;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
ipu1_pgtbl: ipu1-pgtbl@95700000 {
reg = <0x0 0x95700000 0x0 0x40000>;
no-map;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
ipu2_pgtbl: ipu2-pgtbl@95740000 {
reg = <0x0 0x95740000 0x0 0x40000>;
no-map;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&timer3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&timer4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&timer7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&timer8 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&timer9 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&timer11 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmu_ipu1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmu_ipu2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ipu1 {
status = "okay";
memory-region = <&ipu1_memory_region>;
pg-tbl = <&ipu1_pgtbl>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ipu2 {
status = "okay";
memory-region = <&ipu2_memory_region>;
pg-tbl = <&ipu2_pgtbl>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&l4_wkup {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&prm {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ipu1_rst {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ipu2_rst {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dra71-evm-u-boot.dtsi b/arch/arm/dts/dra71-evm-u-boot.dtsi
index 40443da..f13eadf 100644
--- a/arch/arm/dts/dra71-evm-u-boot.dtsi
+++ b/arch/arm/dts/dra71-evm-u-boot.dtsi
@@ -23,42 +23,42 @@
};
&mmc2_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_ddr_rev20 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_iodelay_ddr_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs200 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_iodelay_hs200_rev20_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&omap_dwc3_1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
dr_mode = "peripheral";
};
&usb2_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb3_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dra72-evm-revc-u-boot.dtsi b/arch/arm/dts/dra72-evm-revc-u-boot.dtsi
index 40443da..f13eadf 100644
--- a/arch/arm/dts/dra72-evm-revc-u-boot.dtsi
+++ b/arch/arm/dts/dra72-evm-revc-u-boot.dtsi
@@ -23,42 +23,42 @@
};
&mmc2_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_ddr_rev20 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_iodelay_ddr_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs200 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_iodelay_hs200_rev20_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&omap_dwc3_1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
dr_mode = "peripheral";
};
&usb2_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb3_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dra72-evm-u-boot.dtsi b/arch/arm/dts/dra72-evm-u-boot.dtsi
index 6c868f7..91a3b6b 100644
--- a/arch/arm/dts/dra72-evm-u-boot.dtsi
+++ b/arch/arm/dts/dra72-evm-u-boot.dtsi
@@ -6,18 +6,18 @@
#include "omap5-u-boot.dtsi"
&omap_dwc3_1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
dr_mode = "peripheral";
};
&usb2_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb3_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dra76-evm-u-boot.dtsi b/arch/arm/dts/dra76-evm-u-boot.dtsi
index 5fae6ba..db5a466 100644
--- a/arch/arm/dts/dra76-evm-u-boot.dtsi
+++ b/arch/arm/dts/dra76-evm-u-boot.dtsi
@@ -15,30 +15,30 @@
};
&mmc2_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_pins_hs200 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2_iodelay_hs200_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&omap_dwc3_1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
dr_mode = "peripheral";
};
&usb2_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb3_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi b/arch/arm/dts/dragonboard410c-uboot.dtsi
index e4fecaa..3b0bd0e 100644
--- a/arch/arm/dts/dragonboard410c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard410c-uboot.dtsi
@@ -8,26 +8,26 @@
/ {
smem {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl@1000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
uart {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
qcom,gcc@1800000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
serial@78b0000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi b/arch/arm/dts/dragonboard820c-uboot.dtsi
index 2270ac7..457728a 100644
--- a/arch/arm/dts/dragonboard820c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard820c-uboot.dtsi
@@ -7,26 +7,26 @@
/ {
smem {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl@1010000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
uart {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
clock-controller@300000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
serial@75b0000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/dragonboard845c-uboot.dtsi b/arch/arm/dts/dragonboard845c-uboot.dtsi
index 8b5a7ee..7106db8 100644
--- a/arch/arm/dts/dragonboard845c-uboot.dtsi
+++ b/arch/arm/dts/dragonboard845c-uboot.dtsi
@@ -9,18 +9,18 @@
/
{
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
serial@a84000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
clock-controller@100000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl_north@3900000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi
index cdc965d..1425176 100644
--- a/arch/arm/dts/exynos5.dtsi
+++ b/arch/arm/dts/exynos5.dtsi
@@ -137,7 +137,7 @@
};
fimd@14400000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "samsung,exynos-fimd";
reg = <0x14400000 0x10000>;
#address-cells = <1>;
@@ -218,7 +218,7 @@
compatible = "samsung,exynos4210-uart";
reg = <0x12C30000 0x100>;
interrupts = <0 54 0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
id = <3>;
};
};
diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts b/arch/arm/dts/exynos5422-odroidxu3.dts
index 256df6d..9d055d0 100644
--- a/arch/arm/dts/exynos5422-odroidxu3.dts
+++ b/arch/arm/dts/exynos5422-odroidxu3.dts
@@ -31,7 +31,7 @@
};
adc@12D10000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
vdd-supply = <&ldo4_reg>;
status = "okay";
};
diff --git a/arch/arm/dts/exynos7420.dtsi b/arch/arm/dts/exynos7420.dtsi
index b8bf373..373f48c 100644
--- a/arch/arm/dts/exynos7420.dtsi
+++ b/arch/arm/dts/exynos7420.dtsi
@@ -15,14 +15,14 @@
fin_pll: xxti {
compatible = "fixed-clock";
clock-output-names = "fin_pll";
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
};
clock_topc: clock-controller@10570000 {
compatible = "samsung,exynos7-clock-topc";
reg = <0x10570000 0x10000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <1>;
clocks = <&fin_pll>;
clock-names = "fin_pll";
@@ -31,7 +31,7 @@
clock_top0: clock-controller@105d0000 {
compatible = "samsung,exynos7-clock-top0";
reg = <0x105d0000 0xb000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <1>;
clocks = <&fin_pll>, <&clock_topc DOUT_SCLK_BUS0_PLL>,
<&clock_topc DOUT_SCLK_BUS1_PLL>,
@@ -45,7 +45,7 @@
clock_peric1: clock-controller@14c80000 {
compatible = "samsung,exynos7-clock-peric1";
reg = <0x14c80000 0xd00>;
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <1>;
clocks = <&fin_pll>, <&clock_top0 DOUT_ACLK_PERIC1>,
<&clock_top0 CLK_SCLK_UART1>,
@@ -58,21 +58,21 @@
pinctrl@13470000 {
compatible = "samsung,exynos7420-pinctrl";
reg = <0x13470000 0x1000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
serial2_bus: serial2-bus {
samsung,pins = "gpd1-4", "gpd1-5";
samsung,pin-function = <2>;
samsung,pin-pud = <3>;
samsung,pin-drv = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
serial@14C30000 {
compatible = "samsung,exynos4210-uart";
reg = <0x14C30000 0x100>;
- u-boot,dm-pre-reloc;
+ bootph-all;
clocks = <&clock_peric1 PCLK_UART2>,
<&clock_peric1 SCLK_UART2>;
clock-names = "uart", "clk_uart_baud0";
diff --git a/arch/arm/dts/exynos78x0.dtsi b/arch/arm/dts/exynos78x0.dtsi
index fb9c9cb..11d8396 100644
--- a/arch/arm/dts/exynos78x0.dtsi
+++ b/arch/arm/dts/exynos78x0.dtsi
@@ -15,7 +15,7 @@
fin_pll: xxti {
compatible = "fixed-clock";
clock-output-names = "fin_pll";
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
};
@@ -24,14 +24,14 @@
compatible = "fixed-clock";
clock-output-names = "fin_uart";
clock-frequency = <132710400>;
- u-boot,dm-pre-reloc;
+ bootph-all;
#clock-cells = <0>;
};
uart2: serial@13820000 {
compatible = "samsung,exynos4210-uart";
reg = <0x13820000 0x100>;
- u-boot,dm-pre-reloc;
+ bootph-all;
clocks = <&fin_uart>, <&fin_uart>; // driver uses 1st clock
clock-names = "uart", "clk_uart_baud0";
pinctrl-names = "default";
diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
index 956d724..f2d6b18 100644
--- a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi
@@ -4,133 +4,133 @@
*/
&mu {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&clk {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&iomuxc {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio4 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio5 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio6 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio7 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_dma {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_dma_lpuart1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn_sdch0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn_sdch1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn_sdch2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio4 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio5 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio6 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio7 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&lpuart0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&lpuart1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&lpuart2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&lpuart3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&usdhc1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&usdhc2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&usdhc3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
diff --git a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
index eefdccf..6e5379e 100644
--- a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
@@ -7,156 +7,156 @@
&{/imx8qm-pm} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mu {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma_lpuart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam_jr3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi
index 3ca53bb..79f08ec 100644
--- a/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qxp-ai_ml-u-boot.dtsi
@@ -5,113 +5,113 @@
&{/imx8qx-pm} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mu {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
index 91e2944..de014c8 100644
--- a/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi
@@ -7,125 +7,125 @@
&{/imx8qx-pm} {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&mu {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&clk {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&iomuxc {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio4 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio5 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio6 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_lsio_gpio7 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_dma {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_dma_lpuart0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_dma_lpuart3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn_sdch0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn_sdch1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pd_conn_sdch2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio0 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio4 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio5 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio6 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&gpio7 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&lpuart3 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&usdhc1 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&usdhc2 {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi
index 17f44e1..591eb66 100644
--- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi
@@ -7,156 +7,156 @@
&{/imx8qx-pm} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mu {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma_lpuart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_caam_jr3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/fsl-imx8qxp-mek.dts b/arch/arm/dts/fsl-imx8qxp-mek.dts
index 4f35fbe..6a987f0 100644
--- a/arch/arm/dts/fsl-imx8qxp-mek.dts
+++ b/arch/arm/dts/fsl-imx8qxp-mek.dts
@@ -135,7 +135,7 @@
};
&A35_0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lpuart0 {
diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index 08e7231..83750ab 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -153,30 +153,30 @@
#endif
&fspi {
- u-boot,dm-pre-reloc;
+ bootph-all;
flash@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&dspi2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&esdhc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&esdhc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lpuart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&duart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/*
@@ -197,9 +197,9 @@
};
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sysclk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/fsl-ls1088a-qds.dtsi b/arch/arm/dts/fsl-ls1088a-qds.dtsi
index 21c5007..85dc745 100644
--- a/arch/arm/dts/fsl-ls1088a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1088a-qds.dtsi
@@ -24,7 +24,7 @@
&i2c0 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
fpga@66 {
#address-cells = <1>;
diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts
index 5cdd598..ad05943 100644
--- a/arch/arm/dts/fsl-ls1088a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1088a-rdb.dts
@@ -121,7 +121,7 @@
&i2c0 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
i2c-mux@77 {
compatible = "nxp,pca9547";
diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index 9e68c14..a609290 100644
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
@@ -146,7 +146,7 @@
&i2c0 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
pca9547@75 {
compatible = "nxp,pca9547";
diff --git a/arch/arm/dts/fsl-lx2160a-qds.dtsi b/arch/arm/dts/fsl-lx2160a-qds.dtsi
index 69e11cc..6635c52 100644
--- a/arch/arm/dts/fsl-lx2160a-qds.dtsi
+++ b/arch/arm/dts/fsl-lx2160a-qds.dtsi
@@ -143,7 +143,7 @@
&i2c0 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
fpga@66 {
#address-cells = <1>;
diff --git a/arch/arm/dts/fsl-lx2160a-rdb.dts b/arch/arm/dts/fsl-lx2160a-rdb.dts
index 8ca4afa..3994097 100644
--- a/arch/arm/dts/fsl-lx2160a-rdb.dts
+++ b/arch/arm/dts/fsl-lx2160a-rdb.dts
@@ -110,7 +110,7 @@
&i2c0 {
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c4 {
diff --git a/arch/arm/dts/hi3660-hikey960-u-boot.dtsi b/arch/arm/dts/hi3660-hikey960-u-boot.dtsi
index 648c77f..b7ea672 100644
--- a/arch/arm/dts/hi3660-hikey960-u-boot.dtsi
+++ b/arch/arm/dts/hi3660-hikey960-u-boot.dtsi
@@ -6,5 +6,5 @@
*/
&dwmmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/hi6220-hikey-u-boot.dtsi b/arch/arm/dts/hi6220-hikey-u-boot.dtsi
index 3113983..fcfcb37 100644
--- a/arch/arm/dts/hi6220-hikey-u-boot.dtsi
+++ b/arch/arm/dts/hi6220-hikey-u-boot.dtsi
@@ -6,9 +6,9 @@
*/
&mmc0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mmc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/hpe-gxp-u-boot.dtsi b/arch/arm/dts/hpe-gxp-u-boot.dtsi
index 7a2b488..63a1a11 100644
--- a/arch/arm/dts/hpe-gxp-u-boot.dtsi
+++ b/arch/arm/dts/hpe-gxp-u-boot.dtsi
@@ -8,10 +8,10 @@
/ {
axi {
- u-boot,dm-pre-reloc;
+ bootph-all;
ahb@c0000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
spi0: spi@200 {
compatible = "hpe,gxp-spi";
diff --git a/arch/arm/dts/imx28-xea-u-boot.dtsi b/arch/arm/dts/imx28-xea-u-boot.dtsi
index 8b5d7e1..f648815 100644
--- a/arch/arm/dts/imx28-xea-u-boot.dtsi
+++ b/arch/arm/dts/imx28-xea-u-boot.dtsi
@@ -13,36 +13,36 @@
#include "imx28-u-boot.dtsi"
/ {
apb@80000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
apbh@80000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
apbx@80040000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ssp0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ssp3 {
num-cs = <2>;
spi-max-frequency = <40000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
index 869adb9..62453db 100644
--- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
+++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi
@@ -5,10 +5,10 @@
/ {
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
bus@50000000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -19,29 +19,29 @@
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio6 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx53-ppd-uboot.dtsi b/arch/arm/dts/imx53-ppd-uboot.dtsi
index b293e27..f06cd8a 100644
--- a/arch/arm/dts/imx53-ppd-uboot.dtsi
+++ b/arch/arm/dts/imx53-ppd-uboot.dtsi
@@ -38,21 +38,21 @@
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6dl-brppt2.dts b/arch/arm/dts/imx6dl-brppt2.dts
index f515e4c..575bfac 100644
--- a/arch/arm/dts/imx6dl-brppt2.dts
+++ b/arch/arm/dts/imx6dl-brppt2.dts
@@ -109,7 +109,7 @@
};
vbus1_regulator: regulator@1 {
- u-boot,dm-preloc;
+ bootph-all;
compatible = "regulator-fixed";
regulator-name = "vbus1_regulator";
regulator-min-microvolt = <5000000>;
@@ -155,8 +155,8 @@
};
&uart1 {
- u-boot,dm-spl;
- u-boot,dm-preloc;
+ bootph-pre-ram;
+ bootph-all;
status = "okay";
};
@@ -239,22 +239,22 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
@@ -263,13 +263,13 @@
};
&ecspi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
cs-gpios = <&gpio3 19 GPIO_ACTIVE_LOW>, <&gpio3 19 GPIO_ACTIVE_LOW>;
status = "okay";
spi-max-frequency = <25000000>;
m25p32@1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p", "jedec,spi-nor";
diff --git a/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
index c4e8d0f..31f3a48 100644
--- a/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx6dl-colibri-eval-v3-u-boot.dtsi
@@ -16,5 +16,5 @@
&wdog1 {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
index 06dd725..7fbeb25 100644
--- a/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
+++ b/arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
@@ -6,5 +6,5 @@
#include "imx6qdl-icore-u-boot.dtsi"
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
index 3af57ff..c37aa12 100644
--- a/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
+++ b/arch/arm/dts/imx6dl-mamoj-u-boot.dtsi
@@ -6,9 +6,9 @@
#include "imx6qdl-u-boot.dtsi"
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi b/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
index df80956..3d19796 100644
--- a/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-apalis-eval-u-boot.dtsi
@@ -21,5 +21,5 @@
&wdog1 {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi b/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi
index 37c182d..c6cb9a5 100644
--- a/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-bosch-acc-u-boot.dtsi
@@ -10,18 +10,18 @@
};
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
bus@2000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
spba-bus@2000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
bus@2100000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -32,49 +32,49 @@
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi
index ced4dac..dbe0ef7 100644
--- a/arch/arm/dts/imx6q-display5-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi
@@ -21,10 +21,10 @@
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
bus@2100000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -45,5 +45,5 @@
};
&uart5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi b/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
index 06dd725..7fbeb25 100644
--- a/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
@@ -6,5 +6,5 @@
#include "imx6qdl-icore-u-boot.dtsi"
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6q-kp-u-boot.dtsi b/arch/arm/dts/imx6q-kp-u-boot.dtsi
index e6b71b2..83d406a 100644
--- a/arch/arm/dts/imx6q-kp-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-kp-u-boot.dtsi
@@ -10,9 +10,9 @@
/ {
clocks {
- u-boot,dm-spl;
+ bootph-pre-ram;
osc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -23,37 +23,37 @@
};
&clks {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi
index ee44ed9..2b28d36 100644
--- a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi
@@ -6,25 +6,25 @@
#include "imx6qdl-u-boot.dtsi"
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi b/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
index 5a64f86..08b4ee0 100644
--- a/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi
@@ -6,39 +6,39 @@
#include "imx6qdl-u-boot.dtsi"
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ecspi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_ecspi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&m25p80 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpmi {
diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi
index d48719e..1d9eaff 100644
--- a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi
+++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi
@@ -1,17 +1,17 @@
// SPDX-License-Identifier: GPL-2.0+
&{/soc/bus@2000000} { /* AIPS1 */
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&{/soc} {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi b/arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi
index 3063f01..3146dbb 100644
--- a/arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-aristainetos2-u-boot.dtsi
@@ -5,7 +5,7 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart2;
};
@@ -16,19 +16,19 @@
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_gpio {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&backlight {
@@ -41,7 +41,7 @@
* because "pinctrl-assert-gpios" from &ecspi1 isn't handled by u-boot
*/
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
wp_spi_nor {
gpio-hog;
@@ -59,21 +59,21 @@
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&ecspi4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&flash {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_ecspi4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi b/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi
index 88826a2..33c3467 100644
--- a/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-aristainetos2c-u-boot.dtsi
@@ -5,7 +5,7 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart2;
};
@@ -16,23 +16,23 @@
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_gpio {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&backlight {
@@ -45,7 +45,7 @@
* because "pinctrl-assert-gpios" from &ecspi1 isn't handled by u-boot
*/
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
wp_spi_nor {
gpio-hog;
@@ -61,17 +61,17 @@
};
&gpio4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&ecspi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&flash {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_ecspi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi b/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi
index 8c2ed70..04ed0c1 100644
--- a/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-aristainetos2c_cslb-u-boot.dtsi
@@ -5,7 +5,7 @@
/ {
chosen {
- u-boot,dm-pre-reloc;
+ bootph-all;
stdout-path = &uart1;
};
@@ -16,23 +16,23 @@
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_gpio {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&backlight {
@@ -45,7 +45,7 @@
* because "pinctrl-assert-gpios" from &ecspi1 isn't handled by u-boot
*/
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
wp_spi_nor {
gpio-hog;
@@ -61,17 +61,17 @@
};
&gpio4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&ecspi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&flash {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_ecspi1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi
index e1cb9b3..23a0577 100644
--- a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi
@@ -16,35 +16,35 @@
};
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_microsom_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio6 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usdhc1 {
@@ -52,9 +52,9 @@
};
&usdhc2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usdhc3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
index 158cadc..4476d3c 100644
--- a/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
@@ -6,17 +6,17 @@
#include "imx6qdl-u-boot.dtsi"
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi
index 12e46e3..e02cd58 100644
--- a/arch/arm/dts/imx6qdl-icore-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-icore-u-boot.dtsi
@@ -6,29 +6,29 @@
#include "imx6qdl-u-boot.dtsi"
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi
index ea90f40..cdc7214 100644
--- a/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi
@@ -13,9 +13,9 @@
&usdhc3 {
no-1-8-v;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
index cbb856f..5c4101b 100644
--- a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi
@@ -12,9 +12,9 @@
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi
index f74af6c..cab9b6c 100644
--- a/arch/arm/dts/imx6qdl-u-boot.dtsi
+++ b/arch/arm/dts/imx6qdl-u-boot.dtsi
@@ -10,30 +10,30 @@
};
soc {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
bus@2000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
spba-bus@2000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
bus@2100000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ipu1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6sll-evk-u-boot.dtsi b/arch/arm/dts/imx6sll-evk-u-boot.dtsi
index 14d0b58..0e60906 100644
--- a/arch/arm/dts/imx6sll-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6sll-evk-u-boot.dtsi
@@ -4,5 +4,5 @@
*/
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
index 7812aa3..b619d98 100644
--- a/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
+++ b/arch/arm/dts/imx6sx-sabreauto-u-boot.dtsi
@@ -16,5 +16,5 @@
};
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
index 301838d..eaa2a45 100644
--- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
@@ -4,25 +4,25 @@
*/
&{/aliases} {
- u-boot,dm-pre-reloc;
+ bootph-all;
display0 = &lcdif;
};
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lcdif {
display = <&display0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
display0: display@0 {
bits-per-pixel = <24>;
diff --git a/arch/arm/dts/imx6ul-geam-u-boot.dtsi b/arch/arm/dts/imx6ul-geam-u-boot.dtsi
index 3141a07..014b6bd 100644
--- a/arch/arm/dts/imx6ul-geam-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-geam-u-boot.dtsi
@@ -6,19 +6,19 @@
#include "imx6ul-u-boot.dtsi"
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
pinctrl_usdhc1: usdhc1grp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
diff --git a/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi
index 6256b79..a177aca 100644
--- a/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi
@@ -6,5 +6,5 @@
#include "imx6ul-isiot-u-boot.dtsi"
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi
index 7213e71..8f58886 100644
--- a/arch/arm/dts/imx6ul-isiot-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-isiot-u-boot.dtsi
@@ -6,29 +6,29 @@
#include "imx6ul-u-boot.dtsi"
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi
index 4918de3..ebfb95d 100644
--- a/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi
@@ -7,22 +7,22 @@
/ {
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
index 3f351ef..aa88964 100644
--- a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
@@ -14,21 +14,21 @@
};
&aips1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
spba-bus@02000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&lcdif {
- u-boot,dm-pre-proper;
+ bootph-some-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-u-boot.dtsi
index eb190cf..cad22619 100644
--- a/arch/arm/dts/imx6ul-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-u-boot.dtsi
@@ -5,26 +5,26 @@
/ {
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&aips1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi
index d283e81..a6c2cc8 100644
--- a/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-14x14-evk-u-boot.dtsi
@@ -4,5 +4,5 @@
*/
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
index 0a73226..6823b42 100644
--- a/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-colibri-eval-v3-u-boot.dtsi
@@ -5,18 +5,18 @@
/ {
aliases {
- u-boot,dm-pre-reloc;
+ bootph-all;
usb0 = &usbotg1; /* required for ums */
display0 = &lcdif;
};
};
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart1_ctrl1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lcdif {
@@ -25,7 +25,7 @@
&pinctrl_lcdif_ctrl>;
status = "okay";
display = <&display0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
display0: display0 {
bits-per-pixel = <18>;
@@ -35,7 +35,7 @@
display-timings {
native-mode = <&timing_vga>;
timing_vga: 640x480 {
- u-boot,dm-pre-reloc;
+ bootph-all;
clock-frequency = <25175000>;
hactive = <640>;
vactive = <480>;
diff --git a/arch/arm/dts/imx6ull-dart-6ul.dtsi b/arch/arm/dts/imx6ull-dart-6ul.dtsi
index fab926f..d2a74dd 100644
--- a/arch/arm/dts/imx6ull-dart-6ul.dtsi
+++ b/arch/arm/dts/imx6ull-dart-6ul.dtsi
@@ -47,7 +47,7 @@
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpmi {
@@ -94,10 +94,10 @@
scl-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
sda-gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>;
status = "okay";
- u-boot,dm-pre-reloc;
+ bootph-all;
eeprom_som: eeprom@50 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "atmel,24c04";
reg = <0x50>;
status = "okay";
@@ -197,7 +197,7 @@
};
pinctrl_i2c2: i2cgrp {
- u-boot,dm-pre-reloc;
+ bootph-all;
fsl,pins = <
MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
@@ -205,7 +205,7 @@
};
pinctrl_i2c2_gpio: i2c2grp_gpio {
- u-boot,dm-pre-reloc;
+ bootph-all;
fsl,pins = <
MX6UL_PAD_UART5_TX_DATA__GPIO1_IO30 0x1b8b0
MX6UL_PAD_UART5_RX_DATA__GPIO1_IO31 0x1b8b0
diff --git a/arch/arm/dts/imx6ull-mys-6ulx-u-boot.dtsi b/arch/arm/dts/imx6ull-mys-6ulx-u-boot.dtsi
index cd15d9b..05004a7 100644
--- a/arch/arm/dts/imx6ull-mys-6ulx-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-mys-6ulx-u-boot.dtsi
@@ -5,20 +5,20 @@
*/
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpmi {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&usdhc1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&usdhc2 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi b/arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi
index 054e1aa..ab7dc39 100644
--- a/arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi
@@ -5,20 +5,20 @@
*/
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpmi {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&usdhc1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&usdhc2 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6ull-u-boot.dtsi b/arch/arm/dts/imx6ull-u-boot.dtsi
index 74ca95f..0d76796 100644
--- a/arch/arm/dts/imx6ull-u-boot.dtsi
+++ b/arch/arm/dts/imx6ull-u-boot.dtsi
@@ -5,30 +5,30 @@
/ {
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&aips1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi
index d283e81..a6c2cc8 100644
--- a/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ulz-14x14-evk-u-boot.dtsi
@@ -4,5 +4,5 @@
*/
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi b/arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi
index 75dbf6e..7730bb6 100644
--- a/arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi
+++ b/arch/arm/dts/imx6ulz-bsh-smm-m2-u-boot.dtsi
@@ -6,30 +6,30 @@
*/
&{/soc} {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&aips2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc_snvs {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpmi {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx7-cm-u-boot.dtsi b/arch/arm/dts/imx7-cm-u-boot.dtsi
index c6970c5..676e119 100644
--- a/arch/arm/dts/imx7-cm-u-boot.dtsi
+++ b/arch/arm/dts/imx7-cm-u-boot.dtsi
@@ -5,13 +5,13 @@
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
index 1bf3f4a..52aa875 100644
--- a/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-colibri-eval-v3-u-boot.dtsi
@@ -15,7 +15,7 @@
pinctrl-0 = <&pinctrl_lcdif_dat
&pinctrl_lcdif_ctrl>;
display = <&display0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
display0: display0 {
bits-per-pixel = <18>;
diff --git a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
index 7307fba..67b41ae 100644
--- a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
@@ -15,7 +15,7 @@
pinctrl-0 = <&pinctrl_lcdif>;
status = "okay";
display = <&display0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
display0: display {
bits-per-pixel = <16>;
diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi
index bc4b574..49b992d 100644
--- a/arch/arm/dts/imx7s-warp-u-boot.dtsi
+++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi
@@ -10,17 +10,17 @@
};
&aips3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl_uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx7ulp-com-u-boot.dtsi b/arch/arm/dts/imx7ulp-com-u-boot.dtsi
index b766c5e..f6d34e1 100644
--- a/arch/arm/dts/imx7ulp-com-u-boot.dtsi
+++ b/arch/arm/dts/imx7ulp-com-u-boot.dtsi
@@ -4,34 +4,34 @@
*/
&iomuxc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ahbbridge0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ahbbridge1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbotg1 {
extcon = <&usbphy1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbphy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio_ptc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx7ulp-uboot.dtsi b/arch/arm/dts/imx7ulp-uboot.dtsi
index 712cec4..60a3cec 100644
--- a/arch/arm/dts/imx7ulp-uboot.dtsi
+++ b/arch/arm/dts/imx7ulp-uboot.dtsi
@@ -7,37 +7,37 @@
*/
&soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&ahbbridge0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&ahbbridge1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&iomuxc1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lpuart4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lpuart5 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lpuart6 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&lpuart7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi
index 00ac413..fd0061f 100644
--- a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi
@@ -9,12 +9,12 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&aips4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
@@ -26,23 +26,23 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pca6416_0 {
@@ -54,31 +54,31 @@
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usbotg1 {
@@ -86,41 +86,41 @@
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbmisc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbotg1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbphynop1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
index 5cbc70f..484e318 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
@@ -15,17 +15,17 @@
wdt-reboot {
compatible = "wdt-reboot";
- u-boot,dm-spl;
+ bootph-pre-ram;
wdt = <&wdog1>;
};
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman_fip {
@@ -50,73 +50,73 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
index a7044b6..1878c4e 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi
@@ -15,17 +15,17 @@
wdt-reboot {
compatible = "wdt-reboot";
- u-boot,dm-spl;
+ bootph-pre-ram;
wdt = <&wdog1>;
};
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fec1 {
@@ -33,77 +33,77 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi b/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi
index 184c30a..144c42b 100644
--- a/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi
@@ -19,80 +19,80 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&buck4_reg {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&buck5_reg {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_hog_sbc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
regulators {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbotg1 {
@@ -100,17 +100,17 @@
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
index d82428f..13688ec 100644
--- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi
@@ -9,7 +9,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
firmware {
@@ -21,7 +21,7 @@
};
&aips4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
@@ -29,116 +29,116 @@
};
&pinctrl_reg_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbmisc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbphynop1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbotg1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
fsl,signal-voltage-switch-extra-delay-ms = <8>;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fec1 {
@@ -146,5 +146,5 @@
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi
index 8b67bcf..a009880 100644
--- a/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-icore-mx8mm-ctouch2-u-boot.dtsi
@@ -7,25 +7,25 @@
#include "imx8mm-icore-mx8mm-u-boot.dtsi"
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi
index 8b67bcf..a009880 100644
--- a/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2-u-boot.dtsi
@@ -7,25 +7,25 @@
#include "imx8mm-icore-mx8mm-u-boot.dtsi"
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi
index e7d179d..bc4e434 100644
--- a/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-icore-mx8mm-u-boot.dtsi
@@ -7,21 +7,21 @@
#include "imx8mm-u-boot.dtsi"
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3_100mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3_200mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
index 5b8b472..65dfd33 100644
--- a/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-kontron-bl-common-u-boot.dtsi
@@ -14,7 +14,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
firmware {
@@ -26,24 +26,24 @@
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&i2c2 {
@@ -62,87 +62,87 @@
};
&pinctrl_ecspi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart3 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1_100mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1_200mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pca9450 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ecspi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
index 7f5f8c3..a16ce54 100644
--- a/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-mx8menlo-u-boot.dtsi
@@ -18,7 +18,7 @@
};
&aips4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c4 {
@@ -26,17 +26,17 @@
};
®_usb_otg1_vbus {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbmisc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbphynop1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbotg1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-phg-u-boot.dtsi b/arch/arm/dts/imx8mm-phg-u-boot.dtsi
index 3bf45ef..3ced97c 100644
--- a/arch/arm/dts/imx8mm-phg-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-phg-u-boot.dtsi
@@ -9,7 +9,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
firmware {
@@ -21,7 +21,7 @@
};
&aips4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
@@ -29,67 +29,67 @@
};
&pinctrl_reg_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbmisc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbphynop1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbotg1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
assigned-clocks = <&clk IMX8MM_CLK_USDHC2>;
@@ -98,7 +98,7 @@
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
/*
@@ -113,25 +113,25 @@
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 25dc8e1..7fd5a05 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -10,21 +10,21 @@
};
&soc {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&aips1 {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman {
@@ -189,28 +189,28 @@
};
&clk {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
/delete-property/ assigned-clock-rates;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&osc_24m {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&spba1 {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&spba2 {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi
index e877580..6ab21fd 100644
--- a/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi
@@ -12,13 +12,13 @@
};
&pinctrl_fec1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@69} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@69/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi
index dc99e7b..e68030e 100644
--- a/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi
@@ -181,17 +181,17 @@
};
&pinctrl_fec1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi
index d58a7d1..91b33a9 100644
--- a/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi
@@ -176,17 +176,17 @@
};
&pinctrl_fec1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi
index ff9b12a..9590d09 100644
--- a/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-gw7903-u-boot.dtsi
@@ -109,17 +109,17 @@
};
&pinctrl_fec1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi
index aa1153f..4171c6b 100644
--- a/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-gw7904-u-boot.dtsi
@@ -30,17 +30,17 @@
};
&pinctrl_fec1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a30000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-venice-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-u-boot.dtsi
index 6f786b9..8337c4a 100644
--- a/arch/arm/dts/imx8mm-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-venice-u-boot.dtsi
@@ -9,74 +9,74 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
index 809c39c..494229e 100644
--- a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
@@ -15,7 +15,7 @@
wdt-reboot {
compatible = "wdt-reboot";
- u-boot,dm-spl;
+ bootph-pre-ram;
wdt = <&wdog1>;
};
};
@@ -27,11 +27,11 @@
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman_uboot {
@@ -39,27 +39,27 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
eeprom_module: eeprom@50 {
compatible = "i2c-eeprom";
@@ -89,45 +89,45 @@
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
index 3180d57..4be0098 100644
--- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
@@ -6,23 +6,23 @@
#include "imx8mn-u-boot.dtsi"
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pca6416_0 {
@@ -34,27 +34,27 @@
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
@@ -62,27 +62,27 @@
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
index 3967e0b..19b0d89 100644
--- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
+++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
@@ -7,49 +7,49 @@
#include "imx8mn-u-boot.dtsi"
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi
index bd4da7d..fb86657 100644
--- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot.dtsi
@@ -7,9 +7,9 @@
#include "imx8mn-bsh-smm-s2-u-boot-common.dtsi"
&pinctrl_gpmi_nand {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpmi {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi
index b8396a4..f6f8313 100644
--- a/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-bsh-smm-s2pro-u-boot.dtsi
@@ -7,9 +7,9 @@
#include "imx8mn-bsh-smm-s2-u-boot-common.dtsi"
&pinctrl_usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
index 54f3ebe..315714f 100644
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -6,7 +6,7 @@
#include "imx8mn-u-boot.dtsi"
&pinctrl_reg_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
@@ -14,77 +14,77 @@
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
index 6c6c949..056ab31 100644
--- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
@@ -6,21 +6,21 @@
#include "imx8mn-ddr4-evk-u-boot.dtsi"
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index 98659bb..cef20da 100644
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -18,55 +18,55 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
/delete-property/ assigned-clock-rates;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&spba1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman {
diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
index a206831..af80aae 100644
--- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
@@ -6,65 +6,65 @@
#include "imx8mn-u-boot.dtsi"
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_reg_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi
index 10656ce..53a5ac0 100644
--- a/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-gw7902-u-boot.dtsi
@@ -134,17 +134,17 @@
};
&pinctrl_fec1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
index 4af6b8b..4109d26 100644
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -6,65 +6,65 @@
#include "imx8mn-u-boot.dtsi"
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
index ae838ca..b69e714 100644
--- a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
@@ -21,16 +21,16 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&buck4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&buck5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&eqos {
@@ -40,87 +40,87 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c3_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_100mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_200mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3_100mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3_100mhz {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
regulators {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
/* SDIO WiFi */
@@ -129,13 +129,13 @@
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi
index f43eb62..0d489a7 100644
--- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi
@@ -9,7 +9,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
firmware {
optee {
@@ -24,111 +24,111 @@
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&eqos {
diff --git a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi
index 342c523..9918f81 100644
--- a/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2-u-boot.dtsi
@@ -10,7 +10,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
firmware {
@@ -26,108 +26,108 @@
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
no-1-8-v;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&eqos {
diff --git a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
index cf591ad..c398a74 100644
--- a/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi
@@ -12,54 +12,54 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
index dbc48df..1c7b250 100644
--- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
@@ -10,74 +10,74 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_pins {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
index 32d9fbc..f3fb440 100644
--- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
@@ -10,7 +10,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
firmware {
@@ -22,110 +22,110 @@
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_pmic {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@30800000/i2c@30a20000/pca9450@25/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
assigned-clocks = <&clk IMX8MP_CLK_USDHC1>;
assigned-clock-rates = <400000000>;
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_400M>;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
sd-uhs-sdr104;
sd-uhs-ddr50;
assigned-clocks = <&clk IMX8MP_CLK_USDHC2>;
@@ -134,7 +134,7 @@
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
assigned-clocks = <&clk IMX8MP_CLK_USDHC3>;
diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index 07538da..18d1728 100644
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -11,43 +11,43 @@
};
&soc {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
/delete-property/ assigned-clock-rates;
};
&osc_32k {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman {
diff --git a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi
index d872112..3e1d36a 100644
--- a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi
@@ -15,7 +15,7 @@
wdt-reboot {
compatible = "wdt-reboot";
- u-boot,dm-spl;
+ bootph-pre-ram;
wdt = <&wdog1>;
};
};
@@ -39,7 +39,7 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
dio0_hog {
gpio-hog;
@@ -57,7 +57,7 @@
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pcie1_wdis_hog {
gpio-hog;
@@ -82,7 +82,7 @@
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
m2_dis2_hog {
gpio-hog;
@@ -107,7 +107,7 @@
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
m2_dis1_hog {
gpio-hog;
@@ -125,7 +125,7 @@
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
rs485_half {
gpio-hog;
@@ -143,23 +143,23 @@
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&switch {
@@ -227,7 +227,7 @@
assigned-clocks = <&clk IMX8MP_CLK_USDHC2>;
sd-uhs-ddr50;
sd-uhs-sdr104;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
@@ -236,9 +236,9 @@
assigned-clocks = <&clk IMX8MP_CLK_USDHC3>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mp-venice-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-u-boot.dtsi
index f9068eb..99d7639 100644
--- a/arch/arm/dts/imx8mp-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-venice-u-boot.dtsi
@@ -9,74 +9,74 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
index 8a4cdc7..271d511 100644
--- a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi
@@ -15,7 +15,7 @@
wdt-reboot {
compatible = "wdt-reboot";
- u-boot,dm-spl;
+ bootph-pre-ram;
wdt = <&wdog1>;
};
};
@@ -27,8 +27,8 @@
};
&clk {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
/delete-property/ assigned-clock-rates;
@@ -36,7 +36,7 @@
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&eqos {
@@ -46,11 +46,11 @@
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
regulator-ethphy {
gpio-hog;
@@ -63,19 +63,19 @@
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
eeprom_module: eeprom@50 {
compatible = "i2c-eeprom";
@@ -85,11 +85,11 @@
};
&i2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c4 {
@@ -109,56 +109,56 @@
};
&pca9450 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_pwr_en {
- u-boot,dm-spl;
+ bootph-pre-ram;
u-boot,off-on-delay-us = <20000>;
};
&pinctrl_uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_cd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
@@ -171,7 +171,7 @@
assigned-clocks = <&clk IMX8MP_CLK_USDHC2>;
sd-uhs-ddr50;
sd-uhs-sdr104;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
@@ -180,9 +180,9 @@
assigned-clocks = <&clk IMX8MP_CLK_USDHC3>;
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
index 354f911..e23998f 100644
--- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
@@ -10,11 +10,11 @@
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman {
diff --git a/arch/arm/dts/imx8mq-evk-u-boot.dtsi b/arch/arm/dts/imx8mq-evk-u-boot.dtsi
index 67da69a..d987f68 100644
--- a/arch/arm/dts/imx8mq-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-evk-u-boot.dtsi
@@ -3,7 +3,7 @@
#include "imx8mq-u-boot.dtsi"
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
@@ -16,5 +16,5 @@
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi b/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
index 9d0a54a..e3341a4 100644
--- a/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
@@ -3,11 +3,11 @@
#include "imx8mq-u-boot.dtsi"
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 { /* console */
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman {
diff --git a/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi b/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
index 8d6f305..05f809c 100644
--- a/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-phanbell-u-boot.dtsi
@@ -7,9 +7,9 @@
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi b/arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi
index 7efd822..eee3320 100644
--- a/arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-pico-pi-u-boot.dtsi
@@ -3,9 +3,9 @@
#include "imx8mq-u-boot.dtsi"
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 2bc9f41..b3fef86 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -11,27 +11,27 @@
};
&soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&binman {
diff --git a/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi b/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi
index f3e6421..cba5618 100644
--- a/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi
+++ b/arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi
@@ -7,129 +7,129 @@
&{/imx8qx-pm} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mu {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_lsio_gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma_lpuart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_dma_lpuart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pd_conn_sdch2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx8ulp-evk-u-boot.dtsi b/arch/arm/dts/imx8ulp-evk-u-boot.dtsi
index 7acdb4a..608bde3 100644
--- a/arch/arm/dts/imx8ulp-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8ulp-evk-u-boot.dtsi
@@ -8,39 +8,39 @@
compatible = "fsl,imx8ulp-mu";
reg = <0 0x27020000 0 0x10000>;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&per_bridge3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&per_bridge4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
fsl,mux_mask = <0xf00>;
};
&pinctrl_lpuart5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
index 6f02b38..89e6434 100644
--- a/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx93-11x11-evk-u-boot.dtsi
@@ -7,7 +7,7 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog3>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
aliases {
@@ -38,91 +38,91 @@
};
&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
+ bootph-all;
+ bootph-pre-ram;
};
&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&aips2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&aips3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
®_usdhc2_vmmc {
u-boot,off-on-delay-us = <20000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_reg_usdhc2_vmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
fsl,signal-voltage-switch-extra-delay-ms = <8>;
};
&lpi2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@44000000/i2c@44350000/pmic@25} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&{/soc@0/bus@44000000/i2c@44350000/pmic@25/regulators} {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_lpi2c2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fec {
@@ -152,6 +152,6 @@
};
&s4muap {
- u-boot,dm-spl;
+ bootph-pre-ram;
status = "okay";
};
diff --git a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi
index 7cab486..46928c0 100644
--- a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi
+++ b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi
@@ -6,82 +6,82 @@
/ {
chosen {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clocks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&osc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&anatop {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpt1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart1 { /* console */
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&semc {
- u-boot,dm-spl;
+ bootph-pre-ram;
bank1: bank@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
imxrt1020-evk {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl_semc: semcgrp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_usdhc0: usdhc0grp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&pinctrl_lpuart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/imxrt1050-evk-u-boot.dtsi b/arch/arm/dts/imxrt1050-evk-u-boot.dtsi
index e217dfd..a9095e7 100644
--- a/arch/arm/dts/imxrt1050-evk-u-boot.dtsi
+++ b/arch/arm/dts/imxrt1050-evk-u-boot.dtsi
@@ -14,16 +14,16 @@
};
chosen {
- u-boot,dm-spl;
+ bootph-pre-ram;
tick-timer = &gpt;
};
clocks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
usbphy1: usbphy@400d9000 {
compatible = "fsl,imxrt-usbphy";
@@ -75,7 +75,7 @@
};
&semc {
- u-boot,dm-spl;
+ bootph-pre-ram;
/*
* Memory configuration from sdram datasheet IS42S16160J-6BLI
*/
@@ -109,62 +109,62 @@
bank1: bank@0 {
fsl,base-address = <0x80000000>;
fsl,memory-size = <MEM_SIZE_32M>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&osc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&anatop {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
compatible = "fsl,imxrt-gpio", "fsl,imx35-gpio";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpt {
clocks = <&osc>;
compatible = "fsl,imxrt-gpt";
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart1 { /* console */
compatible = "fsl,imxrt-lpuart";
clock-names = "per";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "fsl,imxrt-iomuxc";
pinctrl-0 = <&pinctrl_lpuart1>;
@@ -251,7 +251,7 @@
MXRT1050_IOMUXC_GPIO_EMC_39_SEMC_DQS
(IMX_PAD_SION | 0xf1) /* SEMC_DQS */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_lcdif: lcdifgrp {
@@ -281,17 +281,17 @@
};
pinctrl_lpuart1: lpuart1grp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_usdhc0: usdhc0grp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&usdhc1 {
compatible = "fsl,imxrt-usdhc";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lcdif {
diff --git a/arch/arm/dts/imxrt1170-evk-u-boot.dtsi b/arch/arm/dts/imxrt1170-evk-u-boot.dtsi
index 88ff986..f923a14 100644
--- a/arch/arm/dts/imxrt1170-evk-u-boot.dtsi
+++ b/arch/arm/dts/imxrt1170-evk-u-boot.dtsi
@@ -7,88 +7,88 @@
/ {
chosen {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clocks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
soc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&osc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&rcosc16M {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&osc32k {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpt1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&lpuart1 { /* console */
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&semc {
- u-boot,dm-spl;
+ bootph-pre-ram;
bank1: bank@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&iomuxc {
- u-boot,dm-spl;
+ bootph-pre-ram;
imxrt1170-evk {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl_lpuart1: lpuart1grp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_usdhc0: usdhc0grp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
pinctrl_semc: semcgrp {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&usdhc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts
index d39b334..dad4670 100644
--- a/arch/arm/dts/k3-am625-r5-sk.dts
+++ b/arch/arm/dts/k3-am625-r5-sk.dts
@@ -28,7 +28,7 @@
/* 2G RAM */
reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
reserved-memory {
@@ -56,7 +56,7 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dm_tifs: dm-tifs {
@@ -66,7 +66,7 @@
mbox-names = "rx", "tx";
mboxes= <&secure_proxy_main 22>,
<&secure_proxy_main 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -84,13 +84,13 @@
compatible = "ti,j721e-esm";
reg = <0x0 0x4100000 0x0 0x1000>;
ti,esm-pins = <0>, <1>, <2>, <85>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_main {
sa3_secproxy: secproxy@44880000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-secure-proxy";
#mbox-cells = <1>;
reg-names = "rt", "scfg", "target_data";
@@ -103,19 +103,19 @@
compatible = "ti,am654-system-controller";
mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>, <&sa3_secproxy 0>;
mbox-names = "tx", "rx", "boot_notify";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
main_esm: esm@420000 {
compatible = "ti,j721e-esm";
reg = <0x0 0x420000 0x0 0x1000>;
ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&mcu_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
wkup_uart0_pins_default: wkup-uart0-pins-default {
pinctrl-single,pins = <
AM62X_MCU_IOPAD(0x02c, PIN_INPUT, 0) /* (C6) WKUP_UART0_CTSn */
@@ -123,12 +123,12 @@
AM62X_MCU_IOPAD(0x024, PIN_INPUT, 0) /* (B4) WKUP_UART0_RXD */
AM62X_MCU_IOPAD(0x028, PIN_OUTPUT, 0) /* (C5) WKUP_UART0_TXD */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_uart1_pins_default: main-uart1-pins-default {
pinctrl-single,pins = <
AM62X_IOPAD(0x194, PIN_INPUT, 2) /* (B19) MCASP0_AXR3.UART1_CTSn */
@@ -136,7 +136,7 @@
AM62X_IOPAD(0x1ac, PIN_INPUT, 2) /* (E19) MCASP0_AFSR.UART1_RXD */
AM62X_IOPAD(0x1b0, PIN_OUTPUT, 2) /* (A20) MCASP0_ACLKR.UART1_TXD */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -145,7 +145,7 @@
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
/* Main UART1 is used for TIFS firmware logs */
@@ -153,7 +153,7 @@
pinctrl-names = "default";
pinctrl-0 = <&main_uart1_pins_default>;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0 {
diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
index f275e3b..2491557 100644
--- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
@@ -15,113 +15,113 @@
};
memory@80000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@2400000 {
compatible = "ti,omap5430-timer";
reg = <0x00 0x2400000 0x00 0x80>;
ti,timer-alwon;
clock-frequency = <25000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&dmss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&chipid {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_mcu {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
partitions {
- u-boot,dm-spl;
+ bootph-pre-ram;
partition@3fc0000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
@@ -132,17 +132,17 @@
<0x0 0x43000200 0x0 0x8>;
reg-names = "cpsw_nuss", "mac_efuse";
/delete-property/ ranges;
- u-boot,dm-spl;
+ bootph-pre-ram;
cpsw-phy-sel@04044 {
compatible = "ti,am64-phy-gmii-sel";
reg = <0x0 0x00104044 0x0 0x8>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cpsw_port1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cpsw_port2 {
diff --git a/arch/arm/dts/k3-am62a-ddr.dtsi b/arch/arm/dts/k3-am62a-ddr.dtsi
index 15a0799..8629ea4 100644
--- a/arch/arm/dts/k3-am62a-ddr.dtsi
+++ b/arch/arm/dts/k3-am62a-ddr.dtsi
@@ -17,7 +17,7 @@
<&k3_pds 55 TI_SCI_PD_SHARED>;
clocks = <&k3_clks 170 1>, <&k3_clks 16 4>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ctl-data = <
DDRSS_CTL_0_DATA
diff --git a/arch/arm/dts/k3-am62a7-r5-sk.dts b/arch/arm/dts/k3-am62a7-r5-sk.dts
index 58b7c8a..c953a82 100644
--- a/arch/arm/dts/k3-am62a7-r5-sk.dts
+++ b/arch/arm/dts/k3-am62a7-r5-sk.dts
@@ -25,8 +25,10 @@
memory@80000000 {
device_type = "memory";
- reg = <0x00000000 0x80000000 0x00000000 0x80000000>; /* 2G RAM */
- u-boot,dm-spl;
+ /* 4G RAM */
+ reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
+ <0x00000008 0x80000000 0x00000000 0x80000000>;
+ bootph-pre-ram;
};
reserved-memory {
@@ -54,7 +56,7 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dm_tifs: dm-tifs {
@@ -64,7 +66,7 @@
mbox-names = "rx", "tx";
mboxes= <&secure_proxy_main 22>,
<&secure_proxy_main 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -85,7 +87,7 @@
<0x0 0x44860000 0x0 0x20000>,
<0x0 0x43600000 0x0 0x10000>;
reg-names = "rt", "scfg", "target_data";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
sysctrler: sysctrler {
@@ -94,13 +96,13 @@
<&secure_proxy_main 0>,
<&sa3_secproxy 0>;
mbox-names = "tx", "rx", "boot_notify";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&mcu_pmx0 {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
wkup_uart0_pins_default: wkup-uart0-pins-default {
pinctrl-single,pins = <
@@ -109,12 +111,12 @@
AM62X_MCU_IOPAD(0x024, PIN_INPUT, 0) /* (B4) WKUP_UART0_RXD */
AM62X_MCU_IOPAD(0x028, PIN_OUTPUT, 0) /* (C5) WKUP_UART0_TXD */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_uart1_pins_default: main-uart1-pins-default {
pinctrl-single,pins = <
AM62X_IOPAD(0x194, PIN_INPUT, 2) /* (B19) MCASP0_AXR3.UART1_CTSn */
@@ -122,7 +124,7 @@
AM62X_IOPAD(0x1ac, PIN_INPUT, 2) /* (E19) MCASP0_AFSR.UART1_RXD */
AM62X_IOPAD(0x1b0, PIN_OUTPUT, 2) /* (A20) MCASP0_ACLKR.UART1_TXD */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -131,7 +133,7 @@
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
/* Main UART1 is used for TIFS firmware logs */
@@ -139,5 +141,5 @@
pinctrl-names = "default";
pinctrl-0 = <&main_uart1_pins_default>;
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi
index 7fc749e..cf938c4 100644
--- a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi
@@ -11,130 +11,130 @@
};
memory@80000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@2400000 {
compatible = "ti,omap5430-timer";
reg = <0x00 0x2400000 0x00 0x80>;
ti,timer-alwon;
clock-frequency = <25000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&dmss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&chipid {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_mcu {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&exp1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&vdd_mmc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am62a7-sk.dts b/arch/arm/dts/k3-am62a7-sk.dts
index 576dbce..b08a083 100644
--- a/arch/arm/dts/k3-am62a7-sk.dts
+++ b/arch/arm/dts/k3-am62a7-sk.dts
@@ -26,8 +26,9 @@
memory@80000000 {
device_type = "memory";
- /* 2G RAM */
- reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
+ /* 4G RAM */
+ reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
+ <0x00000008 0x80000000 0x00000000 0x80000000>;
};
reserved-memory {
diff --git a/arch/arm/dts/k3-am64-ddr.dtsi b/arch/arm/dts/k3-am64-ddr.dtsi
index d651093..bd95a78 100644
--- a/arch/arm/dts/k3-am64-ddr.dtsi
+++ b/arch/arm/dts/k3-am64-ddr.dtsi
@@ -17,7 +17,7 @@
ti,ddr-freq2 = <DDRSS_PLL_FREQUENCY_2>;
ti,ddr-fhs-cnt = <DDRSS_PLL_FHS_CNT>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ctl-data = <
DDRSS_CTL_0_DATA
diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi
index 9b6c7e8..64857b0 100644
--- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi
+++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi
@@ -10,32 +10,32 @@
};
memory@80000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@2400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x2400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
chipid@14 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_i2c0_pins_default: main-i2c0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18) I2C0_SCL */
AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18) I2C0_SDA */
@@ -45,67 +45,67 @@
&main_i2c0 {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb0 {
dr_mode="peripheral";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_usb0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cpsw3g {
diff --git a/arch/arm/dts/k3-am642-r5-evm.dts b/arch/arm/dts/k3-am642-r5-evm.dts
index 7493362..ca5ce4a 100644
--- a/arch/arm/dts/k3-am642-r5-evm.dts
+++ b/arch/arm/dts/k3-am642-r5-evm.dts
@@ -25,7 +25,7 @@
/* 2G RAM */
reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
a53_0: a53@0 {
@@ -41,7 +41,7 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
reserved-memory {
@@ -60,7 +60,7 @@
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
vtt_supply: vtt-supply {
@@ -70,7 +70,7 @@
regulator-max-microvolt = <3300000>;
gpios = <&main_gpio0 12 GPIO_ACTIVE_HIGH>;
states = <0 0x0 3300000 0x1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -79,7 +79,7 @@
compatible = "ti,am654-system-controller";
mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
mbox-names = "tx", "rx";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -88,24 +88,24 @@
compatible = "ti,j721e-esm";
reg = <0x0 0x420000 0x0 0x1000>;
ti,esm-pins = <160>, <161>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu {
- u-boot,dm-spl;
+ bootph-pre-ram;
mcu_esm: esm@4100000 {
compatible = "ti,j721e-esm";
reg = <0x0 0x4100000 0x0 0x1000>;
ti,esm-pins = <0>, <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_uart0_pins_default: main-uart0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0238, PIN_INPUT, 0) /* (B16) UART0_CTSn */
AM64X_IOPAD(0x023c, PIN_OUTPUT, 0) /* (A16) UART0_RTSn */
@@ -115,7 +115,7 @@
};
main_uart1_pins_default: main-uart1-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0248, PIN_INPUT, 0) /* (D16) UART1_CTSn */
AM64X_IOPAD(0x024c, PIN_OUTPUT, 0) /* (E16) UART1_RTSn */
@@ -125,7 +125,7 @@
};
main_mmc0_pins_default: main-mmc0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */
AM64X_IOPAD(0x01aC, PIN_INPUT_PULLUP, 0) /* (B27) MMC0_CMD */
@@ -142,7 +142,7 @@
};
main_mmc1_pins_default: main-mmc1-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0294, PIN_INPUT_PULLUP, 0) /* (J19) MMC1_CMD */
AM64X_IOPAD(0x028c, PIN_INPUT_PULLDOWN, 0) /* (L20) MMC1_CLK */
@@ -156,7 +156,7 @@
};
ddr_vtt_pins_default: ddr-vtt-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0030, PIN_OUTPUT_PULLUP, 7) /* (L18) OSPI0_CSN1.GPIO0_12 */
>;
@@ -229,7 +229,7 @@
};
&main_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&main_uart1_pins_default>;
};
@@ -259,7 +259,7 @@
};
&main_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
/delete-property/ power-domains;
};
diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
index 97f44e2..9ff4dd3 100644
--- a/arch/arm/dts/k3-am642-r5-sk.dts
+++ b/arch/arm/dts/k3-am642-r5-sk.dts
@@ -27,7 +27,7 @@
device_type = "memory";
/* 2G RAM */
reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
a53_0: a53@0 {
@@ -43,7 +43,7 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
reserved-memory {
@@ -62,7 +62,7 @@
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -71,7 +71,7 @@
compatible = "ti,am654-system-controller";
mboxes= <&secure_proxy_main 1>, <&secure_proxy_main 0>;
mbox-names = "tx", "rx";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -80,24 +80,24 @@
compatible = "ti,j721e-esm";
reg = <0x0 0x420000 0x0 0x1000>;
ti,esm-pins = <160>, <161>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu {
- u-boot,dm-spl;
+ bootph-pre-ram;
mcu_esm: esm@4100000 {
compatible = "ti,j721e-esm";
reg = <0x0 0x4100000 0x0 0x1000>;
ti,esm-pins = <0>, <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_uart0_pins_default: main-uart0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0238, PIN_INPUT, 0) /* (B16) UART0_CTSn */
AM64X_IOPAD(0x023c, PIN_OUTPUT, 0) /* (A16) UART0_RTSn */
@@ -107,7 +107,7 @@
};
main_uart1_pins_default: main-uart1-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0248, PIN_INPUT, 0) /* (D16) UART1_CTSn */
AM64X_IOPAD(0x024c, PIN_OUTPUT, 0) /* (E16) UART1_RTSn */
@@ -117,7 +117,7 @@
};
main_mmc1_pins_default: main-mmc1-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0294, PIN_INPUT_PULLUP, 0) /* (J19) MMC1_CMD */
AM64X_IOPAD(0x028c, PIN_INPUT_PULLDOWN, 0) /* (L20) MMC1_CLK */
@@ -131,7 +131,7 @@
};
main_usb0_pins_default: main-usb0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x02a8, PIN_OUTPUT, 0) /* (E19) USB0_DRVVBUS */
>;
@@ -198,7 +198,7 @@
};
&main_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&main_uart1_pins_default>;
};
diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi
index dda2c5d..69dbe94 100644
--- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi
@@ -14,32 +14,32 @@
};
memory@80000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@2400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x2400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
chipid@14 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_i2c0_pins_default: main-i2c0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18) I2C0_SCL */
AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18) I2C0_SDA */
@@ -48,7 +48,7 @@
};
&main_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
@@ -116,48 +116,48 @@
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci0 {
status = "disabled";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cpsw3g {
@@ -165,49 +165,49 @@
<0x0 0x43000200 0x0 0x8>;
reg-names = "cpsw_nuss", "mac_efuse";
/delete-property/ ranges;
- u-boot,dm-spl;
+ bootph-pre-ram;
cpsw-phy-sel@04044 {
compatible = "ti,am64-phy-gmii-sel";
reg = <0x0 0x43004044 0x0 0x8>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
ethernet-ports {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cpsw_port2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_bcdma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pktdma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&rgmii1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&rgmii2_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mdio1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cpsw3g_phy1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_usb0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serdes_ln_ctrl {
@@ -215,26 +215,26 @@
};
&usbss0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb0 {
dr_mode = "host";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serdes_wiz0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serdes0_usb_link {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serdes0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serdes_refclk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi b/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi
index d80c550..082a3c8 100644
--- a/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi
+++ b/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi
@@ -15,18 +15,18 @@
};
leds {
- u-boot,dm-spl;
+ bootph-pre-ram;
status-led-red {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
status-led-green {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&cbass_mcu {
- u-boot,dm-spl;
+ bootph-pre-ram;
mcu_navss: bus@28380000 {
ringacc@2b800000 {
@@ -53,70 +53,70 @@
};
&cbass_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_navss: bus@30800000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
mcu-fss0-ospi0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main-uart1-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
current-speed = <115200>;
};
&wkup_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am654-ddr.dtsi b/arch/arm/dts/k3-am654-ddr.dtsi
index b228796..48698cd 100644
--- a/arch/arm/dts/k3-am654-ddr.dtsi
+++ b/arch/arm/dts/k3-am654-ddr.dtsi
@@ -15,7 +15,7 @@
<&k3_pds 244 TI_SCI_PD_SHARED>;
assigned-clocks = <&k3_clks 20 1>;
assigned-clock-rates = <DDR_PLL_FREQUENCY>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ss-reg = <
DDRSS_V2H_CTL_REG
diff --git a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
index 1d0659e..4516ab1 100644
--- a/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
@@ -22,17 +22,17 @@
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
main_navss: bus@30800000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu {
- u-boot,dm-spl;
+ bootph-pre-ram;
mcu_navss: bus@28380000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ringacc@2b800000 {
reg = <0x0 0x2b800000 0x0 0x400000>,
@@ -41,7 +41,7 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,dma-ring-reset-quirk;
};
@@ -54,93 +54,93 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&cbass_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
chipid@43000014 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
wkup_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
usb0_pins_default: usb0_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pmx1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
mcu-fss0-ospi0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&davinci_mdio {
@@ -166,7 +166,7 @@
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
@@ -174,34 +174,34 @@
};
&fss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0{
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&dwc3_0 {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb0_phy {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb0 {
pinctrl-names = "default";
pinctrl-0 = <&usb0_pins_default>;
dr_mode = "peripheral";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 455698a..7671875 100644
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -41,7 +41,7 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
vtt_supply: vtt_supply {
@@ -51,7 +51,7 @@
regulator-max-microvolt = <3300000>;
gpios = <&wkup_gpio0 28 GPIO_ACTIVE_HIGH>;
states = <0 0x0 3300000 0x1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -61,7 +61,7 @@
reg = <0x0 0x40400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <25000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -73,12 +73,12 @@
<0x0 0x2a480000 0x0 0x80000>;
reg-names = "rt", "scfg", "target_data";
#mbox-cells = <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&wkup_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_wakeup {
@@ -86,14 +86,14 @@
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_200mhz: dummy_clock {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -105,14 +105,14 @@
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
};
&mcu_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&mcu_uart0_pins_default>;
clock-frequency = <48000000>;
@@ -131,11 +131,11 @@
compatible = "ti,am654-vtm", "ti,am654-avs";
vdd-supply-3 = <&vdd_mpu>;
vdd-supply-4 = <&vdd_mpu>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
wkup_uart0_pins_default: wkup_uart0_pins_default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0) /* (AB1) WKUP_UART0_RXD */
@@ -143,14 +143,14 @@
AM65X_WKUP_IOPAD(0x00c8, PIN_INPUT, 1) /* (AC2) WKUP_GPIO0_6.WKUP_UART0_CTSn */
AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT, 1) /* (AC1) WKUP_GPIO0_7.WKUP_UART0_RTSn */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
wkup_vtt_pins_default: wkup_vtt_pins_default {
pinctrl-single,pins = <
AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7) /* WKUP_GPIO0_28 */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
mcu_uart0_pins_default: mcu_uart0_pins_default {
@@ -160,7 +160,7 @@
AM65X_WKUP_IOPAD(0x004C, PIN_INPUT, 4) /* (P1) MCU_OSPI1_D3.MCU_UART0_CTSn */
AM65X_WKUP_IOPAD(0x0054, PIN_OUTPUT, 4) /* (N3) MCU_OSPI1_CSn1.MCU_UART0_RTSn */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
wkup_i2c0_pins_default: wkup-i2c0-pins-default {
@@ -188,7 +188,7 @@
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_uart0_pins_default: main-uart0-pins-default {
pinctrl-single,pins = <
AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11) UART0_RXD */
@@ -196,7 +196,7 @@
AM65X_IOPAD(0x01ec, PIN_INPUT, 0) /* (AG11) UART0_CTSn */
AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0) /* (AD11) UART0_RTSn */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
main_mmc0_pins_default: main_mmc0_pins_default {
@@ -213,7 +213,7 @@
AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */
AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
main_mmc1_pins_default: main_mmc1_pins_default {
@@ -227,7 +227,7 @@
AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /* (B24) MMC1_SDCD */
AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /* (C24) MMC1_SDWP */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -257,7 +257,7 @@
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
vdd_mpu: tps62363@60 {
compatible = "ti,tps62363";
@@ -269,7 +269,7 @@
regulator-boot-on;
ti,vsel0-state-high;
ti,vsel1-state-high;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -297,18 +297,18 @@
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
usb0_pins_default: usb0_pins_default {
pinctrl-single,pins = <
AM65X_IOPAD(0x02bc, PIN_OUTPUT, 0) /* (AD9) USB0_DRVVBUS */
>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&dwc3_0 {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
/delete-property/ clocks;
/delete-property/ power-domains;
/delete-property/ assigned-clocks;
@@ -317,7 +317,7 @@
&usb0_phy {
status = "okay";
- u-boot,dm-spl;
+ bootph-pre-ram;
/delete-property/ clocks;
};
@@ -325,9 +325,9 @@
pinctrl-names = "default";
pinctrl-0 = <&usb0_pins_default>;
dr_mode = "peripheral";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
index 12faaae..ee31b1e 100644
--- a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
@@ -23,35 +23,35 @@
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_mcu_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <250000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
chipid@43000014 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&mcu_navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_ringacc {
@@ -61,7 +61,7 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_udmap {
@@ -73,59 +73,59 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sms {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart8_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart8 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_cpsw {
@@ -146,5 +146,5 @@
};
&main_sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts b/arch/arm/dts/k3-am68-sk-r5-base-board.dts
index 46ee6c442..a64baba 100644
--- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts
+++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts
@@ -23,7 +23,7 @@
fs_loader0: fs_loader@0 {
compatible = "u-boot,fs-loader";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
a72_0: a72@0 {
@@ -39,27 +39,27 @@
ti,sci = <&sms>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_200mhz: dummy_clock_200mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_19_2mhz: dummy_clock_19_2mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <19200000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu_wakeup {
sa3_secproxy: secproxy@44880000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-secure-proxy";
reg = <0x0 0x44880000 0x0 0x20000>,
<0x0 0x44860000 0x0 0x20000>,
@@ -75,14 +75,14 @@
<0x0 0x2a480000 0x0 0x80000>;
reg-names = "rt", "scfg", "target_data";
#mbox-cells = <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
sysctrler: sysctrler {
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>, <&sa3_secproxy 5>;
mbox-names = "tx", "rx", "boot_notify";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dm_tifs: dm-tifs {
@@ -92,7 +92,7 @@
mbox-names = "rx", "tx";
mboxes= <&mcu_secproxy 21>,
<&mcu_secproxy 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -126,7 +126,7 @@
&wkup_pmx0 {
mcu_uart0_pins_default: mcu-uart0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721S2_WKUP_IOPAD(0x0f4, PIN_INPUT, 0) /*(C24) WKUP_GPIO0_13.MCU_UART0_RXD*/
J721S2_WKUP_IOPAD(0x0f0, PIN_OUTPUT, 0) /*(C25) WKUP_GPIO0_12.MCU_UART0_TXD*/
@@ -134,7 +134,7 @@
};
wkup_uart0_pins_default: wkup-uart0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721S2_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /*(E25) WKUP_GPIO0_6.WKUP_UART0_CTSn*/
J721S2_WKUP_IOPAD(0x0dc, PIN_OUTPUT, 0) /*(F28) WKUP_GPIO0_7.WKUP_UART0_RTSn*/
@@ -150,7 +150,7 @@
mbox-names = "tx", "rx", "notify";
ti,host-id = <4>;
ti,secure-host;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_uart0 {
diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
index ce52ffc..f57c230 100644
--- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
@@ -19,30 +19,30 @@
};
&cbass_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_mcu_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <250000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
chipid@43000014 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
mcu_navss: bus@28380000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
#address-cells = <2>;
#size-cells = <2>;
@@ -53,7 +53,7 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dma-controller@285c0000 {
@@ -65,73 +65,73 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_sdhci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&exp2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_cpsw {
@@ -148,37 +148,37 @@
};
&main_usbss0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,usb2-only;
};
&usb0 {
dr_mode = "peripheral";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_fss0_hpb0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&hbmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0,0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&hbmc_mux {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&serdes_ln_ctrl {
@@ -190,7 +190,7 @@
};
&serdes0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_r5fss0 {
diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
index b1f9e71..55ad615 100644
--- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts
@@ -22,7 +22,7 @@
};
fs_loader0: fs_loader@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
};
@@ -38,21 +38,21 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_200mhz: dummy_clock_200mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_19_2mhz: dummy_clock_19_2mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <19200000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -64,7 +64,7 @@
&cbass_mcu_wakeup {
mcu_secproxy: secproxy@2a380000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-secure-proxy";
reg = <0x0 0x2a380000 0x0 0x80000>,
<0x0 0x2a400000 0x0 0x80000>,
@@ -74,7 +74,7 @@
};
sysctrler: sysctrler {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx";
@@ -87,7 +87,7 @@
mbox-names = "rx", "tx";
mboxes= <&mcu_secproxy 21>,
<&mcu_secproxy 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
wkup_vtm0: vtm@42040000 {
@@ -106,9 +106,9 @@
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
wkup_uart0_pins_default: wkup_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xb0, PIN_INPUT, 0) /* (B14) WKUP_UART0_RXD */
J721E_WKUP_IOPAD(0xb4, PIN_OUTPUT, 0) /* (A14) WKUP_UART0_TXD */
@@ -116,7 +116,7 @@
};
mcu_uart0_pins_default: mcu_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xf4, PIN_INPUT, 0) /* (D20) WKUP_GPIO0_13.MCU_UART0_RXD */
J721E_WKUP_IOPAD(0xf0, PIN_OUTPUT, 0) /* (D19) WKUP_GPIO0_12.MCU_UART0_TXD */
@@ -159,10 +159,10 @@
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
main_uart0_pins_default: main_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_IOPAD(0xb0, PIN_INPUT, 0) /* (T16) UART0_RXD */
J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
@@ -172,7 +172,7 @@
};
main_i2c0_pins_default: main-i2c0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
@@ -200,7 +200,7 @@
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
@@ -247,17 +247,17 @@
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
lp876441: lp876441@4c {
compatible = "ti,lp876441";
reg = <0x4c>;
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
regulators: regulators {
- u-boot,dm-spl;
+ bootph-pre-ram;
buck1_reg: buck1 {
/*VDD_CPU_AVS_REG*/
regulator-name = "buck1";
@@ -265,7 +265,7 @@
regulator-max-microvolt = <1250000>;
regulator-always-on;
regulator-boot-on;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
@@ -274,7 +274,7 @@
&wkup_vtm0 {
vdd-supply-2 = <&buck1_reg>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0 {
diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
index b2b81f8..867ec2b 100644
--- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
@@ -32,26 +32,26 @@
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
main_navss: bus@30000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <250000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
mcu_navss: bus@28380000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
ringacc@2b800000 {
reg = <0x0 0x2b800000 0x0 0x400000>,
@@ -60,7 +60,7 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dma-controller@285c0000 {
@@ -72,61 +72,61 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
chipid@43000014 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_sdhci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wiz3_pll1_refclk {
@@ -135,16 +135,16 @@
};
&main_usbss0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb0 {
dr_mode = "peripheral";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_cpsw {
@@ -161,79 +161,79 @@
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&exp2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_fss0_ospi0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&hbmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0,0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&hbmc_mux {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_gpio0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&ospi1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&mcu_fss0_hpb0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_gpio_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_fss0_ospi1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_r5fss0 {
diff --git a/arch/arm/dts/k3-j721e-ddr.dtsi b/arch/arm/dts/k3-j721e-ddr.dtsi
index 21d6380..3a9ea42 100644
--- a/arch/arm/dts/k3-j721e-ddr.dtsi
+++ b/arch/arm/dts/k3-j721e-ddr.dtsi
@@ -16,7 +16,7 @@
ti,ddr-freq2 = <DDRSS_PLL_FREQUENCY_2>;
ti,ddr-fhs-cnt = <DDRSS_PLL_FHS_CNT>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ctl-data = <
DDRSS_CTL_00_DATA
diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi
index 48c6ddf..f9746d3 100644
--- a/arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi
@@ -16,7 +16,7 @@
};
fs_loader0: fs_loader@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
};
};
@@ -24,6 +24,6 @@
&tps659413a {
esm: esm {
compatible = "ti,tps659413-esm";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
index ab9d6e6..e9e5053 100644
--- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
@@ -33,27 +33,27 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_200mhz: dummy_clock_200mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_19_2mhz: dummy_clock_19_2mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <19200000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu_wakeup {
mcu_secproxy: secproxy@28380000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-secure-proxy";
reg = <0x0 0x2a380000 0x0 0x80000>,
<0x0 0x2a400000 0x0 0x80000>,
@@ -63,7 +63,7 @@
};
sysctrler: sysctrler {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx";
@@ -83,7 +83,7 @@
mbox-names = "rx", "tx";
mboxes= <&mcu_secproxy 21>,
<&mcu_secproxy 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -92,7 +92,7 @@
compatible = "ti,j721e-esm";
reg = <0x0 0x700000 0x0 0x1000>;
ti,esm-pins = <344>, <345>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -105,7 +105,7 @@
&wkup_pmx0 {
wkup_uart0_pins_default: wkup_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */
J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */
@@ -113,7 +113,7 @@
};
mcu_uart0_pins_default: mcu_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xe8, PIN_INPUT, 0) /* (H29) WKUP_GPIO0_14.MCU_UART0_CTSn */
J721E_WKUP_IOPAD(0xec, PIN_OUTPUT, 0) /* (J27) WKUP_GPIO0_15.MCU_UART0_RTSn */
@@ -171,7 +171,7 @@
};
mcu_fss0_ospi1_pins_default: mcu-fss0-ospi1-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0x34, PIN_OUTPUT, 0) /* (F22) MCU_OSPI1_CLK */
J721E_WKUP_IOPAD(0x50, PIN_OUTPUT, 0) /* (C22) MCU_OSPI1_CSn0 */
@@ -187,7 +187,7 @@
&main_pmx0 {
main_uart0_pins_default: main_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_IOPAD(0x1d4, PIN_INPUT, 1) /* (Y3) SPI1_CS0.UART0_CTSn */
J721E_IOPAD(0x1c0, PIN_OUTPUT, 1) /* (AA2) SPI0_CS0.UART0_RTSn */
@@ -226,7 +226,7 @@
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
@@ -277,17 +277,17 @@
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
tps659413a: tps659413a@48 {
reg = <0x48>;
compatible = "ti,tps659413";
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
regulators: regulators {
- u-boot,dm-spl;
+ bootph-pre-ram;
buck12_reg: buck12 {
/*VDD_CPU*/
regulator-name = "buck12";
@@ -295,7 +295,7 @@
regulator-max-microvolt = <900000>;
regulator-always-on;
regulator-boot-on;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
@@ -303,7 +303,7 @@
&wkup_vtm0 {
vdd-supply-2 = <&buck12_reg>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss0 {
@@ -378,7 +378,7 @@
&ospi1 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi1_pins_default>;
- u-boot,dm-spl;
+ bootph-pre-ram;
reg = <0x0 0x47050000 0x0 0x100>,
<0x0 0x58000000 0x0 0x8000000>;
@@ -396,7 +396,7 @@
cdns,read-delay = <2>;
#address-cells = <1>;
#size-cells = <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
diff --git a/arch/arm/dts/k3-j721e-r5-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-r5-sk-u-boot.dtsi
index 71d16f1..733d69c 100644
--- a/arch/arm/dts/k3-j721e-r5-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-r5-sk-u-boot.dtsi
@@ -18,7 +18,7 @@
};
fs_loader0: fs_loader@0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "u-boot,fs-loader";
};
};
@@ -26,6 +26,6 @@
&tps659412 {
esm: esm {
compatible = "ti,tps659413-esm";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
diff --git a/arch/arm/dts/k3-j721e-r5-sk.dts b/arch/arm/dts/k3-j721e-r5-sk.dts
index d894dcb..8d6eaa4 100644
--- a/arch/arm/dts/k3-j721e-r5-sk.dts
+++ b/arch/arm/dts/k3-j721e-r5-sk.dts
@@ -167,27 +167,27 @@
ti,sci = <&dmsc>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_200mhz: dummy_clock_200mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_19_2mhz: dummy_clock_19_2mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <19200000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu_wakeup {
mcu_secproxy: secproxy@28380000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-secure-proxy";
reg = <0x0 0x2a380000 0x0 0x80000>,
<0x0 0x2a400000 0x0 0x80000>,
@@ -197,7 +197,7 @@
};
sysctrler: sysctrler {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx";
@@ -217,7 +217,7 @@
mbox-names = "rx", "tx";
mboxes= <&mcu_secproxy 21>,
<&mcu_secproxy 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -226,7 +226,7 @@
compatible = "ti,j721e-esm";
reg = <0x0 0x700000 0x0 0x1000>;
ti,esm-pins = <344>, <345>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -239,7 +239,7 @@
&wkup_pmx0 {
wkup_uart0_pins_default: wkup_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */
J721E_WKUP_IOPAD(0xa4, PIN_OUTPUT, 0) /* (J28) WKUP_UART0_TXD */
@@ -247,7 +247,7 @@
};
mcu_uart0_pins_default: mcu_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_WKUP_IOPAD(0xf0, PIN_INPUT, 2) /* (D26) MCU_I3C0_SCL.MCU_UART0_CTSn */
J721E_WKUP_IOPAD(0xf4, PIN_OUTPUT, 2)/* (D25) MCU_I3C0_SDA.MCU_UART0_RTSn */
@@ -289,7 +289,7 @@
&main_pmx0 {
main_uart0_pins_default: main_uart0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721E_IOPAD(0x1f0, PIN_INPUT, 0) /* (AC2) UART0_CTSn */
J721E_IOPAD(0x1f4, PIN_OUTPUT, 0) /* (AB1) UART0_RTSn */
@@ -361,7 +361,7 @@
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
status = "okay";
@@ -400,17 +400,17 @@
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
tps659412: tps659412@48 {
reg = <0x48>;
compatible = "ti,tps659412";
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
regulators: regulators {
- u-boot,dm-spl;
+ bootph-pre-ram;
/* 3 Phase Buck */
buck123_reg: buck123 {
/* VDD_CPU */
@@ -419,7 +419,7 @@
regulator-max-microvolt = <1250000>;
regulator-always-on;
regulator-boot-on;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
@@ -427,7 +427,7 @@
&wkup_vtm0 {
vdd-supply-2 = <&buck123_reg>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss0 {
diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
index 2d65e2d..0949caa 100644
--- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
@@ -31,26 +31,26 @@
};
&cbass_main{
- u-boot,dm-spl;
+ bootph-pre-ram;
main_navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <25000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
mcu-navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
ringacc@2b800000 {
reg = <0x0 0x2b800000 0x0 0x400000>,
@@ -59,7 +59,7 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dma-controller@285c0000 {
@@ -71,53 +71,53 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
chipid@43000014 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmsc {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_sdhci0 {
@@ -125,7 +125,7 @@
};
&main_sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wiz3_pll1_refclk {
@@ -134,16 +134,16 @@
};
&main_usbss0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb0 {
dr_mode = "host";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wiz2_pll1_refclk {
@@ -152,16 +152,16 @@
};
&main_usbss1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usbss1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usb1 {
dr_mode = "host";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_cpsw {
@@ -178,19 +178,19 @@
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_i2c1 {
@@ -226,27 +226,27 @@
};
&mcu_i2c0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_fss0_ospi0_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&fss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&ospi0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
flash@0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
partition@3fc0000 {
label = "ospi.phypattern";
reg = <0x3fc0000 0x40000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
diff --git a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
index a17e61e..4fd6d36 100644
--- a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
@@ -22,35 +22,35 @@
};
&wkup_i2c0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&cbass_mcu_wakeup {
- u-boot,dm-spl;
+ bootph-pre-ram;
timer1: timer@40400000 {
compatible = "ti,omap5430-timer";
reg = <0x0 0x40400000 0x0 0x80>;
ti,timer-alwon;
clock-frequency = <250000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
chipid@43000014 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&mcu_navss {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_ringacc {
@@ -60,7 +60,7 @@
<0x0 0x2a500000 0x0 0x40000>,
<0x0 0x28440000 0x0 0x40000>;
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_udmap {
@@ -72,59 +72,59 @@
<0x0 0x28400000 0x0 0x2000>;
reg-names = "gcfg", "rchan", "rchanrt", "tchan",
"tchanrt", "rflow";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&secure_proxy_main {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sms {
- u-boot,dm-spl;
+ bootph-pre-ram;
k3_sysreset: sysreset-controller {
compatible = "ti,sci-sysreset";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&main_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart8_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_mmc1_pins_default {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_pmx0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_pds {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_clks {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&k3_reset {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_uart8 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_uart0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mcu_cpsw {
@@ -141,9 +141,9 @@
};
&main_sdhci0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&main_sdhci1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/k3-j721s2-ddr.dtsi b/arch/arm/dts/k3-j721s2-ddr.dtsi
index 6a244fb..345e2b8 100644
--- a/arch/arm/dts/k3-j721s2-ddr.dtsi
+++ b/arch/arm/dts/k3-j721s2-ddr.dtsi
@@ -19,7 +19,7 @@
#address-cells = <2>;
#size-cells = <2>;
- u-boot,dm-spl;
+ bootph-pre-ram;
memorycontroller0: memorycontroller@2990000 {
compatible = "ti,j721s2-ddrss";
@@ -35,7 +35,7 @@
ti,ddr-fhs-cnt = <DDRSS_PLL_FHS_CNT>;
instance = <0>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ctl-data = <
DDRSS0_CTL_00_DATA
@@ -2243,7 +2243,7 @@
ti,ddr-fhs-cnt = <DDRSS_PLL_FHS_CNT>;
instance = <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
ti,ctl-data = <
DDRSS1_CTL_00_DATA
diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
index 9e3bdec..bc61702 100644
--- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
+++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
@@ -23,7 +23,7 @@
fs_loader0: fs_loader@0 {
compatible = "u-boot,fs-loader";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
a72_0: a72@0 {
@@ -39,27 +39,27 @@
ti,sci = <&sms>;
ti,sci-proc-id = <32>;
ti,sci-host-id = <10>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_200mhz: dummy_clock_200mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
clk_19_2mhz: dummy_clock_19_2mhz {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <19200000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&cbass_mcu_wakeup {
sa3_secproxy: secproxy@44880000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
compatible = "ti,am654-secure-proxy";
reg = <0x0 0x44880000 0x0 0x20000>,
<0x0 0x44860000 0x0 0x20000>,
@@ -75,14 +75,14 @@
<0x0 0x2a480000 0x0 0x80000>;
reg-names = "rt", "scfg", "target_data";
#mbox-cells = <1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
sysctrler: sysctrler {
compatible = "ti,am654-system-controller";
mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>, <&sa3_secproxy 5>;
mbox-names = "tx", "rx", "boot_notify";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
dm_tifs: dm-tifs {
@@ -92,7 +92,7 @@
mbox-names = "rx", "tx";
mboxes= <&mcu_secproxy 21>,
<&mcu_secproxy 23>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
@@ -122,7 +122,7 @@
&wkup_pmx0 {
mcu_uart0_pins_default: mcu-uart0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721S2_WKUP_IOPAD(0x0f8, PIN_INPUT, 0) /* (B24) WKUP_GPIO0_14.MCU_UART0_CTSn */
J721S2_WKUP_IOPAD(0x0fc, PIN_OUTPUT, 0) /* (D25) WKUP_GPIO0_15.MCU_UART0_RTSn */
@@ -132,7 +132,7 @@
};
wkup_uart0_pins_default: wkup-uart0-pins-default {
- u-boot,dm-spl;
+ bootph-pre-ram;
pinctrl-single,pins = <
J721S2_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /* (E25) WKUP_GPIO0_6.WKUP_UART0_CTSn */
J721S2_WKUP_IOPAD(0x0dc, PIN_OUTPUT, 0) /* (F28) WKUP_GPIO0_7.WKUP_UART0_RTSn */
@@ -147,7 +147,7 @@
mbox-names = "tx", "rx", "notify";
ti,host-id = <4>;
ti,secure-host;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wkup_uart0 {
diff --git a/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi
index c94165f..970d452 100644
--- a/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi
+++ b/arch/arm/dts/keystone-k2e-evm-u-boot.dtsi
@@ -5,7 +5,7 @@
/{
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
aliases {
usb0 = &usb;
@@ -14,7 +14,7 @@
};
&i2c1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb_phy {
diff --git a/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi
index e8e7009..05653af 100644
--- a/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi
+++ b/arch/arm/dts/keystone-k2g-evm-u-boot.dtsi
@@ -5,7 +5,7 @@
/{
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
aliases {
usb0 = &usb0;
@@ -14,11 +14,11 @@
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb0_phy {
diff --git a/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi b/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi
index 80f1f60..8e4b36c 100644
--- a/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi
+++ b/arch/arm/dts/keystone-k2g-generic-u-boot.dtsi
@@ -5,14 +5,14 @@
/{
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi b/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi
index 80f1f60..8e4b36c 100644
--- a/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi
+++ b/arch/arm/dts/keystone-k2g-ice-u-boot.dtsi
@@ -5,14 +5,14 @@
/{
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi b/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi
index 1c2f349..22df84b 100644
--- a/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi
+++ b/arch/arm/dts/keystone-k2hk-evm-u-boot.dtsi
@@ -5,12 +5,12 @@
/{
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usb_phy {
diff --git a/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi b/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi
index f9e1272..26a6e6b 100644
--- a/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi
+++ b/arch/arm/dts/kirkwood-pogoplug-series-4-u-boot.dtsi
@@ -3,5 +3,5 @@
* Copyright (C) 2023 Tony Dinh <mibodhi@gmail.com>
*/
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi
index 7832c9a..6f11852 100644
--- a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi
@@ -28,37 +28,37 @@
};
&gpio1 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio3 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio4 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio5 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio6 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c1 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c2 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
/delete-node/ &bandgap;
diff --git a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
index 7832c9a..6f11852 100644
--- a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
@@ -28,37 +28,37 @@
};
&gpio1 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio3 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio4 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio5 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio6 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c1 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c2 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
/delete-node/ &bandgap;
diff --git a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi
index 89b20be..4744872 100644
--- a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi
@@ -28,37 +28,37 @@
};
&gpio1 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio3 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio4 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio5 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio6 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c1 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c2 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
/delete-node/ &bandgap;
diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
index e56666e..2c34344 100644
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
@@ -27,7 +27,7 @@
&i2c1 {
clock-frequency = <400000>;
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&i2c2 {
@@ -35,27 +35,27 @@
};
&gpio1 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio2 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio3 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio4 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio5 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
&gpio6 {
- /delete-property/ u-boot,dm-spl;
+ /delete-property/ bootph-pre-ram;
};
/delete-node/ &bandgap;
diff --git a/arch/arm/dts/ls1021a-twr-u-boot.dtsi b/arch/arm/dts/ls1021a-twr-u-boot.dtsi
index 3711e424..71a538c 100644
--- a/arch/arm/dts/ls1021a-twr-u-boot.dtsi
+++ b/arch/arm/dts/ls1021a-twr-u-boot.dtsi
@@ -4,26 +4,26 @@
*/
&{/soc} {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
+ bootph-pre-ram;
+ bootph-all;
};
&crypto {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sec_jr3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/meson-g12-common-u-boot.dtsi b/arch/arm/dts/meson-g12-common-u-boot.dtsi
index b1f60b1..efa6a05 100644
--- a/arch/arm/dts/meson-g12-common-u-boot.dtsi
+++ b/arch/arm/dts/meson-g12-common-u-boot.dtsi
@@ -13,7 +13,7 @@
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -26,7 +26,7 @@
<0x0 0xff63c000 0x0 0x1000>,
<0x0 0xff638000 0x0 0x400>;
reg-names = "vpu", "hhi", "dmc";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&hdmi_tx {
diff --git a/arch/arm/dts/meson-gx-u-boot.dtsi b/arch/arm/dts/meson-gx-u-boot.dtsi
index fb6952f..9f123ab 100644
--- a/arch/arm/dts/meson-gx-u-boot.dtsi
+++ b/arch/arm/dts/meson-gx-u-boot.dtsi
@@ -13,7 +13,7 @@
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -22,7 +22,7 @@
<0x0 0xc883c000 0x0 0x1000>,
<0x0 0xc8838000 0x0 0x1000>;
reg-names = "vpu", "hhi", "dmc";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&hdmi_tx {
diff --git a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
index 2ac933a..7c55744 100644
--- a/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm/dts/mt7622-bananapi-bpi-r64.dts
@@ -177,7 +177,7 @@
spi-flash@0{
compatible = "jedec,spi-nor";
reg = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/mt7622-rfb.dts b/arch/arm/dts/mt7622-rfb.dts
index b44f19f..886a133 100644
--- a/arch/arm/dts/mt7622-rfb.dts
+++ b/arch/arm/dts/mt7622-rfb.dts
@@ -178,7 +178,7 @@
spi-flash@0{
compatible = "jedec,spi-nor";
reg = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -192,7 +192,7 @@
reg = <0>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/mt7622-u-boot.dtsi b/arch/arm/dts/mt7622-u-boot.dtsi
index b14b1d4..b37049a 100644
--- a/arch/arm/dts/mt7622-u-boot.dtsi
+++ b/arch/arm/dts/mt7622-u-boot.dtsi
@@ -5,25 +5,25 @@
*/
&topckgen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pericfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&apmixedsys {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&timer0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&snfi {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/mt7623-u-boot.dtsi b/arch/arm/dts/mt7623-u-boot.dtsi
index 832c16d..b9fd499 100644
--- a/arch/arm/dts/mt7623-u-boot.dtsi
+++ b/arch/arm/dts/mt7623-u-boot.dtsi
@@ -5,25 +5,25 @@
*/
&topckgen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&topckgen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pericfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&timer0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&apmixedsys {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/mt7629-rfb-u-boot.dtsi b/arch/arm/dts/mt7629-rfb-u-boot.dtsi
index c17e82a..4117047 100644
--- a/arch/arm/dts/mt7629-rfb-u-boot.dtsi
+++ b/arch/arm/dts/mt7629-rfb-u-boot.dtsi
@@ -6,37 +6,37 @@
*/
&infracfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pericfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&timer0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&mcucfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&dramc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&apmixedsys {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&topckgen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&snfi {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts
index f2e4e95..82f6a34 100644
--- a/arch/arm/dts/mt7629-rfb.dts
+++ b/arch/arm/dts/mt7629-rfb.dts
@@ -37,12 +37,12 @@
&pinctrl {
state_default: pinmux_conf {
- u-boot,dm-pre-reloc;
+ bootph-all;
mux {
function = "jtag";
groups = "ephy_leds_jtag";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -84,7 +84,7 @@
spi-flash@0{
compatible = "jedec,spi-nor";
reg = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -98,7 +98,7 @@
reg = <0>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/mt7981.dtsi b/arch/arm/dts/mt7981.dtsi
index 3089371..2c8ef14 100644
--- a/arch/arm/dts/mt7981.dtsi
+++ b/arch/arm/dts/mt7981.dtsi
@@ -36,7 +36,7 @@
compatible = "fixed-clock";
clock-frequency = <13000000>;
#clock-cells = <0>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
hwver: hwver {
@@ -61,7 +61,7 @@
interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gpt_clk>;
clock-names = "gpt-clk";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
watchdog: watchdog@1001c000 {
@@ -87,7 +87,7 @@
compatible = "mediatek,mt7981-fixed-plls";
reg = <0x1001e000 0x1000>;
#clock-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
topckgen: topckgen@1001b000 {
@@ -95,7 +95,7 @@
reg = <0x1001b000 0x1000>;
clock-parent = <&fixed_plls>;
#clock-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
infracfg_ao: infracfg_ao@10001000 {
@@ -103,7 +103,7 @@
reg = <0x10001000 0x80>;
clock-parent = <&infracfg>;
#clock-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
infracfg: infracfg@10001000 {
@@ -111,7 +111,7 @@
reg = <0x10001000 0x30>;
clock-parent = <&topckgen>;
#clock-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
pinctrl: pinctrl@11d00000 {
@@ -163,7 +163,7 @@
<&infracfg CK_INFRA_UART>;
mediatek,force-highspeed;
status = "disabled";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
uart1: serial@11003000 {
diff --git a/arch/arm/dts/mt7986-u-boot.dtsi b/arch/arm/dts/mt7986-u-boot.dtsi
index 95671f8..096b973 100644
--- a/arch/arm/dts/mt7986-u-boot.dtsi
+++ b/arch/arm/dts/mt7986-u-boot.dtsi
@@ -5,29 +5,29 @@
*/
&topckgen {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pericfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&apmixedsys {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&timer0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&snand {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/mt7986.dtsi b/arch/arm/dts/mt7986.dtsi
index 794ab1f..30b5a89 100644
--- a/arch/arm/dts/mt7986.dtsi
+++ b/arch/arm/dts/mt7986.dtsi
@@ -55,7 +55,7 @@
clock-frequency = <12000000>;
#clock-cells = <0>;
/* must need this line, or uart uanable to get dummy_clk */
- u-boot,dm-pre-reloc;
+ bootph-all;
};
hwver: hwver {
@@ -80,7 +80,7 @@
interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&infracfg CK_INFRA_CK_F26M>;
clock-names = "gpt-clk";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
watchdog: watchdog@1001c000 {
@@ -168,7 +168,7 @@
<&infracfg CK_INFRA_PWM>;
clock-names = "top", "main", "pwm1", "pwm2";
status = "disabled";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
uart0: serial@11002000 {
@@ -182,7 +182,7 @@
<&infracfg CK_INFRA_UART>;
mediatek,force-highspeed;
status = "disabled";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
uart1: serial@11003000 {
diff --git a/arch/arm/dts/mt8516-u-boot.dtsi b/arch/arm/dts/mt8516-u-boot.dtsi
index 3c0d843..07312dd 100644
--- a/arch/arm/dts/mt8516-u-boot.dtsi
+++ b/arch/arm/dts/mt8516-u-boot.dtsi
@@ -5,21 +5,21 @@
*/
&infracfg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&topckgen_ {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&topckgen_cg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&apmixedsys {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/mvebu-u-boot.dtsi b/arch/arm/dts/mvebu-u-boot.dtsi
index db4bf39..6d20a44 100644
--- a/arch/arm/dts/mvebu-u-boot.dtsi
+++ b/arch/arm/dts/mvebu-u-boot.dtsi
@@ -4,31 +4,31 @@
/ {
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
internal-regs {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&uart0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#ifdef CONFIG_ARMADA_375
/* Armada 375 has multiple timers, use timer1 here */
&timer1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#else
&timer {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#endif
#ifdef CONFIG_SPL_SPI
&spi0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
#endif
diff --git a/arch/arm/dts/omap3-u-boot.dtsi b/arch/arm/dts/omap3-u-boot.dtsi
index 96d8ac5..7366ff5 100644
--- a/arch/arm/dts/omap3-u-boot.dtsi
+++ b/arch/arm/dts/omap3-u-boot.dtsi
@@ -9,74 +9,74 @@
/{
ocp@68000000 {
- u-boot,dm-spl;
+ bootph-pre-ram;
bandgap@48002524 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
reg-shift = <2>;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
reg-shift = <2>;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
reg-shift = <2>;
};
&mmc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&l4_core {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
clock-frequency = <100000>;
};
diff --git a/arch/arm/dts/omap5-u-boot.dtsi b/arch/arm/dts/omap5-u-boot.dtsi
index 5a1c7bc..720e79b 100644
--- a/arch/arm/dts/omap5-u-boot.dtsi
+++ b/arch/arm/dts/omap5-u-boot.dtsi
@@ -19,11 +19,11 @@
};
ocp {
- u-boot,dm-spl;
+ bootph-pre-ram;
ocp2scp@4a080000 {
compatible = "ti,omap-ocp2scp", "simple-bus";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
ocp2scp@4a090000 {
@@ -31,80 +31,80 @@
};
bandgap@4a0021e0 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
};
&uart1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
reg-shift = <2>;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
reg-shift = <2>;
};
&mmc1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&mmc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&l4_cfg {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&scm_conf {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&qspi {
- u-boot,dm-spl;
+ bootph-pre-ram;
m25p80@0 {
compatible = "jedec,spi-nor";
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio6 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&i2c1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
#else /* OMAP54XX */
diff --git a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
index 7c2dfb4..516e52e 100644
--- a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
@@ -10,62 +10,62 @@
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
};
&pinctrl_uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2_gpio {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pinctrl_wdog {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio5 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&usdhc3 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&wdog1 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi b/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi
index 1325e0c..e04766a 100644
--- a/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi
+++ b/arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi
@@ -24,27 +24,27 @@
};
&emmc_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc_cmd {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc_bus8 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
/*
* The Qseven BIOS_DISABLE signal on the PX30-µQ7 keeps the on-module
@@ -53,39 +53,39 @@
* the SPL has been booted from SD Card.
*/
bios-disable-override-hog {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pcfg_pull_none_8ma {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pcfg_pull_up_8ma {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_bus4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_cmd {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_det {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
clock-frequency = <24000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi
index 462eaf6..046da02 100644
--- a/arch/arm/dts/px30-u-boot.dtsi
+++ b/arch/arm/dts/px30-u-boot.dtsi
@@ -16,7 +16,7 @@
};
dmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "rockchip,px30-dmc", "syscon";
reg = <0x0 0xff2a0000 0x0 0x1000>;
};
@@ -30,69 +30,69 @@
&uart2 {
clock-frequency = <24000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart5 {
clock-frequency = <24000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
/* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
u-boot,spl-fifo-mode;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
/* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
u-boot,spl-fifo-mode;
};
&grf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pmugrf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&xin24m {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&cru {
- u-boot,dm-pre-reloc;
+ bootph-all;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-rates;
};
&pmucru {
- u-boot,dm-pre-reloc;
+ bootph-all;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-rates;
};
&saradc {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
&gpio0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/qcom-ipq4019.dtsi b/arch/arm/dts/qcom-ipq4019.dtsi
index 6edc69d..0850ae5 100644
--- a/arch/arm/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/dts/qcom-ipq4019.dtsi
@@ -56,7 +56,7 @@
reg = <0x1800000 0x60000>;
#clock-cells = <1>;
#reset-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
rng: rng@22000 {
@@ -71,7 +71,7 @@
reg = <0x1800000 0x60000>;
#clock-cells = <1>;
#reset-cells = <1>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
soc_gpios: pinctrl@1000000 {
@@ -81,7 +81,7 @@
gpio-count = <100>;
gpio-bank-name="soc";
#gpio-cells = <2>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
blsp1_uart1: serial@78af000 {
@@ -90,7 +90,7 @@
clock = <&gcc GCC_BLSP1_UART1_APPS_CLK>;
bit-rate = <0xFF>;
status = "disabled";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
blsp1_spi1: spi@78b5000 {
@@ -100,7 +100,7 @@
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
mdio: mdio@90000 {
diff --git a/arch/arm/dts/qcs404-evb-uboot.dtsi b/arch/arm/dts/qcs404-evb-uboot.dtsi
index c73d71e..b4c5f3f 100644
--- a/arch/arm/dts/qcs404-evb-uboot.dtsi
+++ b/arch/arm/dts/qcs404-evb-uboot.dtsi
@@ -7,18 +7,18 @@
/ {
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
pinctrl_north@1300000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
clock-controller@1800000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
serial@78b1000 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
diff --git a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts b/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
index 5b176a9..0ae9f91 100644
--- a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
+++ b/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
@@ -13,7 +13,7 @@
};
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
leds {
@@ -70,20 +70,20 @@
};
&ostm0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&scif2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
clock = <66666666>; /* ToDo: Replace by DM clock driver */
};
&scif2_pins {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&usbhs0 {
diff --git a/arch/arm/dts/r8a774a1-u-boot.dtsi b/arch/arm/dts/r8a774a1-u-boot.dtsi
index f826c41..cddffe8 100644
--- a/arch/arm/dts/r8a774a1-u-boot.dtsi
+++ b/arch/arm/dts/r8a774a1-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/delete-node/ &audma0;
diff --git a/arch/arm/dts/r8a774b1-u-boot.dtsi b/arch/arm/dts/r8a774b1-u-boot.dtsi
index 6fab78e..3b34f82 100644
--- a/arch/arm/dts/r8a774b1-u-boot.dtsi
+++ b/arch/arm/dts/r8a774b1-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/delete-node/ &audma0;
diff --git a/arch/arm/dts/r8a774e1-u-boot.dtsi b/arch/arm/dts/r8a774e1-u-boot.dtsi
index 74758df..e862870 100644
--- a/arch/arm/dts/r8a774e1-u-boot.dtsi
+++ b/arch/arm/dts/r8a774e1-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/delete-node/ &audma0;
diff --git a/arch/arm/dts/r8a7790-lager-u-boot.dts b/arch/arm/dts/r8a7790-lager-u-boot.dts
index fecf7e7..28b8b60 100644
--- a/arch/arm/dts/r8a7790-lager-u-boot.dts
+++ b/arch/arm/dts/r8a7790-lager-u-boot.dts
@@ -9,7 +9,7 @@
#include "r8a7790-u-boot.dtsi"
&scif0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi {
diff --git a/arch/arm/dts/r8a7790-stout-u-boot.dts b/arch/arm/dts/r8a7790-stout-u-boot.dts
index 1396764..85bcb78 100644
--- a/arch/arm/dts/r8a7790-stout-u-boot.dts
+++ b/arch/arm/dts/r8a7790-stout-u-boot.dts
@@ -9,7 +9,7 @@
#include "r8a7790-u-boot.dtsi"
&scifa0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi {
diff --git a/arch/arm/dts/r8a7790-u-boot.dtsi b/arch/arm/dts/r8a7790-u-boot.dtsi
index 87dbcaf..45e2fa6 100644
--- a/arch/arm/dts/r8a7790-u-boot.dtsi
+++ b/arch/arm/dts/r8a7790-u-boot.dtsi
@@ -8,13 +8,13 @@
#include "r8a779x-u-boot.dtsi"
&usb_extal_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pfc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&rst {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a7791-koelsch-u-boot.dts b/arch/arm/dts/r8a7791-koelsch-u-boot.dts
index 4a98528..c5a1332 100644
--- a/arch/arm/dts/r8a7791-koelsch-u-boot.dts
+++ b/arch/arm/dts/r8a7791-koelsch-u-boot.dts
@@ -9,7 +9,7 @@
#include "r8a7791-u-boot.dtsi"
&scif0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi {
diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dts
index 82051be..bfec1fc 100644
--- a/arch/arm/dts/r8a7791-porter-u-boot.dts
+++ b/arch/arm/dts/r8a7791-porter-u-boot.dts
@@ -9,7 +9,7 @@
#include "r8a7791-u-boot.dtsi"
&scif0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c6 {
diff --git a/arch/arm/dts/r8a7791-u-boot.dtsi b/arch/arm/dts/r8a7791-u-boot.dtsi
index 7a99380..7143ffc 100644
--- a/arch/arm/dts/r8a7791-u-boot.dtsi
+++ b/arch/arm/dts/r8a7791-u-boot.dtsi
@@ -8,13 +8,13 @@
#include "r8a779x-u-boot.dtsi"
&usb_extal_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pfc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&rst {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a7792-blanche-u-boot.dts b/arch/arm/dts/r8a7792-blanche-u-boot.dts
index 30b2704..1f33df8 100644
--- a/arch/arm/dts/r8a7792-blanche-u-boot.dts
+++ b/arch/arm/dts/r8a7792-blanche-u-boot.dts
@@ -13,5 +13,5 @@
};
&scif0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a7792-u-boot.dtsi b/arch/arm/dts/r8a7792-u-boot.dtsi
index bb72d5e..214cfde 100644
--- a/arch/arm/dts/r8a7792-u-boot.dtsi
+++ b/arch/arm/dts/r8a7792-u-boot.dtsi
@@ -8,9 +8,9 @@
#include "r8a779x-u-boot.dtsi"
&pfc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&rst {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a7793-gose-u-boot.dts b/arch/arm/dts/r8a7793-gose-u-boot.dts
index a35d35c..dd0932c 100644
--- a/arch/arm/dts/r8a7793-gose-u-boot.dts
+++ b/arch/arm/dts/r8a7793-gose-u-boot.dts
@@ -9,7 +9,7 @@
#include "r8a7793-u-boot.dtsi"
&scif0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi {
diff --git a/arch/arm/dts/r8a7793-u-boot.dtsi b/arch/arm/dts/r8a7793-u-boot.dtsi
index 4858b17..fb94746 100644
--- a/arch/arm/dts/r8a7793-u-boot.dtsi
+++ b/arch/arm/dts/r8a7793-u-boot.dtsi
@@ -8,13 +8,13 @@
#include "r8a779x-u-boot.dtsi"
&usb_extal_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pfc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&rst {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dts
index 29b0e32..0a39039 100644
--- a/arch/arm/dts/r8a7794-alt-u-boot.dts
+++ b/arch/arm/dts/r8a7794-alt-u-boot.dts
@@ -38,7 +38,7 @@
};
&scif2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi {
diff --git a/arch/arm/dts/r8a7794-silk-u-boot.dts b/arch/arm/dts/r8a7794-silk-u-boot.dts
index 179753d..3fcb535 100644
--- a/arch/arm/dts/r8a7794-silk-u-boot.dts
+++ b/arch/arm/dts/r8a7794-silk-u-boot.dts
@@ -9,7 +9,7 @@
#include "r8a7794-u-boot.dtsi"
&scif2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&qspi {
diff --git a/arch/arm/dts/r8a7794-u-boot.dtsi b/arch/arm/dts/r8a7794-u-boot.dtsi
index 84c7b31..53b54c8 100644
--- a/arch/arm/dts/r8a7794-u-boot.dtsi
+++ b/arch/arm/dts/r8a7794-u-boot.dtsi
@@ -8,13 +8,13 @@
#include "r8a779x-u-boot.dtsi"
&usb_extal_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pfc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&rst {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
index d94ad91..ba7cf52 100644
--- a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
@@ -12,15 +12,15 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c_dvfs {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77950-u-boot.dtsi b/arch/arm/dts/r8a77950-u-boot.dtsi
index 2306c7b..92907ea 100644
--- a/arch/arm/dts/r8a77950-u-boot.dtsi
+++ b/arch/arm/dts/r8a77950-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/ {
diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dts b/arch/arm/dts/r8a77950-ulcb-u-boot.dts
index ff00ccd..e371cde 100644
--- a/arch/arm/dts/r8a77950-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77950-ulcb-u-boot.dts
@@ -21,18 +21,18 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c_dvfs {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
compatible = "rohm,br24t01", "atmel,24c01";
reg = <0x50>;
pagesize = <8>;
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
index 79a54f3..2a9f0aa 100644
--- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
@@ -12,15 +12,15 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c_dvfs {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77960-u-boot.dtsi b/arch/arm/dts/r8a77960-u-boot.dtsi
index f64e5a4..15a9147 100644
--- a/arch/arm/dts/r8a77960-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/ {
diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dts b/arch/arm/dts/r8a77960-ulcb-u-boot.dts
index 1e9e8b8..79042b2 100644
--- a/arch/arm/dts/r8a77960-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dts
@@ -21,18 +21,18 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c_dvfs {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
compatible = "rohm,br24t01", "atmel,24c01";
reg = <0x50>;
pagesize = <8>;
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
index 4272ecc..e5421f9 100644
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
@@ -12,15 +12,15 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c_dvfs {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
index c4abcc5..54107d1 100644
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/ {
diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dts b/arch/arm/dts/r8a77965-ulcb-u-boot.dts
index d9c680b..969911d 100644
--- a/arch/arm/dts/r8a77965-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dts
@@ -21,18 +21,18 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c_dvfs {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
compatible = "rohm,br24t01", "atmel,24c01";
reg = <0x50>;
pagesize = <8>;
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77970-u-boot.dtsi b/arch/arm/dts/r8a77970-u-boot.dtsi
index 614caa9..d252c2e 100644
--- a/arch/arm/dts/r8a77970-u-boot.dtsi
+++ b/arch/arm/dts/r8a77970-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/ {
diff --git a/arch/arm/dts/r8a77980-condor-u-boot.dts b/arch/arm/dts/r8a77980-condor-u-boot.dts
index 530abdb..f4a3b43 100644
--- a/arch/arm/dts/r8a77980-condor-u-boot.dts
+++ b/arch/arm/dts/r8a77980-condor-u-boot.dts
@@ -16,18 +16,18 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
compatible = "rohm,br24t01", "atmel,24c01";
reg = <0x50>;
pagesize = <8>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/r8a77980-u-boot.dtsi b/arch/arm/dts/r8a77980-u-boot.dtsi
index 54f01c9..9f7bf49 100644
--- a/arch/arm/dts/r8a77980-u-boot.dtsi
+++ b/arch/arm/dts/r8a77980-u-boot.dtsi
@@ -8,7 +8,7 @@
#include "r8a779x-u-boot.dtsi"
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
/ {
diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts
index 55699ba..fc1c4a7 100644
--- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts
+++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dts
@@ -12,7 +12,7 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -20,13 +20,13 @@
compatible = "renesas,iic-r8a77990",
"renesas,rcar-gen3-iic",
"renesas,rmobile-iic";
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
compatible = "rohm,br24t01", "atmel,24c01";
reg = <0x50>;
pagesize = <8>;
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
};
diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dts b/arch/arm/dts/r8a77995-draak-u-boot.dts
index 260bc5d..41ceae1 100644
--- a/arch/arm/dts/r8a77995-draak-u-boot.dts
+++ b/arch/arm/dts/r8a77995-draak-u-boot.dts
@@ -12,18 +12,18 @@
sysinfo {
compatible = "renesas,rcar-sysinfo";
i2c-eeprom = <&sysinfo_eeprom>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
sysinfo_eeprom: eeprom@50 {
compatible = "rohm,br24t01", "atmel,24c01";
reg = <0x50>;
pagesize = <8>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
diff --git a/arch/arm/dts/r8a779a0-u-boot.dtsi b/arch/arm/dts/r8a779a0-u-boot.dtsi
index 9f2772a..2b6d6ef 100644
--- a/arch/arm/dts/r8a779a0-u-boot.dtsi
+++ b/arch/arm/dts/r8a779a0-u-boot.dtsi
@@ -21,5 +21,5 @@
};
&extalr_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/r8a779x-u-boot.dtsi b/arch/arm/dts/r8a779x-u-boot.dtsi
index a6bf751..001ac59 100644
--- a/arch/arm/dts/r8a779x-u-boot.dtsi
+++ b/arch/arm/dts/r8a779x-u-boot.dtsi
@@ -7,18 +7,18 @@
/ {
soc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&cpg {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&extal_clk {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&prr {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3036-sdk-u-boot.dtsi b/arch/arm/dts/rk3036-sdk-u-boot.dtsi
index 754800c..ef7e020 100644
--- a/arch/arm/dts/rk3036-sdk-u-boot.dtsi
+++ b/arch/arm/dts/rk3036-sdk-u-boot.dtsi
@@ -1,13 +1,13 @@
#include "rk3036-u-boot.dtsi"
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&grf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3066a-mk808-u-boot.dtsi b/arch/arm/dts/rk3066a-mk808-u-boot.dtsi
index e0aa929..4474be9 100644
--- a/arch/arm/dts/rk3066a-mk808-u-boot.dtsi
+++ b/arch/arm/dts/rk3066a-mk808-u-boot.dtsi
@@ -9,7 +9,7 @@
};
&cru {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&dmc {
@@ -27,7 +27,7 @@
&mmc0 {
fifo-mode;
max-frequency = <4000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
u-boot,spl-fifo-mode;
};
@@ -41,9 +41,9 @@
&timer2 {
clock-frequency = <24000000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3128-evb-u-boot.dtsi b/arch/arm/dts/rk3128-evb-u-boot.dtsi
index 8b16bbe..2f20cac 100644
--- a/arch/arm/dts/rk3128-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3128-evb-u-boot.dtsi
@@ -3,5 +3,5 @@
#include "rk3128-u-boot.dtsi"
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3128-u-boot.dtsi b/arch/arm/dts/rk3128-u-boot.dtsi
index 4a98e24..6d1965e 100644
--- a/arch/arm/dts/rk3128-u-boot.dtsi
+++ b/arch/arm/dts/rk3128-u-boot.dtsi
@@ -6,14 +6,14 @@
dmc: dmc@20004000 {
compatible = "rockchip,rk3128-dmc", "syscon";
reg = <0x0 0x20004000 0x0 0x1000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&cru {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&grf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
index 9c9016d..fe6aba7 100644
--- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
+++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi
@@ -13,12 +13,12 @@
config {
u-boot,boot-led = "rock:red:power";
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&cru {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&dmc {
@@ -48,15 +48,15 @@
};
&pinctrl {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&timer3 {
compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer";
clock-frequency = <24000000>;
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&uart2 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3229-evb-u-boot.dtsi b/arch/arm/dts/rk3229-evb-u-boot.dtsi
index b65149c..4a4e4cc 100644
--- a/arch/arm/dts/rk3229-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3229-evb-u-boot.dtsi
@@ -20,9 +20,9 @@
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk322x-u-boot.dtsi b/arch/arm/dts/rk322x-u-boot.dtsi
index 79c41e4..aea9175 100644
--- a/arch/arm/dts/rk322x-u-boot.dtsi
+++ b/arch/arm/dts/rk322x-u-boot.dtsi
@@ -29,18 +29,18 @@
rockchip,grf = <&grf>;
rockchip,msch = <&service_msch>;
rockchip,sram = <&ddr_sram>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
service_msch: syscon@31090000 {
compatible = "rockchip,rk3228-msch", "syscon";
reg = <0x31090000 0x2000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
&cru {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
@@ -48,7 +48,7 @@
};
&grf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
diff --git a/arch/arm/dts/rk3288-evb-u-boot.dtsi b/arch/arm/dts/rk3288-evb-u-boot.dtsi
index c8f5120..686ed2cd 100644
--- a/arch/arm/dts/rk3288-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-evb-u-boot.dtsi
@@ -17,41 +17,41 @@
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio8 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_bus4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_cmd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_pwr {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3288-firefly-u-boot.dtsi b/arch/arm/dts/rk3288-firefly-u-boot.dtsi
index cc84d7c..644198a 100644
--- a/arch/arm/dts/rk3288-firefly-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-firefly-u-boot.dtsi
@@ -7,19 +7,19 @@
/ {
config {
- u-boot,dm-pre-reloc;
+ bootph-all;
u-boot,boot-led = "firefly:green:power";
};
leds {
- u-boot,dm-pre-reloc;
+ bootph-all;
work {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
power {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -37,45 +37,45 @@
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio8 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pcfg_pull_up_drv_12ma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_bus4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_cmd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_pwr {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3288-miqi-u-boot.dtsi b/arch/arm/dts/rk3288-miqi-u-boot.dtsi
index 2a74fdd..43cb48b 100644
--- a/arch/arm/dts/rk3288-miqi-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-miqi-u-boot.dtsi
@@ -6,10 +6,10 @@
#include "rk3288-u-boot.dtsi"
/ {
leds {
- u-boot,dm-pre-reloc;
+ bootph-all;
work {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
@@ -26,33 +26,33 @@
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_bus4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_cmd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_pwr {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi b/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
index 30f4cb1..383b383 100644
--- a/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
@@ -16,29 +16,29 @@
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
rk818: pmic@1c {
- u-boot,dm-pre-reloc;
+ bootph-all;
regulators {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3288-popmetal-u-boot.dtsi b/arch/arm/dts/rk3288-popmetal-u-boot.dtsi
index 3782253..57d6026 100644
--- a/arch/arm/dts/rk3288-popmetal-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-popmetal-u-boot.dtsi
@@ -17,41 +17,41 @@
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio8 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc_bus4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_cmd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_pwr {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi b/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi
index 538607d..86da1f4 100644
--- a/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-rock-pi-n8-u-boot.dtsi
@@ -23,17 +23,17 @@
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi b/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi
index 509f789..ea4a6e0 100644
--- a/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-rock2-square-u-boot.dtsi
@@ -14,17 +14,17 @@
};
&gpio7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
index a177fca..b4c5483 100644
--- a/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-tinker-s-u-boot.dtsi
@@ -14,21 +14,21 @@
};
&emmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&emmc_clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&emmc_cmd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&emmc_pwr {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&emmc_bus8 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
index 56d10c8..0cf1b69 100644
--- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi
@@ -6,7 +6,7 @@
#include "rk3288-u-boot.dtsi"
&dmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
rockchip,pctl-timing = <0x215 0xc8 0x0 0x35 0x26 0x2 0x70 0x2000d
0x6 0x0 0x8 0x4 0x17 0x24 0xd 0x6
0x4 0x8 0x4 0x76 0x4 0x0 0x30 0x0
@@ -25,61 +25,61 @@
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2_xfer {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&gpio7 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&vcc_sd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pcfg_pull_none_drv_8ma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pcfg_pull_up_drv_8ma {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pcfg_pull_none {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&pcfg_pull_up {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_bus4 {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_cd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_clk {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_cmd {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
&sdmmc_pwr {
- u-boot,dm-spl;
+ bootph-pre-ram;
};
diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
index e411445..1894162 100644
--- a/arch/arm/dts/rk3288-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-u-boot.dtsi
@@ -46,13 +46,13 @@
rockchip,pmu = <&pmu>;
rockchip,sgrf = <&sgrf>;
rockchip,sram = <&ddr_sram>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
noc: syscon@ffac0000 {
compatible = "rockchip,rk3288-noc", "syscon";
reg = <0xffac0000 0x2000>;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
};
@@ -88,23 +88,23 @@
};
&cru {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&grf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pmu {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sgrf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart0 {
@@ -124,9 +124,9 @@
};
&vopb {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&vopl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi
index 251fbde..90ce9e1 100644
--- a/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi
@@ -17,17 +17,17 @@
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3288-veyron-u-boot.dtsi b/arch/arm/dts/rk3288-veyron-u-boot.dtsi
index 21e1aec..ab564e7 100644
--- a/arch/arm/dts/rk3288-veyron-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-veyron-u-boot.dtsi
@@ -32,41 +32,41 @@
};
&gpio3 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio7 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&gpio8 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&i2c0 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&rk808 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&spi2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&spi_flash {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi
index 7730d17..8f50bfe 100644
--- a/arch/arm/dts/rk3288-vyasa-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-vyasa-u-boot.dtsi
@@ -18,17 +18,17 @@
};
&sdmmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&pinctrl {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
diff --git a/arch/arm/dts/rk3308-evb-u-boot.dtsi b/arch/arm/dts/rk3308-evb-u-boot.dtsi
index c6ea746..d15ba94 100644
--- a/arch/arm/dts/rk3308-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3308-evb-u-boot.dtsi
@@ -11,7 +11,7 @@
};
&uart4 {
- u-boot,dm-pre-reloc;
+ bootph-all;
clock-frequency = <24000000>;
status = "okay";
};
diff --git a/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi
index ffbe742..97d922c 100644
--- a/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi
+++ b/arch/arm/dts/rk3308-roc-cc-u-boot.dtsi
@@ -11,7 +11,7 @@
};
&uart2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
clock-frequency = <24000000>;
status = "okay";
};
diff --git a/arch/arm/dts/rk3308-u-boot.dtsi b/arch/arm/dts/rk3308-u-boot.dtsi
index ab5bfc2..c8451b2 100644
--- a/arch/arm/dts/rk3308-u-boot.dtsi
+++ b/arch/arm/dts/rk3308-u-boot.dtsi
@@ -13,24 +13,24 @@
};
&cru {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&dmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&emmc {
/* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
u-boot,spl-fifo-mode;
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&grf {
- u-boot,dm-pre-reloc;
+ bootph-all;
};
&saradc {
- u-boot,dm-pre-reloc;
+ bootph-all;
status = "okay";
};
diff --git a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
index 16c3373..04028bf 100644
--- a/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
+++ b/arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
@@ -20,7 +20,7 @@
};
dmc {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "rockchip,px30-dmc", "syscon";
reg = <0x0 0xff2a0000 0x0 0x1000>;
};
@@ -34,7 +34,7 @@