From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 15 Nov 2022 12:42:44 +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 1ouuKy-008E0G-Lv for lore@lore.pengutronix.de; Tue, 15 Nov 2022 12:42:44 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ouuKx-0002y2-OJ; Tue, 15 Nov 2022 12:42:43 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ouuKs-0002wm-IO; Tue, 15 Nov 2022 12:42:38 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ouuKr-004Qmq-0m; Tue, 15 Nov 2022 12:42:37 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ouuKr-00EULk-7t; Tue, 15 Nov 2022 12:42:37 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Tue, 15 Nov 2022 12:42:34 +0100 Message-Id: <20221115114234.3452619-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221115114234.3452619-1-rhi@pengutronix.de> References: <20221115114234.3452619-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 2/2] rpi: rename platform to rpi1 X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Make it clear that this platform is really only used for the legacy ARMv6-based RPi 1 boards, so that there is no confusion when trying to use it for RPi 2 or later, even for people who don't read the documentation. Signed-off-by: Roland Hieber --- .../barebox-defaultenv/boot/net | 0 .../barebox-defaultenv/boot/sd | 0 .../barebox-defaultenv/nv/boot.default | 0 .../barebox.config | 0 .../config/images/boot-vfat.config | 0 .../firmware/LICENCE.broadcom | 0 .../firmware/bootcode.bin | Bin .../firmware/config.txt | 0 .../firmware/fixup.dat | Bin .../firmware/fixup_cd.dat | Bin .../firmware/fixup_db.dat | Bin .../firmware/fixup_x.dat | Bin .../firmware/start.elf | Bin .../firmware/start_cd.elf | Bin .../firmware/start_db.elf | Bin .../firmware/start_x.elf | Bin .../kernelconfig | 0 .../0001-mci-bcm283x-depend-on-sdhci.patch | 0 .../patches/barebox-2020.08.1/series | 0 .../platformconfig | 2 +- .../platforms/image-boot-vfat.in | 0 .../rules/image-boot-vfat.make | 0 doc/hardware.rst | 20 +++++++++--------- ...pi_raspi1.rst => hardware_rpi1_raspi1.rst} | 2 +- 24 files changed, 12 insertions(+), 12 deletions(-) rename configs/{platform-rpi => platform-rpi1}/barebox-defaultenv/boot/net (100%) rename configs/{platform-rpi => platform-rpi1}/barebox-defaultenv/boot/sd (100%) rename configs/{platform-rpi => platform-rpi1}/barebox-defaultenv/nv/boot.default (100%) rename configs/{platform-rpi => platform-rpi1}/barebox.config (100%) rename configs/{platform-rpi => platform-rpi1}/config/images/boot-vfat.config (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/LICENCE.broadcom (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/bootcode.bin (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/config.txt (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/fixup.dat (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/fixup_cd.dat (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/fixup_db.dat (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/fixup_x.dat (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/start.elf (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/start_cd.elf (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/start_db.elf (100%) rename configs/{platform-rpi => platform-rpi1}/firmware/start_x.elf (100%) rename configs/{platform-rpi => platform-rpi1}/kernelconfig (100%) rename configs/{platform-rpi => platform-rpi1}/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch (100%) rename configs/{platform-rpi => platform-rpi1}/patches/barebox-2020.08.1/series (100%) rename configs/{platform-rpi => platform-rpi1}/platformconfig (99%) rename configs/{platform-rpi => platform-rpi1}/platforms/image-boot-vfat.in (100%) rename configs/{platform-rpi => platform-rpi1}/rules/image-boot-vfat.make (100%) rename doc/{hardware_rpi_raspi1.rst => hardware_rpi1_raspi1.rst} (76%) diff --git a/configs/platform-rpi/barebox-defaultenv/boot/net b/configs/platform-rpi1/barebox-defaultenv/boot/net similarity index 100% rename from configs/platform-rpi/barebox-defaultenv/boot/net rename to configs/platform-rpi1/barebox-defaultenv/boot/net diff --git a/configs/platform-rpi/barebox-defaultenv/boot/sd b/configs/platform-rpi1/barebox-defaultenv/boot/sd similarity index 100% rename from configs/platform-rpi/barebox-defaultenv/boot/sd rename to configs/platform-rpi1/barebox-defaultenv/boot/sd diff --git a/configs/platform-rpi/barebox-defaultenv/nv/boot.default b/configs/platform-rpi1/barebox-defaultenv/nv/boot.default similarity index 100% rename from configs/platform-rpi/barebox-defaultenv/nv/boot.default rename to configs/platform-rpi1/barebox-defaultenv/nv/boot.default diff --git a/configs/platform-rpi/barebox.config b/configs/platform-rpi1/barebox.config similarity index 100% rename from configs/platform-rpi/barebox.config rename to configs/platform-rpi1/barebox.config diff --git a/configs/platform-rpi/config/images/boot-vfat.config b/configs/platform-rpi1/config/images/boot-vfat.config similarity index 100% rename from configs/platform-rpi/config/images/boot-vfat.config rename to configs/platform-rpi1/config/images/boot-vfat.config diff --git a/configs/platform-rpi/firmware/LICENCE.broadcom b/configs/platform-rpi1/firmware/LICENCE.broadcom similarity index 100% rename from configs/platform-rpi/firmware/LICENCE.broadcom rename to configs/platform-rpi1/firmware/LICENCE.broadcom diff --git a/configs/platform-rpi/firmware/bootcode.bin b/configs/platform-rpi1/firmware/bootcode.bin similarity index 100% rename from configs/platform-rpi/firmware/bootcode.bin rename to configs/platform-rpi1/firmware/bootcode.bin diff --git a/configs/platform-rpi/firmware/config.txt b/configs/platform-rpi1/firmware/config.txt similarity index 100% rename from configs/platform-rpi/firmware/config.txt rename to configs/platform-rpi1/firmware/config.txt diff --git a/configs/platform-rpi/firmware/fixup.dat b/configs/platform-rpi1/firmware/fixup.dat similarity index 100% rename from configs/platform-rpi/firmware/fixup.dat rename to configs/platform-rpi1/firmware/fixup.dat diff --git a/configs/platform-rpi/firmware/fixup_cd.dat b/configs/platform-rpi1/firmware/fixup_cd.dat similarity index 100% rename from configs/platform-rpi/firmware/fixup_cd.dat rename to configs/platform-rpi1/firmware/fixup_cd.dat diff --git a/configs/platform-rpi/firmware/fixup_db.dat b/configs/platform-rpi1/firmware/fixup_db.dat similarity index 100% rename from configs/platform-rpi/firmware/fixup_db.dat rename to configs/platform-rpi1/firmware/fixup_db.dat diff --git a/configs/platform-rpi/firmware/fixup_x.dat b/configs/platform-rpi1/firmware/fixup_x.dat similarity index 100% rename from configs/platform-rpi/firmware/fixup_x.dat rename to configs/platform-rpi1/firmware/fixup_x.dat diff --git a/configs/platform-rpi/firmware/start.elf b/configs/platform-rpi1/firmware/start.elf similarity index 100% rename from configs/platform-rpi/firmware/start.elf rename to configs/platform-rpi1/firmware/start.elf diff --git a/configs/platform-rpi/firmware/start_cd.elf b/configs/platform-rpi1/firmware/start_cd.elf similarity index 100% rename from configs/platform-rpi/firmware/start_cd.elf rename to configs/platform-rpi1/firmware/start_cd.elf diff --git a/configs/platform-rpi/firmware/start_db.elf b/configs/platform-rpi1/firmware/start_db.elf similarity index 100% rename from configs/platform-rpi/firmware/start_db.elf rename to configs/platform-rpi1/firmware/start_db.elf diff --git a/configs/platform-rpi/firmware/start_x.elf b/configs/platform-rpi1/firmware/start_x.elf similarity index 100% rename from configs/platform-rpi/firmware/start_x.elf rename to configs/platform-rpi1/firmware/start_x.elf diff --git a/configs/platform-rpi/kernelconfig b/configs/platform-rpi1/kernelconfig similarity index 100% rename from configs/platform-rpi/kernelconfig rename to configs/platform-rpi1/kernelconfig diff --git a/configs/platform-rpi/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch b/configs/platform-rpi1/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch similarity index 100% rename from configs/platform-rpi/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch rename to configs/platform-rpi1/patches/barebox-2020.08.1/0001-mci-bcm283x-depend-on-sdhci.patch diff --git a/configs/platform-rpi/patches/barebox-2020.08.1/series b/configs/platform-rpi1/patches/barebox-2020.08.1/series similarity index 100% rename from configs/platform-rpi/patches/barebox-2020.08.1/series rename to configs/platform-rpi1/patches/barebox-2020.08.1/series diff --git a/configs/platform-rpi/platformconfig b/configs/platform-rpi1/platformconfig similarity index 99% rename from configs/platform-rpi/platformconfig rename to configs/platform-rpi1/platformconfig index bfd8e42d2ebf..fabf440a5a58 100644 --- a/configs/platform-rpi/platformconfig +++ b/configs/platform-rpi1/platformconfig @@ -15,7 +15,7 @@ PTXCONF__platformconfig_MAGIC__=y # # ------------------------------------ # -PTXCONF_PLATFORM="rpi" +PTXCONF_PLATFORM="rpi1" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y diff --git a/configs/platform-rpi/platforms/image-boot-vfat.in b/configs/platform-rpi1/platforms/image-boot-vfat.in similarity index 100% rename from configs/platform-rpi/platforms/image-boot-vfat.in rename to configs/platform-rpi1/platforms/image-boot-vfat.in diff --git a/configs/platform-rpi/rules/image-boot-vfat.make b/configs/platform-rpi1/rules/image-boot-vfat.make similarity index 100% rename from configs/platform-rpi/rules/image-boot-vfat.make rename to configs/platform-rpi1/rules/image-boot-vfat.make diff --git a/doc/hardware.rst b/doc/hardware.rst index 505e6d424081..0e885db35e18 100644 --- a/doc/hardware.rst +++ b/doc/hardware.rst @@ -132,30 +132,30 @@ Currently, DistroKit supports the following hardware: hardware_v8a_rock3a -rpi Platform ------------- +rpi1 Platform +------------- -+-------------------------+-----------------------------------------+ -| platformconfig: | ``configs/platform-rpi/platformconfig`` | -+-------------------------+-----------------------------------------+ -| Toolchain architecture: | ``arm-1136jfs-linux-gnueabihf`` | -+-------------------------+-----------------------------------------+ ++-------------------------+------------------------------------------+ +| platformconfig: | ``configs/platform-rpi1/platformconfig`` | ++-------------------------+------------------------------------------+ +| Toolchain architecture: | ``arm-1136jfs-linux-gnueabihf`` | ++-------------------------+------------------------------------------+ .. note:: - The rpi platform is currently not actively maintained, + The rpi1 platform is currently not actively maintained, as RPi 1 has been superseded by newer models which are supported in the v7a platform. However, if you are targeting a RPi 1, we will be happy to merge your patches anyways. -The rpi platform has support for the Raspberry Pi 1 and Raspberry Pi Zero W, +The rpi1 platform has support for the Raspberry Pi 1 and Raspberry Pi Zero W, which is based on the Broadcom BCM2835 SoC (ARMv6): .. toctree:: :maxdepth: 1 - hardware_rpi_raspi1 + hardware_rpi1_raspi1 mips Platform diff --git a/doc/hardware_rpi_raspi1.rst b/doc/hardware_rpi1_raspi1.rst similarity index 76% rename from doc/hardware_rpi_raspi1.rst rename to doc/hardware_rpi1_raspi1.rst index 4a90fdcf7218..19825d98dba7 100644 --- a/doc/hardware_rpi_raspi1.rst +++ b/doc/hardware_rpi1_raspi1.rst @@ -3,7 +3,7 @@ Raspberry Pi 1 and Zero W Boot Media ---------- -Use the image ``platform-rpi/images/hd.img`` and write it onto your SD Card. +Use the image ``platform-rpi1/images/hd.img`` and write it onto your SD Card. Serial Console -------------- -- 2.30.2