diff options
| author | Tony Dinh <mibodhi@gmail.com> | 2024-04-01 15:08:16 -0700 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2024-04-04 10:44:47 +0200 |
| commit | 09b6efad53e9cc039b5e2f0fa00ec7f333dcc601 (patch) | |
| tree | d418f6ad1270921f16dcdf1950002048d4e318e8 /configs/nas220_defconfig | |
| parent | cdfcc37428e06f4730ab9a17cc084eeb7676ea1a (diff) | |
| download | u-boot-09b6efad53e9cc039b5e2f0fa00ec7f333dcc601.zip u-boot-09b6efad53e9cc039b5e2f0fa00ec7f333dcc601.tar.gz u-boot-09b6efad53e9cc039b5e2f0fa00ec7f333dcc601.tar.bz2 | |
arm: dts: kirkwood: Enable upstream DT on Kirkwood boards
Enable OF_UPSTREAM to use upstream DT and add marvell/ prefix to the
DEFAULT_DEVICE_TREE for Kirkwood boards. And so we can directly build
DTBs from dts/upstream/src/arm/marvell, and including *-u-boot.dtsi
files from arch/arm/dts/ directory.
Background:
The following 2 commands and filters were used in the analysis to determine
which upstream DTS and DTSI files can be used as they are, or need to have
modified/created *-u-boot.dtsi for u-boot specific implementation, and
which board should be opt-out from OF_UPSTREAM.
"git grep -li arch_kirkwood configs | xargs grep DEVICE_TREE | cut -d '"' -f2 | xargs -n1 sh -c 'diff -qs arch/arm/dts/$1.dts dts/upstream/src/arm/marvell/$1.dts' sh | grep differ"
"diff -qrbu arch/arm/dts/ dts/upstream/src/arm/marvell/ | grep kirkwood | grep ".dtsi ""
More detailed information can be found at:
https://lore.kernel.org/u-boot/20240328021825.17935-1-mibodhi@gmail.com/T/#u
I've regression tested this patch with the Zyxel NSA325 (Kirkwood 88F6282)
and Zyxel NSA310S (Kirkwood 88F6281). The Zyxel NSA325 board has a
USB 3.0 controller attached to the PCIe bus. And the Zyxel NSA310S
has an extensive overhaul in bindings and styles in upstream DTS version.
Tested-by: Michael Walle <michael@walle.cc> # on lschv2
Acked-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Tony Dinh <mibodhi@gmail.com>
Diffstat (limited to 'configs/nas220_defconfig')
| -rw-r--r-- | configs/nas220_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig index f01b26f..4ea342a 100644 --- a/configs/nas220_defconfig +++ b/configs/nas220_defconfig @@ -10,7 +10,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_TARGET_NAS220=y CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xA0000 -CONFIG_DEFAULT_DEVICE_TREE="kirkwood-blackarmor-nas220" +CONFIG_DEFAULT_DEVICE_TREE="marvell/kirkwood-blackarmor-nas220" CONFIG_IDENT_STRING="\nNAS 220" CONFIG_SYS_LOAD_ADDR=0x800000 # CONFIG_SYS_MALLOC_F is not set |