From patchwork Sat Jun 13 18:32:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suniel Mahesh X-Patchwork-Id: 1308739 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=BqubcC5v; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49kmZd4MmWz9sR4 for ; Sun, 14 Jun 2020 04:38:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BD6D987A1A; Sat, 13 Jun 2020 18:38:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rG2MamMNARNU; Sat, 13 Jun 2020 18:38:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B37BB87A58; Sat, 13 Jun 2020 18:38:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id CEEAF1BF2FC for ; Sat, 13 Jun 2020 18:38:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BBDA1204ED for ; Sat, 13 Jun 2020 18:38:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eDZc0APFK7mE for ; Sat, 13 Jun 2020 18:38:39 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by silver.osuosl.org (Postfix) with ESMTPS id 199E6203F3 for ; Sat, 13 Jun 2020 18:38:39 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id e18so5691490pgn.7 for ; Sat, 13 Jun 2020 11:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=swbtygIXyfmfa+UYV7dpl5ArsmW0uCvDEvWB5vQmSxk=; b=BqubcC5vujED3sFYyFKcG/Pk5vNHD14FglXd1j6sgqE+aqNFx9xACU0GCIgw0nNcfm 3fB+yTyP11EMO6VKZsrYyGhKyXnQytoKXTzs4FYOsf7mBiFmaupXVNn2V4J9mpNCamFX RUYBaCs9xDE2Fy1fEgsDuUKBOQApAiegDBjdU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=swbtygIXyfmfa+UYV7dpl5ArsmW0uCvDEvWB5vQmSxk=; b=nEEGrdQo+PtEuGMIZBY3jY5e9TThEYcBqQDrM7FymbGeoZWqxHfYYlkwDVetlMGjWU hUIo1aamqAc9K7dpQ370S+Ei8Rtmz3LDh/mW1XDjIoQouT2MT93mM161CJ1xsP9XmbsU vzQ+csYCr4apbtHlDtGuqCUv+C9CJSNzcXLxZjaFG9Y24U+n+Um+3evrHCFtC4GqZKup aic3c6FjSaYfQleGlHPjLt151eR90aXz//sbDoWtqp0G713xL/d6ceTf50u5LEO1hKJP 7uHJXVFT/5nc2eNwCYqktJ1XKC6W/OrLzCvLa2nLyoKzllEDrlnXzXTIuGKVAI6HFz4G mzyg== X-Gm-Message-State: AOAM530SQLMkNznrwNDdRo61LyYYH1RrWXeNVCUSHcyFUoLtwjYmp7bM S5VtEwKxFXmq4sXVgk83TNDyfrBU5VzCpg== X-Google-Smtp-Source: ABdhPJzWvWEkpkiHtxhNQMSjygXA/UM05XsO1PqDgzslKEFmoUYOy12gejbJSzTWOR3/7W4DY+1VdA== X-Received: by 2002:a17:902:c411:: with SMTP id k17mr15127834plk.165.1592073179201; Sat, 13 Jun 2020 11:32:59 -0700 (PDT) Received: from localhost.localdomain ([42.111.144.111]) by smtp.gmail.com with ESMTPSA id 191sm9556217pfy.161.2020.06.13.11.32.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 11:32:58 -0700 (PDT) From: sunil@amarulasolutions.com To: buildroot@buildroot.org, thomas.petazzoni@bootlin.com Date: Sun, 14 Jun 2020 00:02:33 +0530 Message-Id: <1592073154-13731-4-git-send-email-sunil@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592073154-13731-1-git-send-email-sunil@amarulasolutions.com> References: <1592073154-13731-1-git-send-email-sunil@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/4] configs/nanopi_m4: new defconfig X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter@korsgaard.com, jagan@amarulasolutions.com, Suniel Mahesh Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Suniel Mahesh A defconfig for the friendlyarm nanopi-m4 was added in 493c3979a4def978a1137cf8543bf0de50d2615e, but then removed in a24bd8936f57a590f810e14d7828cf1bddce580e because an ARM32 compiler was needed to build ATF, and this was not supported back then. Now, since package/arm-gnu-a-toolchain/ has been added, this defconfig can be re-introduced. Following new changes are introduced in comparision with the older changeset: - readme updated - GPT partition layout - update defconfig to build ATF - bump u-boot to 2020.04 - bump linux to 5.4.46 Signed-off-by: Suniel Mahesh Reviewed-by: Jagan Teki --- NOTE: - new patch --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 ++ board/friendlyarm/nanopi-m4/extlinux.conf | 4 +++ board/friendlyarm/nanopi-m4/genimage.cfg | 39 +++++++++++++++++++++ board/friendlyarm/nanopi-m4/post-build.sh | 5 +++ board/friendlyarm/nanopi-m4/readme.txt | 45 +++++++++++++++++++++++++ configs/nanopi_m4_defconfig | 56 +++++++++++++++++++++++++++++++ 7 files changed, 152 insertions(+) create mode 100644 board/friendlyarm/nanopi-m4/extlinux.conf create mode 100644 board/friendlyarm/nanopi-m4/genimage.cfg create mode 100755 board/friendlyarm/nanopi-m4/post-build.sh create mode 100644 board/friendlyarm/nanopi-m4/readme.txt create mode 100644 configs/nanopi_m4_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66c7b72..4ff0b4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -227,6 +227,7 @@ mx6sx_udoo_neo_defconfig: { extends: .defconfig } mx6udoo_defconfig: { extends: .defconfig } nanopi_m1_defconfig: { extends: .defconfig } nanopi_m1_plus_defconfig: { extends: .defconfig } +nanopi_m4_defconfig: { extends: .defconfig } nanopi_neo4_defconfig: { extends: .defconfig } nanopi_neo_defconfig: { extends: .defconfig } nanopi_r1_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 6b7421a..220bb34 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2392,8 +2392,10 @@ F: package/powertop/ N: Suniel Mahesh F: board/firefly/ +F: board/friendlyarm/nanopi-m4 F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 +F: configs/nanopi_m4_defconfig F: configs/orangepi_rk3399_defconfig F: configs/roc_pc_rk3399_defconfig F: configs/rockpro64_defconfig diff --git a/board/friendlyarm/nanopi-m4/extlinux.conf b/board/friendlyarm/nanopi-m4/extlinux.conf new file mode 100644 index 0000000..fb24f09 --- /dev/null +++ b/board/friendlyarm/nanopi-m4/extlinux.conf @@ -0,0 +1,4 @@ +label RK3399_NANOPI_M4 linux + kernel /Image + devicetree /rk3399-nanopi-m4.dtb + append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg new file mode 100644 index 0000000..8a2e981 --- /dev/null +++ b/board/friendlyarm/nanopi-m4/genimage.cfg @@ -0,0 +1,39 @@ +image boot.vfat { + vfat { + files = { + "Image", + "rk3399-nanopi-m4.dtb", + "extlinux" + } + } + size = 112M +} + +image sdcard.img { + + hdimage { + gpt = true + } + + partition loader1 { + image = "idbloader.img" + offset = 32K + } + + partition loader2 { + image = "u-boot.itb" + offset = 8M + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + offset = 16M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/friendlyarm/nanopi-m4/post-build.sh b/board/friendlyarm/nanopi-m4/post-build.sh new file mode 100755 index 0000000..ba29375 --- /dev/null +++ b/board/friendlyarm/nanopi-m4/post-build.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +BOARD_DIR="$(dirname $0)" + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-m4/readme.txt b/board/friendlyarm/nanopi-m4/readme.txt new file mode 100644 index 0000000..4a606cf --- /dev/null +++ b/board/friendlyarm/nanopi-m4/readme.txt @@ -0,0 +1,45 @@ +FriendlyARM NANOPI-M4 +===================== + +Build: + + $ make nanopi_m4_defconfig + $ make + +Files created in output directory +================================= + +output/images + +├── bl31.elf +├── boot.vfat +├── extlinux +├── idbloader.img +├── Image +├── rk3399-nanopi-m4.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── u-boot.bin +└── u-boot.itb + +Creating bootable SD card: +========================== + +Simply invoke (as root) + +sudo dd if=output/images/sdcard.img of=/dev/sdX && sync + +Where X is your SD card device + +Serial console +-------------- + +Baudrate for this board is 1500000 + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html diff --git a/configs/nanopi_m4_defconfig b/configs/nanopi_m4_defconfig new file mode 100644 index 0000000..c824b15 --- /dev/null +++ b/configs/nanopi_m4_defconfig @@ -0,0 +1,56 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72_a53=y + +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y + +# Firmware +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-m4-rk3399" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="idbloader.img" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.46" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-m4" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_GENERIC_HOSTNAME="nanopi-m4" +BR2_TARGET_GENERIC_ISSUE="Welcome to NANOPI-M4" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="96M" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m4/genimage.cfg" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m4/post-build.sh"