Skip to contentSkip to conversation

configs/nanopi_neo: update kernel to 5.3

PATCH New Viktar Palstsiuk 2 participants 2 messages Nov 22, 2019 – Nov 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/nanopi_neo: update kernel to 5.3

---
 board/friendlyarm/nanopi-neo/genimage.cfg  |  2 +-
 board/friendlyarm/nanopi-neo/post-build.sh | 12 -------
 board/friendlyarm/nanopi-neo/post-image.sh | 15 --------
 configs/nanopi_neo_defconfig               | 42 ++++++++++++----------
 4 files changed, 24 insertions(+), 47 deletions(-)
 delete mode 100755 board/friendlyarm/nanopi-neo/post-build.sh
 delete mode 100755 board/friendlyarm/nanopi-neo/post-image.sh
board/friendlyarm/nanopi-neo/genimage.cfg +1 -1
index ad43d31049..cd1892b699 100644
@@ -29,6 +29,6 @@ image sdcard.img {
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext4"
-		size = 32M
+		size = 64M
 	}
 }
board/friendlyarm/nanopi-neo/post-build.sh deleted +0 -12
deleted file mode 100755
index 9759efb568..0000000000
@@ -1,12 +0,0 @@
-#!/bin/sh
-# post-build.sh for Nanopi NEO, based on the Orange Pi PC
-# 2013, Carlo Caione <[email protected]>
-# 2016, "Yann E. MORIN" <[email protected]>
-
-BOARD_DIR="$( dirname "${0}" )"
-MKIMAGE="${HOST_DIR}/bin/mkimage"
-BOOT_CMD="${BOARD_DIR}/boot.cmd"
-BOOT_CMD_H="${BINARIES_DIR}/boot.scr"
-
-# U-Boot script
-"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}"
board/friendlyarm/nanopi-neo/post-image.sh deleted +0 -15
deleted file mode 100755
index 740386ef82..0000000000
@@ -1,15 +0,0 @@
-#!/bin/sh
-# post-image.sh for Nanopi NEO, based on the Orange Pi PC
-
-BOARD_DIR="$( dirname "${0}" )"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
configs/nanopi_neo_defconfig +23 -19

63 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 configs/nanopi_neo: update kernel to 5.3

Hello Viktar,

Thanks for your contribution! However, I have a number of comments, see below.

Quoted 1 line · On Fri, 22 Nov 2019 21:16:04 +0300 Viktar Palstsiuk…

The first comment is that this commit makes a number of changes that are not directly related to each other. Another comment is that the commit title doesn't reflect what the patch is doing (the commit title only mentions the Linux update to 5.3, but none of the other changes).

board/friendlyarm/nanopi-neo/genimage.cfg image sdcard.img { · line 32

Quoted 10 lines
board/friendlyarm/nanopi-neo/genimage.cfg +1 -1
index ad43d31049..cd1892b699 100644
@@ -29,6 +29,6 @@ image sdcard.img {
 	partition rootfs {
 		partition-type = 0x83
 		image = "rootfs.ext4"
-		size = 32M
+		size = 64M

This size field should be completely dropped, genimage can figure out the partition size from the filesystem image size.

This should be one separate patch.

Quoted 29 lines
board/friendlyarm/nanopi-neo/post-build.sh deleted +0 -12
deleted file mode 100755
index 9759efb568..0000000000
@@ -1,12 +0,0 @@
-#!/bin/sh
-# post-build.sh for Nanopi NEO, based on the Orange Pi PC
-# 2013, Carlo Caione <[email protected]>
-# 2016, "Yann E. MORIN" <[email protected]>
-
-BOARD_DIR="$( dirname "${0}" )"
-MKIMAGE="${HOST_DIR}/bin/mkimage"
-BOOT_CMD="${BOARD_DIR}/boot.cmd"
-BOOT_CMD_H="${BINARIES_DIR}/boot.scr"
-
-# U-Boot script
-"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}"
board/friendlyarm/nanopi-neo/post-image.sh deleted +0 -5
deleted file mode 100755
index 740386ef82..0000000000
@@ -1,15 +0,0 @@
-#!/bin/sh
-# post-image.sh for Nanopi NEO, based on the Orange Pi PC
-
-BOARD_DIR="$( dirname "${0}" )"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"

board/friendlyarm/nanopi-neo/post-image.sh line 15

Quoted 10 lines
board/friendlyarm/nanopi-neo/post-image.sh deleted +0 -10
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"

Dropping the post-image/post-build scripts is a good idea, but it should be another separate patch from bumping the versions of Linux/U-Boot.

board/friendlyarm/nanopi-neo/post-image.sh

Quoted 5 lines
board/friendlyarm/nanopi-neo/post-image.sh deleted +1 -2
+# Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="32M"
-BR2_TARGET_ROOTFS_EXT2_INODES=8192

Good that you drop this, can be part of the patch dropping the size in the genimage.cfg file as well.

board/friendlyarm/nanopi-neo/post-image.sh

Quoted 4 lines
board/friendlyarm/nanopi-neo/post-image.sh deleted +4 -0
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo/boot.cmd"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg"

Should be in the patch removing the post-build and post-image scripts.

board/friendlyarm/nanopi-neo/post-image.sh

Quoted 7 lines

# BR2_TARGET_ROOTFS_TAR is not set

board/friendlyarm/nanopi-neo/post-image.sh deleted +2 -1
+
+# Additional tools
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y

Same.

Could you rework your patch according to the comments above? Ultimately, we want 3 patches:

- One fixing the filesystem size usage
- One removing post-build/post-image script
- One doing the update of Linux/U-Boot versions

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com