mips: Add initial Octeon MIPS64 base support
Subsystems (2)
v4 cover mips: Add initial Octeon MIPS64 base support
This patch adds very basic support for the Octeon III SoCs. Only CFI parallel UART, reset and NOR flash are supported for now.
Please note that the basic Octeon port does not include the DDR3/4 initialization yet. This will be added in some follow-up patches later. To still use U-Boot on with this port, the L2 cache (4MiB on Octeon III CN73xx) is used as RAM. This way, U-Boot can boot to the prompt on such boards.
v3:
This version is based on the MIPS start.S rework and Linux header sync from Daniel using this branch: u-boot-mips/header_sync_v2
I removed the very early copy to to L2 cache for now to make the integration into mainline easier. With all the patches already applied and the Linux header sync, the resulting patchset is much smaller.
Thanks,
Stefan
Changes in v4:
- Remove custom clock API
- Remove bitfield and use GENMASK etc
- Add ioremap and use physical addresses
- Remove CONFIG_BOARD_SIZE_LIMIT
Changes in v3:
- Don't "relocate" to L2 cache for now
- Remove inclusion of "common.h"
- Remove inclusion of "common.h"
- Slightly change some copyright messages (adjust year)
Changes in v2:
- Remove custom start.S and use common start.S. Minimal custom lowlevel init code is currently added in the custom lowlevel_init.S. This needs to be extended with necessary code, like errata handling etc. But for a very first basic port, this seems to be all thats needed to boot on the EBB7304 to the prompt.
- Removed select CREATE_ARCH_SYMLINK
- Removed Octeon II support, as its currently no added in this patchset
- Added cache.c to add the platform specific cache functions as no-ops for Octeon as the platform is cache coherent
- Removed CONFIG_MIPS_CACHE_COHERENT
- Added CONFIG_CPU_CAVIUM_OCTEON to Kconfig and selected it for Octeon to enable better sync with the Linux files in the future
- Add get_tbclk() -> no need to define CONFIG_SYS_MIPS_TIMER_FREQ any more
- Removed CONFIG_SYS_MIPS_TIMER_FREQ
Aaron Williams (1):
mips: octeon: Initial minimal support for the Marvell Octeon SoC
Stefan Roese (3):
sysreset: Add Octeon sysreset driver
mips: octeon: dts: Add Octeon 3 cn73xx base dtsi file
mips: octeon: Add minimal Octeon 3 EBB7304 EVK support
MAINTAINERS | 7 ++ arch/mips/Kconfig | 41 ++++++++ arch/mips/Makefile | 3 + arch/mips/dts/Makefile | 1 + arch/mips/dts/mrvl,cn73xx.dtsi | 64 +++++++++++++ arch/mips/dts/mrvl,octeon-ebb7304.dts | 96 +++++++++++++++++++ arch/mips/mach-octeon/Kconfig | 60 ++++++++++++ arch/mips/mach-octeon/Makefile | 10 ++ arch/mips/mach-octeon/cache.c | 20 ++++ arch/mips/mach-octeon/clock.c | 14 +++ arch/mips/mach-octeon/cpu.c | 66 +++++++++++++ arch/mips/mach-octeon/dram.c | 28 ++++++ arch/mips/mach-octeon/include/ioremap.h | 30 ++++++ arch/mips/mach-octeon/include/mach/cavm-reg.h | 17 ++++ arch/mips/mach-octeon/include/mach/clock.h | 12 +++ arch/mips/mach-octeon/lowlevel_init.S | 19 ++++ board/Marvell/octeon_ebb7304/Kconfig | 19 ++++ board/Marvell/octeon_ebb7304/MAINTAINERS | 7 ++ board/Marvell/octeon_ebb7304/Makefile | 8 ++ board/Marvell/octeon_ebb7304/board.c | 9 ++ configs/octeon_ebb7304_defconfig | 37 +++++++ drivers/sysreset/Kconfig | 7 ++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_octeon.c | 52 ++++++++++ include/configs/octeon_common.h | 19 ++++ include/configs/octeon_ebb7304.h | 20 ++++ scripts/config_whitelist.txt | 1 - 27 files changed, 667 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/mrvl,cn73xx.dtsi create mode 100644 arch/mips/dts/mrvl,octeon-ebb7304.dts create mode 100644 arch/mips/mach-octeon/Kconfig create mode 100644 arch/mips/mach-octeon/Makefile create mode 100644 arch/mips/mach-octeon/cache.c create mode 100644 arch/mips/mach-octeon/clock.c create mode 100644 arch/mips/mach-octeon/cpu.c create mode 100644 arch/mips/mach-octeon/dram.c create mode 100644 arch/mips/mach-octeon/include/ioremap.h create mode 100644 arch/mips/mach-octeon/include/mach/cavm-reg.h create mode 100644 arch/mips/mach-octeon/include/mach/clock.h create mode 100644 arch/mips/mach-octeon/lowlevel_init.S create mode 100644 board/Marvell/octeon_ebb7304/Kconfig create mode 100644 board/Marvell/octeon_ebb7304/MAINTAINERS create mode 100644 board/Marvell/octeon_ebb7304/Makefile create mode 100644 board/Marvell/octeon_ebb7304/board.c create mode 100644 configs/octeon_ebb7304_defconfig create mode 100644 drivers/sysreset/sysreset_octeon.c create mode 100644 include/configs/octeon_common.h create mode 100644 include/configs/octeon_ebb7304.h
Signature · 1 line
2.27.0
PATCH v4 1/4 sysreset: Add Octeon sysreset driver
This patch adds a UCLASS_SYSRESET sysreset driver for the Octeon SoC family.
---
(no changes since v1)
drivers/sysreset/Kconfig | 7 ++++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_octeon.c | 52 ++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 drivers/sysreset/sysreset_octeon.c
drivers/sysreset/Kconfig +7 -0
@@ -57,6 +57,13 @@ config SYSRESET_MICROBLAZE help This is soft reset on Microblaze which does jump to 0x0 address. +config SYSRESET_OCTEON + bool "Enable support for Marvell Octeon SoC family" + depends on ARCH_OCTEON + help + This enables the system reset driver support for Marvell Octeon + SoCs. + config SYSRESET_PSCI bool "Enable support for PSCI System Reset" depends on ARM_PSCI_FW
drivers/sysreset/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o obj-$(CONFIG_SYSRESET_GPIO) += sysreset_gpio.o obj-$(CONFIG_SYSRESET_MPC83XX) += sysreset_mpc83xx.o obj-$(CONFIG_SYSRESET_MICROBLAZE) += sysreset_microblaze.o +obj-$(CONFIG_SYSRESET_OCTEON) += sysreset_octeon.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SOCFPGA) += sysreset_socfpga.o obj-$(CONFIG_SYSRESET_SOCFPGA_S10) += sysreset_socfpga_s10.o
drivers/sysreset/sysreset_octeon.c new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 2/4 mips: octeon: Initial minimal support for the Marvell Octeon SoC
In reply to Stefan RoeseFrom: Aaron Williams <[email protected]>
This patch adds very basic support for the Octeon III SoCs. Only CFI parallel NOR flash and UART is supported for now.
Please note that the basic Octeon port does not include the DDR3/4 initialization yet. This will be added in some follow-up patches later. To still use U-Boot on with this port, the L2 cache (4MiB on Octeon III CN73xx) is used as RAM. This way, U-Boot can boot to the prompt on such boards.
---
Changes in v4:
- Remove custom clock API
- Remove bitfield and use GENMASK etc
- Add ioremap and use physical addresses
Changes in v3:
- Don't "relocate" to L2 cache for now
- Remove inclusion of "common.h"
Changes in v2:
- Remove custom start.S and use common start.S. Minimal custom lowlevel init code is currently added in the custom lowlevel_init.S. This needs to be extended with necessary code, like errata handling etc. But for a very first basic port, this seems to be all thats needed to boot on the EBB7304 to the prompt.
- Removed select CREATE_ARCH_SYMLINK
- Removed Octeon II support, as its currently no added in this patchset
- Added cache.c to add the platform specific cache functions as no-ops for Octeon as the platform is cache coherent
- Removed CONFIG_MIPS_CACHE_COHERENT
- Added CONFIG_CPU_CAVIUM_OCTEON to Kconfig and selected it for Octeon to enable better sync with the Linux files in the future
- Add get_tbclk() -> no need to define CONFIG_SYS_MIPS_TIMER_FREQ any more
MAINTAINERS | 6 ++ arch/mips/Kconfig | 41 ++++++++++++ arch/mips/Makefile | 3 + arch/mips/mach-octeon/Kconfig | 46 +++++++++++++ arch/mips/mach-octeon/Makefile | 10 +++ arch/mips/mach-octeon/cache.c | 20 ++++++ arch/mips/mach-octeon/clock.c | 14 ++++ arch/mips/mach-octeon/cpu.c | 66 +++++++++++++++++++ arch/mips/mach-octeon/dram.c | 28 ++++++++ arch/mips/mach-octeon/include/ioremap.h | 30 +++++++++ arch/mips/mach-octeon/include/mach/cavm-reg.h | 17 +++++ arch/mips/mach-octeon/include/mach/clock.h | 12 ++++ arch/mips/mach-octeon/lowlevel_init.S | 19 ++++++ scripts/config_whitelist.txt | 1 - 14 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 arch/mips/mach-octeon/Kconfig create mode 100644 arch/mips/mach-octeon/Makefile create mode 100644 arch/mips/mach-octeon/cache.c create mode 100644 arch/mips/mach-octeon/clock.c create mode 100644 arch/mips/mach-octeon/cpu.c create mode 100644 arch/mips/mach-octeon/dram.c create mode 100644 arch/mips/mach-octeon/include/ioremap.h create mode 100644 arch/mips/mach-octeon/include/mach/cavm-reg.h create mode 100644 arch/mips/mach-octeon/include/mach/clock.h create mode 100644 arch/mips/mach-octeon/lowlevel_init.S
MAINTAINERS +6 -0
@@ -763,6 +763,12 @@ M: Ezequiel Garcia <[email protected]> S: Maintained F: arch/mips/mach-jz47xx/ +MIPS Octeon +M: Aaron Williams <[email protected]> +S: Maintained +F: arch/mips/mach-octeon/ +F: arch/mips/include/asm/arch-octeon/ + MMC M: Peng Fan <[email protected]> S: Maintained
arch/mips/Kconfig +41 -0
83 lines not on this page · raw message
arch/mips/Makefile +3 -0
@@ -17,6 +17,7 @@ machine-$(CONFIG_ARCH_JZ47XX) += jz47xx machine-$(CONFIG_MACH_PIC32) += pic32 machine-$(CONFIG_ARCH_MTMIPS) += mtmips machine-$(CONFIG_ARCH_MSCC) += mscc +machine-${CONFIG_ARCH_OCTEON} += octeon machdirs := $(patsubst %,arch/mips/mach-%/,$(machine-y)) libs-y += $(machdirs)
@@ -30,6 +31,7 @@ arch-$(CONFIG_CPU_MIPS32_R6) += -march=mips32r6 -Wa,-mips32r6 arch-$(CONFIG_CPU_MIPS64_R1) += -march=mips64 -Wa,-mips64 arch-$(CONFIG_CPU_MIPS64_R2) += -march=mips64r2 -Wa,-mips64r2 arch-$(CONFIG_CPU_MIPS64_R6) += -march=mips64r6 -Wa,-mips64r6 +arch-${CONFIG_CPU_MIPS64_OCTEON} += -march=octeon2 # Allow extra optimization for specific CPUs/SoCs tune-$(CONFIG_MIPS_TUNE_4KC) += -mtune=4kc
@@ -37,6 +39,7 @@ tune-$(CONFIG_MIPS_TUNE_14KC) += -mtune=14kc tune-$(CONFIG_MIPS_TUNE_24KC) += -mtune=24kc tune-$(CONFIG_MIPS_TUNE_34KC) += -mtune=34kc tune-$(CONFIG_MIPS_TUNE_74KC) += -mtune=74kc +tune-${CONFIG_MIPS_TUNE_OCTEON3} += -mtune=octeon2 # Include default header files cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic
arch/mips/mach-octeon/Kconfig new file +46 -0
46 lines not on this page · raw message
arch/mips/mach-octeon/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# (C) Copyright 2019 Marvell, Inc. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += lowlevel_init.o +obj-y += cache.o +obj-y += clock.o +obj-y += cpu.o +obj-y += dram.o
arch/mips/mach-octeon/cache.c new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Marvell International Ltd. +*/ + +#include <cpu_func.h> + +/* +* The Octeon platform is cache coherent and cache flushes and invalidates +* are not needed. Define some platform specific empty flush_foo() +* functions here to overwrite the _weak common function as a no-op. +* This effectively disables all cache operations. +*/ +void flush_dcache_range (ulong start_addr,ulong stop) +{ +} + +void flush_cache (ulong start_addr,ulong size) +{ +}
arch/mips/mach-octeon/clock.c new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2018, 2019 Marvell International Ltd. +*/ + +#include <asm/global_data.h> +#include <mach/clock.h> + +DECLARE_GLOBAL_DATA_PTR ; + +ulong notrace get_tbclk(void) +{ +return gd->cpu_clk; +}
arch/mips/mach-octeon/cpu.c new file +66 -0
66 lines not on this page · raw message
arch/mips/mach-octeon/dram.c new file +28 -0
@@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) Stefan Roese <[email protected]> +*/ + +#include <dm.h> +#include <ram.h> +#include <asm/global_data.h> +#include <linux/compat.h> + +DECLARE_GLOBAL_DATA_PTR ; + +int dram_init (void ) +{ +/* +* No DDR init yet -> run in L2 cache +*/ + gd->ram_size = (4 <<20 ); + gd->bd->bi_dram[0 ].size = gd->ram_size; + gd->bd->bi_dram[1 ].size =0 ; + +return 0 ; +} + +ulong board_get_usable_ram_top (ulong total_size) +{ +return gd->ram_top; +}
arch/mips/mach-octeon/include/ioremap.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MACH_OCTEON_IOREMAP_H +#define __ASM_MACH_OCTEON_IOREMAP_H + +#include <linux/types.h> + +/* +* Allow physical addresses to be fixed up to help peripherals located +* outside the low 32-bit range -- generic pass-through version. +*/ +static inline phys_addr_t fixup_bigphys_addr (phys_addr_t phys_addr, +phys_addr_t size) +{ +return phys_addr; +} + +static inline void __iomem *plat_ioremap (phys_addr_t offset,unsigned long size, +unsigned long flags) +{ +return (void __iomem *)(XKPHYS | offset); +} + +static inline int plat_iounmap (const volatile void __iomem *addr) +{ +return 0 ; +} + +#define _page_cachable_default _CACHE_CACHABLE_NONCOHERENT + +#endif /* __ASM_MACH_OCTEON_IOREMAP_H */
arch/mips/mach-octeon/include/mach/cavm-reg.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2020 Marvell International Ltd. +*/ + +#ifndef __CAVM_REG_H__ + +/* Register offsets */ +#define CAVM_CIU_FUSE 0x00010100000001a0 +#define CAVM_MIO_BOOT_REG_CFG0 0x0001180000000000 +#define CAVM_RST_BOOT 0x0001180006001600 + +/* Register bits */ +#define RST_BOOT_C_MUL GENMASK_ULL(36, 30) +#define RST_BOOT_PNR_MUL GENMASK_ULL(29, 24) + +#endif /* __CAVM_REG_H__ */
arch/mips/mach-octeon/include/mach/clock.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2018, 2019 Marvell International Ltd. +*/ + +#ifndef __CLOCK_H__ + +/** System PLL reference clock */ +#define PLL_REF_CLK 50000000/* 50 MHz */ +#define NS_PER_REF_CLK_TICK (1000000000 / PLL_REF_CLK) + +#endif /* __CLOCK_H__ */
arch/mips/mach-octeon/lowlevel_init.S new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2020 Stefan Roese <[email protected]> + */ + +#include <config.h> +#include <asm-offsets.h> +#include <asm/cacheops.h> +#include <asm/regdef.h> +#include <asm/mipsregs.h> +#include <asm/addrspace.h> +#include <asm/asm.h> + + .set noreorder + +LEAF(lowlevel_init) + jr ra + nop + END(lowlevel_init)
scripts/config_whitelist.txt +0 -1
@@ -230,7 +230,6 @@ CONFIG_CPLD_BR_PRELIM CONFIG_CPLD_OR_PRELIM CONFIG_CPM2 CONFIG_CPU_ARMV8 -CONFIG_CPU_CAVIUM_OCTEON CONFIG_CPU_FREQ_HZ CONFIG_CPU_HAS_LLSC CONFIG_CPU_HAS_PREFETCH
Signature · 1 line
2.27.0
PATCH v4 3/4 mips: octeon: dts: Add Octeon 3 cn73xx base dtsi file
In reply to Stefan RoeseThis patch adds the base dtsi file for the Octeon 3 cn73xx SoC.
---
(no changes since v1)
MAINTAINERS | 1 + arch/mips/dts/mrvl,cn73xx.dtsi | 64 ++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 arch/mips/dts/mrvl,cn73xx.dtsi
MAINTAINERS +1 -0
@@ -768,6 +768,7 @@ M: Aaron Williams <[email protected]> S: Maintained F: arch/mips/mach-octeon/ F: arch/mips/include/asm/arch-octeon/ +F: arch/mips/dts/mrvl,cn73xx.dtsi MMC M: Peng Fan <[email protected]>
arch/mips/dts/mrvl,cn73xx.dtsi new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v4 4/4 mips: octeon: Add minimal Octeon 3 EBB7304 EVK support
In reply to Stefan RoeseThis patch adds very basic minimal support for the Marvell Octeon 3 CN73xx based EBB7304 EVK. Please note that the basic Octeon port does not support DDR3/4 initialization yet. To still use U-Boot on with this port, the L2 cache (4MiB) is used as RAM. This way, U-Boot can boot to the prompt on this board.
Supported devices:
- UART
- reset
- CFI parallel NOR flash
---
Changes in v4:
- Remove CONFIG_BOARD_SIZE_LIMIT
Changes in v3:
- Remove inclusion of "common.h"
- Slightly change some copyright messages (adjust year)
Changes in v2:
- Removed CONFIG_SYS_MIPS_TIMER_FREQ
arch/mips/dts/Makefile | 1 + arch/mips/dts/mrvl,octeon-ebb7304.dts | 96 ++++++++++++++++++++++++ arch/mips/mach-octeon/Kconfig | 14 ++++ board/Marvell/octeon_ebb7304/Kconfig | 19 +++++ board/Marvell/octeon_ebb7304/MAINTAINERS | 7 ++ board/Marvell/octeon_ebb7304/Makefile | 8 ++ board/Marvell/octeon_ebb7304/board.c | 9 +++ configs/octeon_ebb7304_defconfig | 37 +++++++++ include/configs/octeon_common.h | 19 +++++ include/configs/octeon_ebb7304.h | 20 +++++ 10 files changed, 230 insertions(+) create mode 100644 arch/mips/dts/mrvl,octeon-ebb7304.dts create mode 100644 board/Marvell/octeon_ebb7304/Kconfig create mode 100644 board/Marvell/octeon_ebb7304/MAINTAINERS create mode 100644 board/Marvell/octeon_ebb7304/Makefile create mode 100644 board/Marvell/octeon_ebb7304/board.c create mode 100644 configs/octeon_ebb7304_defconfig create mode 100644 include/configs/octeon_common.h create mode 100644 include/configs/octeon_ebb7304.h
arch/mips/dts/Makefile +1 -0
@@ -18,6 +18,7 @@ dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb dtb-$(CONFIG_BOARD_COMTREND_WAP5813N) += comtrend,wap-5813n.dtb dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb dtb-$(CONFIG_BOARD_MT7628_RFB) += mediatek,mt7628-rfb.dtb +dtb-$(CONFIG_TARGET_OCTEON_EBB7304) += mrvl,octeon-ebb7304.dtb dtb-$(CONFIG_BOARD_NETGEAR_CG3100D) += netgear,cg3100d.dtb dtb-$(CONFIG_BOARD_NETGEAR_DGND3700V2) += netgear,dgnd3700v2.dtb dtb-$(CONFIG_BOARD_SAGEM_FAST1704) += sagem,f at st1704.dtb
arch/mips/dts/mrvl,octeon-ebb7304.dts new file +96 -0
96 lines not on this page · raw message
arch/mips/mach-octeon/Kconfig +14 -0
@@ -31,6 +31,18 @@ config SOC_OCTEON3 endchoice +choice + prompt "Octeon 3 board select" + default TARGET_OCTEON_EBB7304 + +config TARGET_OCTEON_EBB7304 + bool "Marvell Octeon EBB7304" + select OCTEON_CN73XX + help + Choose this for the Octeon EBB7304 board + +endchoice + config SYS_DCACHE_SIZE default 32768
@@ -43,4 +55,6 @@ config SYS_ICACHE_SIZE config SYS_ICACHE_LINE_SIZE default 128 +source "board/Marvell/octeon_ebb7304/Kconfig" + endmenu
board/Marvell/octeon_ebb7304/Kconfig new file +19 -0
@@ -0,0 +1,19 @@ +if TARGET_OCTEON_EBB7304 + +config SYS_BOARD + string + default "octeon_ebb7304" + +config SYS_VENDOR + string + default "Marvell" + +config SYS_CONFIG_NAME + string + default "octeon_ebb7304" + +config DEFAULT_DEVICE_TREE + string + default "mrvl,octeon-ebb7304" + +endif
board/Marvell/octeon_ebb7304/MAINTAINERS new file +7 -0
@@ -0,0 +1,7 @@ +OCTEON_EBB7304 BOARD +M: Aaron Williams <[email protected]> +S: Maintained +F: board/Marvell/octeon_ebb7304/* +F: configs/octeon_ebb7304_defconfig +F: include/configs/octeon_ebb7304.h +F: arch/mips/dts/mrvl,octeon-ebb7304.dts
board/Marvell/octeon_ebb7304/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# +# Copyright (C) 2020 Stefan Roese <[email protected]> +# Copyright (C) 2019-2020 Marvell International Ltd. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y := board.o
board/Marvell/octeon_ebb7304/board.c new file +9 -0
@@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2020 Stefan Roese <[email protected]> +*/ + +/* +* Nothing included right now. Code will be added in follow-up +* patches. +*/
configs/octeon_ebb7304_defconfig new file +37 -0
@@ -0,0 +1,37 @@ +CONFIG_MIPS=y +CONFIG_SYS_TEXT_BASE=0xffffffffbfc00000 +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_ENV_SIZE=0x2000 +CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_NR_DRAM_BANKS=2 +CONFIG_DEBUG_UART_BASE=0x8001180000000800 +CONFIG_DEBUG_UART_CLOCK=1200000000 +CONFIG_ARCH_OCTEON=y +CONFIG_DEBUG_UART=y +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PCI=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_CMD_TIME=y +CONFIG_ENV_IS_IN_FLASH=y +CONFIG_ENV_ADDR=0x1FBFE000 +CONFIG_CLK=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y +CONFIG_CFI_FLASH=y +CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y +CONFIG_FLASH_CFI_MTD=y +CONFIG_SYS_FLASH_CFI=y +CONFIG_DM_ETH=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DEBUG_UART_SHIFT=3 +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_SYS_NS16550=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_OCTEON=y +CONFIG_HEXDUMP=y
include/configs/octeon_common.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2019-2020 +* Marvell <www.marvell.com> +*/ + +#ifndef __OCTEON_COMMON_H__ +#define __OCTEON_COMMON_H__ + +/* No DDR init yet -> run in L2 cache with limited resources */ +#define CONFIG_SYS_MALLOC_LEN (256 << 10) +#define CONFIG_SYS_SDRAM_BASE 0xffffffff80000000 +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE + +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + (1 << 20)) + +#define CONFIG_SYS_INIT_SP_OFFSET 0x180000 + +#endif /* __OCTEON_COMMON_H__ */
include/configs/octeon_ebb7304.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2019-2020 +* Marvell <www.marvell.com> +*/ + +#ifndef __CONFIG_H__ +#define __CONFIG_H__ + +#include "octeon_common.h" + +/* +* CFI flash +*/ +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 256 +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_8BIT +#define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ + +#endif /* __CONFIG_H__ */
Signature · 1 line
2.27.0
PATCH v4 4/4 mips: octeon: Add minimal Octeon 3 EBB7304 EVK support
Quoted 36 lines
This patch adds very basic minimal support for the Marvell Octeon 3 CN73xx based EBB7304 EVK. Please note that the basic Octeon port does not support DDR3/4 initialization yet. To still use U-Boot on with this port, the L2 cache (4MiB) is used as RAM. This way, U-Boot can boot to the prompt on this board.
Supported devices:
- UART
- reset
- CFI parallel NOR flashSigned-off-by Stefan Roese <[email protected]>---
Changes in v4:
- RemoveCONFIG_BOARD_SIZE_LIMITChanges in v3:
- Remove inclusion of "common.h"
- Slightly change some copyright messages (adjust year)Changes in v2:
- RemovedCONFIG_SYS_MIPS_TIMER_FREQarch/mips/dts/Makefile | 1 + arch/mips/dts/mrvl,octeon-ebb7304.dts | 96 ++++++++++++++++++++++++ arch/mips/mach-octeon/Kconfig | 14 ++++ board/Marvell/octeon_ebb7304/Kconfig | 19 +++++ board/Marvell/octeon_ebb7304/MAINTAINERS | 7 ++ board/Marvell/octeon_ebb7304/Makefile | 8 ++ board/Marvell/octeon_ebb7304/board.c | 9 +++ configs/octeon_ebb7304_defconfig | 37 +++++++++ include/configs/octeon_common.h | 19 +++++ include/configs/octeon_ebb7304.h | 20 +++++ 10 files changed, 230 insertions(+)
Quoted 9 lines
create mode 100644 arch/mips/dts/mrvl,octeon-ebb7304.dts create mode 100644 board/Marvell/octeon_ebb7304/Kconfig create mode 100644 board/Marvell/octeon_ebb7304/MAINTAINERS create mode 100644 board/Marvell/octeon_ebb7304/Makefile create mode 100644 board/Marvell/octeon_ebb7304/board.c create mode 100644 configs/octeon_ebb7304_defconfig create mode 100644 include/configs/octeon_common.h create mode 100644 include/configs/octeon_ebb7304.h
both Octeon base support series are applied to u-boot-mips/next. I reordered and squashed some patches to get a cleaner history. Also configs/octeon_ebb7304_defconfig needed a little refresh. The GPIO driver needs another update and the SPI driver some more review and ack. For the DDR4 init stuff I couldn't spare enough time for review yet.
Could you check if everything still works so that I can prepare the pull-request? Thanks.
Signature · 1 line
- Daniel
PATCH v4 4/4 mips: octeon: Add minimal Octeon 3 EBB7304 EVK support
Hi Daniel,
Quoted 54 lines · Daniel Schwierzeck
Quoted 36 lines
This patch adds very basic minimal support for the Marvell Octeon 3 CN73xx based EBB7304 EVK. Please note that the basic Octeon port does not support DDR3/4 initialization yet. To still use U-Boot on with this port, the L2 cache (4MiB) is used as RAM. This way, U-Boot can boot to the prompt on this board.
Supported devices:
- UART
- reset
- CFI parallel NOR flashSigned-off-by Stefan Roese <[email protected]>---
Changes in v4:
- RemoveCONFIG_BOARD_SIZE_LIMITChanges in v3:
- Remove inclusion of "common.h"
- Slightly change some copyright messages (adjust year)Changes in v2:
- RemovedCONFIG_SYS_MIPS_TIMER_FREQarch/mips/dts/Makefile | 1 + arch/mips/dts/mrvl,octeon-ebb7304.dts | 96 ++++++++++++++++++++++++ arch/mips/mach-octeon/Kconfig | 14 ++++ board/Marvell/octeon_ebb7304/Kconfig | 19 +++++ board/Marvell/octeon_ebb7304/MAINTAINERS | 7 ++ board/Marvell/octeon_ebb7304/Makefile | 8 ++ board/Marvell/octeon_ebb7304/board.c | 9 +++ configs/octeon_ebb7304_defconfig | 37 +++++++++ include/configs/octeon_common.h | 19 +++++ include/configs/octeon_ebb7304.h | 20 +++++ 10 files changed, 230 insertions(+)Quoted 9 lines
create mode 100644
arch/mips/dts/mrvl,octeon-ebb7304.dtscreate mode 100644 board/Marvell/octeon_ebb7304/Kconfig create mode 100644 board/Marvell/octeon_ebb7304/MAINTAINERS create mode 100644 board/Marvell/octeon_ebb7304/Makefile create mode 100644board/Marvell/octeon_ebb7304/board.ccreate mode 100644 configs/octeon_ebb7304_defconfig create mode 100644include/configs/octeon_common.hcreate mode 100644include/configs/octeon_ebb7304.hboth Octeon base support series are applied to u-boot-mips/next. I reordered and squashed some patches to get a cleaner history. Also configs/octeon_ebb7304_defconfig needed a little refresh. The GPIO driver needs another update and the SPI driver some more review and ack. For the DDR4 init stuff I couldn't spare enough time for review yet.
Quoted 2 lines
Could you check if everything still works so that I can prepare the pull-request? Thanks.
Thanks Daniel. I checked the "next" branch and all looks good. Running this on the board also works without any issues. The only thing I noticed is, that building U-Boot now produces this build warning:
===================== WARNING ====================== This board does not use CONFIG_DM_ETH (Driver Model for Ethernet drivers). Please update the board to use CONFIG_DM_ETH before the v2020.07 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info.
====================================================
Feel free to add (squash) this change to the defconfig to remove this build warning:
(quoted diff) +0 -0
b/configs/octeon_ebb7304_defconfig
index d810b1e45f..204a42b9fd 100644
configs/octeon_ebb7304_defconfig +1 -0
@@ -29,6 +29,7 @@ CONFIG_CFI_FLASH=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_CFI=y +CONFIG_DM_ETH=y # CONFIG_NETDEVICES is not set CONFIG_DEBUG_UART_SHIFT=3 CONFIG_DEBUG_UART_ANNOUNCE=y
Or I will send a patch to change it when the patch series is merged into mainline.
Thanks,
Stefan