From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 02 Feb 2023 09:00:06 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pNUVs-00B887-6w for lore@lore.pengutronix.de; Thu, 02 Feb 2023 09:00:06 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pNUVp-00019c-8Q for lore@pengutronix.de; Thu, 02 Feb 2023 09:00:06 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=m4tV9rY7c/DP7FPlU9vu4/EAWk0XT6dbANcTwu1l61M=; b=Tpqqs3mbir9e32c4x32FNKBwd9 u8pWoeZ5/I1WRK6nPszknPBjJyjFcoPHQD1cLPZt+GG79C9his/lANbJLVR4eZcH8n0UY43Lnuot6 oHTotZovhIXrxPCfdXoFB+zLIzvfKFKsJwfXA0gYk+KDPaUgn29OIIYCGvTBQ7ueoKxYMB9daZG+v ixjh9GgBaxSZTZeMHibHVDupsoicF0Q53N+qP42sYEviMUdfGz6H5S6vXNlUmiYIvsLX/HqScJvTk UO/ZelV5h46HDlh2PYpGAngEwowMNvkZ3om3A4yXF479JYoxvPYydRE1zNHqReaPxzpuPxWhZofMm tAybpDJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNUUM-00Eod2-VL; Thu, 02 Feb 2023 07:58:35 +0000 Received: from out-155.mta0.migadu.com ([2001:41d0:1004:224b::9b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNUU5-00EoVC-13 for barebox@lists.infradead.org; Thu, 02 Feb 2023 07:58:22 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jookia.org; s=key1; t=1675324690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m4tV9rY7c/DP7FPlU9vu4/EAWk0XT6dbANcTwu1l61M=; b=t/Xg7goF9Jpqm5HCW5Bg/mITCzg9x6lDq8IemqODkWBqd/HDg7U/nL9wHzsTpSBd7jSLdX n5MU9YKMYG91TU1y9bUGCOrCS0n20jgTXv/10wb61mHZsyQFnJ/75xvsahvrZQNxnb5gy5 OVEyPEtBvwBuTAzDn3xyYcOgVJGxmXhliWON5mZoo3F1c/Kk+6bIS6YNVYuSujXzbL8BCn In848PPJ0XRwr7gC3JGiOUzixMTsUC2EUpEGfHRwLdoqAsJL32gHTLJzY0FXjW/OUdBWfl YjIihgpdifoAvaOALjpEHV57KDTlyUH6o9cf2joZmP8nurTG99df/ZExcYh7aw== From: John Watts To: barebox@lists.infradead.org Cc: John Watts Date: Thu, 2 Feb 2023 18:57:38 +1100 Message-Id: <20230202075741.2350028-2-contact@jookia.org> In-Reply-To: <20230202075741.2350028-1-contact@jookia.org> References: <20230202075741.2350028-1-contact@jookia.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230201_235817_294694_4AEDB954 X-CRM114-Status: GOOD ( 17.87 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 1/4] ARM: novena: Add Kosagi Novena board X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) The Kosagi Novena is an open source laptop released in 2014. This patch adds the initial project skeleton for running the PBL and debugging over the UART2 port (labeled DEBUG on the board.) Signed-off-by: John Watts --- arch/arm/boards/Makefile | 1 + arch/arm/boards/novena/Makefile | 4 ++ arch/arm/boards/novena/board.c | 24 +++++++ .../boards/novena/flash-header-novena.imxcfg | 6 ++ arch/arm/boards/novena/lowlevel.c | 68 +++++++++++++++++++ arch/arm/configs/imx_v7_defconfig | 1 + arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-novena.dts | 4 ++ arch/arm/mach-imx/Kconfig | 7 ++ images/Makefile.imx | 2 + 10 files changed, 118 insertions(+) create mode 100644 arch/arm/boards/novena/Makefile create mode 100644 arch/arm/boards/novena/board.c create mode 100644 arch/arm/boards/novena/flash-header-novena.imxcfg create mode 100644 arch/arm/boards/novena/lowlevel.c create mode 100644 arch/arm/dts/imx6q-novena.dts diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index f47aea6602..50088886eb 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_BEAGLEBONE) += beaglebone/ obj-$(CONFIG_MACH_CANON_A1100) += canon-a1100/ obj-$(CONFIG_MACH_CM_FX6) += cm-fx6/ obj-$(CONFIG_MACH_NITROGEN6) += boundarydevices-nitrogen6/ +obj-$(CONFIG_MACH_NOVENA) += novena/ obj-$(CONFIG_MACH_CCMX51) += ccxmx51/ obj-$(CONFIG_MACH_CCMX53) += ccxmx53/ obj-$(CONFIG_MACH_CFA10036) += crystalfontz-cfa10036/ diff --git a/arch/arm/boards/novena/Makefile b/arch/arm/boards/novena/Makefile new file mode 100644 index 0000000000..3111392bf9 --- /dev/null +++ b/arch/arm/boards/novena/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +obj-y += board.o +lwl-y += lowlevel.o diff --git a/arch/arm/boards/novena/board.c b/arch/arm/boards/novena/board.c new file mode 100644 index 0000000000..e41ea10f8d --- /dev/null +++ b/arch/arm/boards/novena/board.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2023 John Watts + +#include +#include + +static int novena_probe(struct device *dev) +{ + return 0; +} + +static const struct of_device_id novena_of_match[] = { + { .compatible = "kosagi,imx6q-novena", }, + { /* sentinel */ } +}; + +static struct driver novena_board_driver = { + .name = "board-novena", + .probe = novena_probe, + .of_compatible = novena_of_match, +}; +coredevice_platform_driver(novena_board_driver); + +BAREBOX_DEEP_PROBE_ENABLE(novena_of_match); diff --git a/arch/arm/boards/novena/flash-header-novena.imxcfg b/arch/arm/boards/novena/flash-header-novena.imxcfg new file mode 100644 index 0000000000..0612542c19 --- /dev/null +++ b/arch/arm/boards/novena/flash-header-novena.imxcfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +loadaddr 0x00907000 +soc imx6 +max_load_size 0x11000 +ivtofs 0x400 diff --git a/arch/arm/boards/novena/lowlevel.c b/arch/arm/boards/novena/lowlevel.c new file mode 100644 index 0000000000..5782e598c7 --- /dev/null +++ b/arch/arm/boards/novena/lowlevel.c @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2023 John Watts + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define STACK_TOP (MX6_OCRAM_BASE_ADDR + MX6_OCRAM_MAX_SIZE) + +extern char __dtb_z_imx6q_novena_start[]; + +static bool running_from_ram(void) +{ + return (get_pc() >= MX6_MMDC_PORT01_BASE_ADDR); +} + +static void setup_uart(void) +{ + void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR); + void __iomem *uart2base = IOMEM(MX6_UART2_BASE_ADDR); + + /* NOTE: RX is needed for TX to work on this board */ + imx_setup_pad(iomuxbase, MX6Q_PAD_EIM_D26__UART2_RXD); + imx_setup_pad(iomuxbase, MX6Q_PAD_EIM_D27__UART2_TXD); + + imx6_uart_setup(uart2base); + pbl_set_putc(imx_uart_putc, uart2base); + + pr_debug(">"); +} + +static void load_barebox(void) +{ + enum bootsource bootsrc; + int bootinstance; + + imx6_get_boot_source(&bootsrc, &bootinstance); + + if (bootsrc == BOOTSOURCE_SERIAL) + imx6_barebox_start_usb(IOMEM(MX6_MMDC_PORT01_BASE_ADDR)); + else if (bootsrc == BOOTSOURCE_MMC) + imx6_esdhc_start_image(bootinstance); + + pr_err("Unsupported boot source %i instance %i\n", + bootsrc, bootinstance); + hang(); +} + +ENTRY_FUNCTION_WITHSTACK(start_imx6q_novena, STACK_TOP, r0, r1, r2) +{ + imx6_cpu_lowlevel_init(); + relocate_to_current_adr(); + setup_c(); + + imx6_ungate_all_peripherals(); + setup_uart(); + + if (!running_from_ram()) + load_barebox(); + else + imx6q_barebox_entry(__dtb_z_imx6q_novena_start); +} diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 6110a52e48..f8deca324a 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -25,6 +25,7 @@ CONFIG_MACH_SABRELITE=y CONFIG_MACH_SABRESD=y CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB=y CONFIG_MACH_NITROGEN6=y +CONFIG_MACH_NOVENA=y CONFIG_MACH_SOLIDRUN_MICROSOM=y CONFIG_MACH_TECHNEXION_PICO_HOBBIT=y CONFIG_MACH_TECHNEXION_WANDBOARD=y diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 26c4a8ab99..a01ee19f68 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -46,6 +46,7 @@ lwl-$(CONFIG_MACH_MYIRTECH_X335X) += am335x-myirtech-myd.dtb.o lwl-$(CONFIG_MACH_NETGEAR_RN104) += armada-370-rn104-bb.dtb.o lwl-$(CONFIG_MACH_NETGEAR_RN2120) += armada-xp-rn2120-bb.dtb.o lwl-$(CONFIG_MACH_NITROGEN6) += imx6q-nitrogen6x.dtb.o imx6dl-nitrogen6x.dtb.o imx6qp-nitrogen6_max.dtb.o +lwl-$(CONFIG_MACH_NOVENA) += imx6q-novena.dtb.o lwl-$(CONFIG_MACH_NVIDIA_BEAVER) += tegra30-beaver.dtb.o lwl-$(CONFIG_MACH_NVIDIA_JETSON) += tegra124-jetson-tk1.dtb.o lwl-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o diff --git a/arch/arm/dts/imx6q-novena.dts b/arch/arm/dts/imx6q-novena.dts new file mode 100644 index 0000000000..12bade849c --- /dev/null +++ b/arch/arm/dts/imx6q-novena.dts @@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR X11 +// SPDX-FileCopyrightText: 2023 John Watts + +#include diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 774c4cacb7..912eef8290 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -434,6 +434,13 @@ config MACH_NITROGEN6 bool "BoundaryDevices Nitrogen6 boards" select ARCH_IMX6 +config MACH_NOVENA + bool "Kosagi Novena board" + select ARCH_IMX6 + select ARM_USE_COMPRESSED_DTB + select MCI_IMX_ESDHC_PBL + select USB_GADGET_DRIVER_ARC_PBL + config MACH_SOLIDRUN_MICROSOM bool "SolidRun MicroSOM based devices" select ARCH_IMX6 diff --git a/images/Makefile.imx b/images/Makefile.imx index e9f4ba64e4..65914212bf 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -258,6 +258,8 @@ $(call build_imx_habv4img, CONFIG_MACH_NITROGEN6, start_imx6dl_nitrogen6x_2g, bo $(call build_imx_habv4img, CONFIG_MACH_NITROGEN6, start_imx6qp_nitrogen6_max, boundarydevices-nitrogen6/flash-header-nitrogen6qp-max, boundarydevices-imx6qp-nitrogen6_max) +$(call build_imx_habv4img, CONFIG_MACH_NOVENA, start_imx6q_novena, novena/flash-header-novena, imx6q-novena) + $(call build_imx_habv4img, CONFIG_MACH_TX6X, start_imx6dl_tx6x_512m, karo-tx6x/flash-header-tx6dl-512m, karo-imx6dl-tx6x-512m) $(call build_imx_habv4img, CONFIG_MACH_TX6X, start_imx6dl_tx6x_1g, karo-tx6x/flash-header-tx6dl-1g, karo-imx6dl-tx6x-1g) -- 2.39.1