09b6efad53
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>
61 lines
1.6 KiB
Plaintext
61 lines
1.6 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
CONFIG_SYS_DCACHE_OFF=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_SYS_THUMB_BUILD=y
|
|
CONFIG_ARCH_KIRKWOOD=y
|
|
CONFIG_SUPPORT_PASSING_ATAGS=y
|
|
CONFIG_CMDLINE_TAG=y
|
|
CONFIG_INITRD_TAG=y
|
|
CONFIG_SYS_KWD_CONFIG="board/zyxel/nsa310s/kwbimage.cfg"
|
|
CONFIG_TEXT_BASE=0x600000
|
|
CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_TARGET_NSA310S=y
|
|
CONFIG_ENV_SIZE=0x20000
|
|
CONFIG_ENV_OFFSET=0xE0000
|
|
CONFIG_DEFAULT_DEVICE_TREE="marvell/kirkwood-nsa310s"
|
|
CONFIG_DEBUG_UART_BASE=0xf1012000
|
|
CONFIG_DEBUG_UART_CLOCK=166666667
|
|
CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server"
|
|
CONFIG_SYS_LOAD_ADDR=0x800000
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_BOOTSTD_FULL=y
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_SYS_PBSIZE=1050
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_SYS_PROMPT="NSA310s> "
|
|
CONFIG_SYS_MAXARGS=32
|
|
CONFIG_CMD_NAND=y
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_USB=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_JFFS2=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:0xe0000@0x0(uboot),0x20000@0xe0000(uboot_env),0x100000@0x100000(second_stage_uboot),-@0x200000(root)"
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_NET_RANDOM_ETHADDR=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
|
|
CONFIG_SATA_MV=y
|
|
CONFIG_SYS_SATA_MAX_DEVICE=1
|
|
CONFIG_LBA48=y
|
|
CONFIG_SYS_64BIT_LBA=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_MVGBE=y
|
|
CONFIG_MII=y
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_UBIFS_SILENCE_MSG=y
|
|
CONFIG_LZMA=y
|
|
CONFIG_BZIP2=y
|