LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jiaxun Yang <jiaxun.yang@flygoat.com>
To: linux-mips@vger.kernel.org
Cc: tsbogend@alpha.franken.de, mturquette@baylibre.com,
daniel.lezcano@linaro.org, linus.walleij@linaro.org,
vkoul@kernel.org, linux-kernel@vger.kernel.org,
linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-phy@lists.infradead.org, devicetree@vger.kernel.org,
Jiaxun Yang <jiaxun.yang@flygoat.com>
Subject: [PATCH v3 1/9] MIPS: generic: Allow generating FIT image for Marduk board
Date: Wed, 21 Jul 2021 11:01:26 +0800 [thread overview]
Message-ID: <20210721030134.10562-2-jiaxun.yang@flygoat.com> (raw)
In-Reply-To: <20210721030134.10562-1-jiaxun.yang@flygoat.com>
Marduk is based on IMG pistachio SoC. The platform is using
MIPS UHI booting protocol and does have a proper devicetree
implement, thus it could be a part of generic kernel.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/boot/dts/Makefile | 1 +
arch/mips/boot/dts/img/Makefile | 2 ++
arch/mips/generic/Kconfig | 6 ++++++
arch/mips/generic/Platform | 1 +
arch/mips/generic/board-marduk.its.S | 22 ++++++++++++++++++++++
5 files changed, 32 insertions(+)
create mode 100644 arch/mips/generic/board-marduk.its.S
diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index 60bd7d2a9ad8..188301164d9e 100644
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -2,6 +2,7 @@
subdir-$(CONFIG_BMIPS_GENERIC) += brcm
subdir-$(CONFIG_CAVIUM_OCTEON_SOC) += cavium-octeon
subdir-$(CONFIG_MACH_PISTACHIO) += img
+subdir-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += img
subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += img
subdir-$(CONFIG_MACH_INGENIC) += ingenic
subdir-$(CONFIG_LANTIQ) += lantiq
diff --git a/arch/mips/boot/dts/img/Makefile b/arch/mips/boot/dts/img/Makefile
index 441a3c16efb0..24f6bbeadd48 100644
--- a/arch/mips/boot/dts/img/Makefile
+++ b/arch/mips/boot/dts/img/Makefile
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += boston.dtb
+dtb-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += pistachio_marduk.dtb
+
dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
diff --git a/arch/mips/generic/Kconfig b/arch/mips/generic/Kconfig
index 657dd93c5e76..7dc5b3821cc6 100644
--- a/arch/mips/generic/Kconfig
+++ b/arch/mips/generic/Kconfig
@@ -58,6 +58,12 @@ config FIT_IMAGE_FDT_BOSTON
enable this if you wish to boot on a MIPS Boston board, as it is
expected by the bootloader.
+config FIT_IMAGE_FDT_MARDUK
+ bool "Include FDT for IMG Pistachio Marduk (CI40) boards"
+ help
+ Enable this to include the FDT for the IMG Pistachio Marduk (CI40)
+ from Imagination Technologies in the FIT kernel image.
+
config FIT_IMAGE_FDT_NI169445
bool "Include FDT for NI 169445"
help
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index b871af16b5b6..e1abc113b409 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -24,3 +24,4 @@ its-$(CONFIG_FIT_IMAGE_FDT_LUTON) += board-luton.its.S
its-$(CONFIG_FIT_IMAGE_FDT_JAGUAR2) += board-jaguar2.its.S
its-$(CONFIG_FIT_IMAGE_FDT_SERVAL) += board-serval.its.S
its-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += board-xilfpga.its.S
+its-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += board-marduk.its.S
diff --git a/arch/mips/generic/board-marduk.its.S b/arch/mips/generic/board-marduk.its.S
new file mode 100644
index 000000000000..4f633794db90
--- /dev/null
+++ b/arch/mips/generic/board-marduk.its.S
@@ -0,0 +1,22 @@
+/ {
+ images {
+ fdt-marduk {
+ description = "img,pistachio-marduk Device Tree";
+ data = /incbin/("boot/dts/img/pistachio_marduk.dtb");
+ type = "flat_dt";
+ arch = "mips";
+ compression = "none";
+ hash {
+ algo = "sha1";
+ };
+ };
+ };
+
+ configurations {
+ conf-marduk {
+ description = "Marduk Linux kernel";
+ kernel = "kernel";
+ fdt = "fdt-marduk";
+ };
+ };
+};
--
2.32.0
next prev parent reply other threads:[~2021-07-21 3:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 3:01 [PATCH v3 0/9] MIPS: Migrate pistachio to generic kernel Jiaxun Yang
2021-07-21 3:01 ` Jiaxun Yang [this message]
2021-07-21 3:01 ` [PATCH v3 2/9] MIPS: DTS: Pistachio add missing cpc and cdmm Jiaxun Yang
2021-07-21 3:01 ` [PATCH v3 3/9] clk: pistachio: Make it selectable for generic MIPS kernel Jiaxun Yang
2021-07-21 3:01 ` [PATCH v3 4/9] clocksource/drivers/pistachio: Make it selectable for MIPS Jiaxun Yang
2021-07-21 3:01 ` [PATCH v3 5/9] phy: pistachio-usb: Depend on MIPS || COMPILE_TEST Jiaxun Yang
2021-07-21 3:01 ` [PATCH v3 6/9] pinctrl: pistachio: Make it as an option Jiaxun Yang
2021-07-30 12:38 ` Linus Walleij
2021-07-21 3:01 ` [PATCH v3 7/9] MIPS: config: generic: Add config for Marduk board Jiaxun Yang
2021-07-21 3:01 ` [PATCH v3 8/9] MIPS: Retire MACH_PISTACHIO Jiaxun Yang
2021-07-21 7:08 ` kernel test robot
2021-07-21 7:15 ` kernel test robot
2021-07-21 8:07 ` Jiaxun Yang
2021-07-21 3:01 ` [PATCH v3 9/9] MIPS: Make a alias for pistachio_defconfig Jiaxun Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210721030134.10562-2-jiaxun.yang@flygoat.com \
--to=jiaxun.yang@flygoat.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=tsbogend@alpha.franken.de \
--cc=vkoul@kernel.org \
--subject='Re: [PATCH v3 1/9] MIPS: generic: Allow generating FIT image for Marduk board' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).