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>
67 lines
1.9 KiB
Plaintext
67 lines
1.9 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
CONFIG_SYS_DCACHE_OFF=y
|
|
CONFIG_ARCH_CPU_INIT=y
|
|
CONFIG_ARCH_KIRKWOOD=y
|
|
CONFIG_SYS_KWD_CONFIG="board/raidsonic/ib62x0/kwbimage.cfg"
|
|
CONFIG_TEXT_BASE=0x600000
|
|
CONFIG_NR_DRAM_BANKS=2
|
|
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000
|
|
CONFIG_TARGET_IB62X0=y
|
|
CONFIG_ENV_SIZE=0x20000
|
|
CONFIG_ENV_OFFSET=0xE0000
|
|
CONFIG_DEFAULT_DEVICE_TREE="marvell/kirkwood-ib62x0"
|
|
CONFIG_IDENT_STRING=" RaidSonic ICY BOX IB-NAS62x0"
|
|
CONFIG_SYS_LOAD_ADDR=0x800000
|
|
# CONFIG_SYS_MALLOC_F is not set
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_BOOTCOMMAND=y
|
|
CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; ubifsload 0x700000 ${fdt}; ubifsumount; fdt addr 0x700000; fdt resize; fdt chosen; bootz 0x800000 - 0x700000"
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_SYS_PBSIZE=1051
|
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_SYS_PROMPT="ib62x0 => "
|
|
CONFIG_SYS_MAXARGS=32
|
|
CONFIG_CMD_BOOTZ=y
|
|
CONFIG_CMD_IDE=y
|
|
CONFIG_CMD_NAND=y
|
|
CONFIG_CMD_USB=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_EXT2=y
|
|
CONFIG_CMD_FAT=y
|
|
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(root)"
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_ISO_PARTITION=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y
|
|
CONFIG_SYS_ATA_STRIDE=4
|
|
CONFIG_SYS_ATA_DATA_OFFSET=0x100
|
|
CONFIG_SYS_ATA_REG_OFFSET=0x100
|
|
CONFIG_SYS_ATA_ALT_OFFSET=0x100
|
|
CONFIG_SYS_ATA_IDE0_OFFSET=0x2000
|
|
CONFIG_SYS_ATA_IDE1_OFFSET=0x4000
|
|
CONFIG_LBA48=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_MVGBE=y
|
|
CONFIG_MII=y
|
|
CONFIG_SYS_NS16550_SERIAL=y
|
|
CONFIG_SYS_NS16550_REG_SIZE=-4
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_STORAGE=y
|
|
CONFIG_LZMA=y
|
|
CONFIG_BZIP2=y
|