From: Jules Maselbas <jmaselbas@zdiv.net>
To: barebox@lists.infradead.org
Cc: Jules Maselbas <jmaselbas@zdiv.net>
Subject: [PATCH v2 12/13] ARM: boards: sunxi: Add pine64 board
Date: Thu, 25 May 2023 01:43:27 +0200 [thread overview]
Message-ID: <20230524234328.82741-13-jmaselbas@zdiv.net> (raw)
In-Reply-To: <20230524234328.82741-1-jmaselbas@zdiv.net>
Signed-off-by: Jules Maselbas <jmaselbas@zdiv.net>
---
rfc->v1:
- removed max-frequency on eMMC and PIO device-tree node
arch/arm/boards/Makefile | 1 +
arch/arm/boards/pine64-pine64/Makefile | 1 +
arch/arm/boards/pine64-pine64/lowlevel.c | 70 ++++++++++++++++++++++++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/sun50i-a64-pine64-plus.dts | 16 ++++++
arch/arm/mach-sunxi/Kconfig | 5 ++
images/Makefile.sunxi | 10 ++++
7 files changed, 104 insertions(+)
create mode 100644 arch/arm/boards/pine64-pine64/Makefile
create mode 100644 arch/arm/boards/pine64-pine64/lowlevel.c
create mode 100644 arch/arm/dts/sun50i-a64-pine64-plus.dts
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index f4796f5374..2a9424d2c2 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -97,6 +97,7 @@ obj-$(CONFIG_MACH_PHYTEC_PHYCORE_IMX7) += phytec-phycore-imx7/
obj-$(CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1) += phytec-phycore-stm32mp1/
obj-$(CONFIG_MACH_PHYTEC_SOM_IMX8MQ) += phytec-som-imx8mq/
obj-$(CONFIG_MACH_PINE64_PINEPHONE) += pine64-pinephone/
+obj-$(CONFIG_MACH_PINE64_PINE64) += pine64-pine64/
obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/
obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += plathome-openblocks-a6/
obj-$(CONFIG_MACH_PM9261) += pm9261/
diff --git a/arch/arm/boards/pine64-pine64/Makefile b/arch/arm/boards/pine64-pine64/Makefile
new file mode 100644
index 0000000000..b08c4a93ca
--- /dev/null
+++ b/arch/arm/boards/pine64-pine64/Makefile
@@ -0,0 +1 @@
+lwl-y += lowlevel.o
diff --git a/arch/arm/boards/pine64-pine64/lowlevel.c b/arch/arm/boards/pine64-pine64/lowlevel.c
new file mode 100644
index 0000000000..d7d3111557
--- /dev/null
+++ b/arch/arm/boards/pine64-pine64/lowlevel.c
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0+
+#include <common.h>
+#include <debug_ll.h>
+#include <linux/sizes.h>
+#include <linux/bitops.h>
+#include <mach/sunxi/barebox-arm.h>
+#include <mach/sunxi/init.h>
+#include <mach/sunxi/xload.h>
+#include <mach/sunxi/egon.h>
+#include <mach/sunxi/rmr_switch.h>
+#include <mach/sunxi/sun50i-regs.h>
+#include <mach/sunxi/sunxi-pinctrl.h>
+
+SUN50I_A64_ENTRY_FUNCTION(start_pine64_pine64, r0, r1, r2)
+{
+ extern char __dtb_z_sun50i_a64_pine64_plus_start[];
+ void *fdt;
+ u32 size;
+
+ sunxi_switch_to_aarch64(.text_head_soc_header2, SUN50I_A64_RVBAR_IOMAP);
+
+ sun50i_cpu_lowlevel_init();
+ sun50i_uart_setup();
+
+ relocate_to_current_adr();
+ setup_c();
+
+ /* Skip SDRAM initialization if we run from it */
+ if (get_pc() < SUN50I_DRAM_ADDR) {
+ size = sun50i_a64_ddr3_dram_init();
+ if (size == 0) {
+ puts_ll("FAIL: dram init\r\n");
+ goto reset;
+ }
+ puthex_ll(size);
+ putc_ll('\r'); putc_ll('\n');
+ }
+
+ puts_ll("now booting\r\n");
+ fdt = __dtb_z_sun50i_a64_pine64_plus_start + get_runtime_offset();
+ barebox_arm_entry(SUN50I_DRAM_ADDR, SZ_1G, fdt);
+
+reset:
+ sun50i_cpu_lowlevel_reset();
+}
+
+SUN50I_A64_ENTRY_FUNCTION(start_pine64_pine64_xload, r0, r1, r2)
+{
+ u32 size;
+
+ sunxi_egon_header(.text_head_soc_header0);
+ sunxi_switch_to_aarch64(.text_head_soc_header1, SUN50I_A64_RVBAR_IOMAP);
+
+ sun50i_cpu_lowlevel_init();
+ sun50i_uart_setup();
+
+ relocate_to_current_adr();
+ setup_c();
+
+ size = sun50i_a64_ddr3_dram_init();
+ if (size == 0) {
+ puts_ll("FAIL: dram init\r\n");
+ goto reset;
+ }
+
+ /* now let's boot from sd */
+ sun50i_mmc0_start_image();
+reset:
+ sun50i_cpu_lowlevel_reset();
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index e989f399c2..23589a5dfa 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -82,6 +82,7 @@ lwl-$(CONFIG_MACH_PHYTEC_PHYCORE_IMX7) += imx7d-phyboard-zeta.dtb.o
lwl-$(CONFIG_MACH_PHYTEC_PHYCORE_STM32MP1) += stm32mp157c-phycore-stm32mp1-3.dtb.o
lwl-$(CONFIG_MACH_PHYTEC_SOM_IMX8MQ) += imx8mq-phytec-phycore-som.dtb.o
lwl-$(CONFIG_MACH_PINE64_PINEPHONE) += sun50i-a64-pinephone-1_2.dtb.o
+lwl-$(CONFIG_MACH_PINE64_PINE64) += sun50i-a64-pine64-plus.dtb.o
lwl-$(CONFIG_MACH_PINE64_QUARTZ64) += rk3566-quartz64-a.dtb.o
lwl-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
lwl-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o
diff --git a/arch/arm/dts/sun50i-a64-pine64-plus.dts b/arch/arm/dts/sun50i-a64-pine64-plus.dts
new file mode 100644
index 0000000000..c16b683e88
--- /dev/null
+++ b/arch/arm/dts/sun50i-a64-pine64-plus.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <arm64/allwinner/sun50i-a64-pine64-plus.dts>
+/{
+ memory@40000000 {
+ device_type = "memory";
+ reg = <0x40000000 0x40000000>; /* 1 GB */
+ };
+};
+&mmc0 { /* SD */
+};
+&mmc1 { /* PIO */
+};
+&mmc2 { /* eMMC */
+ status = "ok";
+};
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 9975ceb471..0af924ba96 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -21,4 +21,9 @@ config MACH_PINE64_PINEPHONE
select ARCH_SUN50I_A64
select ARM_USE_COMPRESSED_DTB
+config MACH_PINE64_PINE64
+ bool "Allwinner A64 based Pine64 PINE64"
+ select ARCH_SUN50I_A64
+ select ARM_USE_COMPRESSED_DTB
+
endif
diff --git a/images/Makefile.sunxi b/images/Makefile.sunxi
index 070b1bf00d..75adba7f7f 100644
--- a/images/Makefile.sunxi
+++ b/images/Makefile.sunxi
@@ -20,3 +20,13 @@ image-$(CONFIG_MACH_PINE64_PINEPHONE) += barebox-pine64-pinephone_xload.img
pblb-$(CONFIG_MACH_PINE64_PINEPHONE) += start_pine64_pinephone
FILE_barebox-pine64-pinephone.img = start_pine64_pinephone.pblb
image-$(CONFIG_MACH_PINE64_PINEPHONE) += barebox-pine64-pinephone.img
+
+pblb-$(CONFIG_MACH_PINE64_PINE64) += start_pine64_pine64
+FILE_barebox-pine64-pine64.img = start_pine64_pine64.pblb
+image-$(CONFIG_MACH_PINE64_PINE64) += barebox-pine64-pine64.img
+
+pblb-$(CONFIG_MACH_PINE64_PINE64) += start_pine64_pine64_xload
+MAX_PBL_IMAGE_SIZE_start_pine64_pine64_xload = 0x8000
+FILE_barebox-pine64-pine64_xload.img = start_pine64_pine64_xload.pblb.egonimg
+image-$(CONFIG_MACH_PINE64_PINE64) += barebox-pine64-pine64_xload.img
+
--
2.40.1
next prev parent reply other threads:[~2023-05-24 23:45 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 23:43 [PATCH v2 00/13] Add support for Allwinner (sunxi) A64 SoC Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 01/13] Documentation: sunxi: Add some documentation Jules Maselbas
2023-05-29 9:24 ` Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 02/13] scripts: Add Allwinner eGON image support Jules Maselbas
2023-06-16 22:00 ` Marco Felsch
2023-06-17 7:25 ` Jules Maselbas
2023-06-20 4:52 ` Marco Felsch
2023-06-21 8:26 ` Sascha Hauer
2023-05-24 23:43 ` [PATCH v2 03/13] ARM: sunxi: introduce mach-sunxi Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 04/13] ARM: lds: Add SoC specific sections to go before .text_head_prologue Jules Maselbas
2023-06-01 6:34 ` Ahmad Fatoum
2023-06-01 21:20 ` Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 05/13] ARM: sunxi: Add lowlevel switch to aarch64 Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 06/13] ARM: sunxi: Add debug_ll Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 07/13] clk: Add clock driver for sun50i-a64 Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 08/13] pinctrl: Add sun50i-a64 pinctrl driver Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 09/13] mci: Add sunxi-mmc driver Jules Maselbas
2023-05-30 8:14 ` Sascha Hauer
2023-06-01 6:15 ` Jules Maselbas
2023-06-01 8:35 ` Sascha Hauer
2023-05-24 23:43 ` [PATCH v2 10/13] ARM: sunxi: Add sun50i SDRAM init Jules Maselbas
2023-05-24 23:43 ` [PATCH v2 11/13] ARM: boards: sunxi: Add initial support for the pinephone Jules Maselbas
2023-05-30 8:42 ` Sascha Hauer
2023-06-01 5:50 ` Jules Maselbas
2023-06-01 6:00 ` Ahmad Fatoum
2023-06-01 6:19 ` Jules Maselbas
2023-06-01 6:36 ` Ahmad Fatoum
2023-06-01 7:09 ` Ahmad Fatoum
2023-05-24 23:43 ` Jules Maselbas [this message]
2023-05-24 23:43 ` [PATCH v2 13/13] ARM: sunxi: xload: Add helpers for chain-loading from SD-card Jules Maselbas
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=20230524234328.82741-13-jmaselbas@zdiv.net \
--to=jmaselbas@zdiv.net \
--cc=barebox@lists.infradead.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox