Merge pull request JetsonHacksNano#1 from JetsonHacksNano/vL4T32.2-dev

Update to L4T 32.2

Author: JetsonHacksNano

README.md

@@ -1,4 +1,70 @@
 # buildKernelAndModules
 Build the Linux Kernel and Modules on board the NVIDIA Jetson Nano Developer Kit
 
-Work in progress
+These scripts are for JetPack 4.2.1, L4T 32.2
+
+Scripts to help build the 4.9.140 kernel and modules onboard the Jetson Nano Developer Kit Previous versions may be available in releases.
+
+<em><strong>Note:</strong> The kernel source version must match the version of firmware flashed on the Jetson. For example, the source for the 4.9.140 kernel here is matched with L4T 32.2. This kernel compiled using this source tree may not work with newer versions or older versions of L4T</em>
+
+As of this writing, the "official" way to build the Jetson Nano kernel is to use a cross compiler on a Linux PC. This is an alternative which builds the kernel onboard the Jetson itself. These scripts will download the kernel source to the Jetson Nano, and then compile the kernel and selected modules. The newly compiled kernel can then be installed. We recommend a SD card size of 32GB, 64GB preferred.
+
+The scripts should be run directly after flashing the Jetson, or copying the SD card image from a host PC. There are several scripts:
+
+<strong>getKernelSources.sh</strong>
+
+Downloads the kernel sources for L4T from the NVIDIA website, decompresses them and opens a graphical editor on the .config file. Note that this also sets the .config file to the current system, and also sets the local version to the current local version, i.e., -tegra
+
+
+<strong>makeKernel.sh</strong>
+
+Compiles the kernel using make. The script commands make the kernel Image file. Installing the Image file on to the system is a separate step. Note that the make is limited to the Image and modules.
+
+The other parts of the kernel build, such as building the device tree, require that the result be 'signed' and flashed from the the NVIDIA tools on a host PC.
+
+<strong>makeKernel.sh</strong>
+
+Compiles the modules using make and then installs them.
+
+<strong>copyImage.sh</strong>
+
+Copies the Image file created by compiling the kernel to the /boot directory. Note that while developing you will want to be more conservative than this: You will probably want to copy the new kernel Image to a different name in the boot directory, and modify /boot/extlinux/extlinux.conf to have entry points at the old image, or the new image. This way, if things go sideways you can still boot the machine using the serial console.
+
+You will want to make a copy of the original Image before the copy, something like:
+
+$ cp /boot/Image $INSTALL_DIR/Image.orig<br>
+$ ./copyImage.sh<br>
+$ echo "New Image created and placed in /boot"<br>
+
+
+<strong>editConfig.sh</strong>
+Edit the .config file located in /usr/src/kernel/kernel-4.9 This file must be present (from the getKernelSources.sh script) before launching the file. Note that if you change the local version, you will need to make both the kernel and modules and install them.
+
+<strong>removeAllKernelSources.sh</strong>
+Removes all of the kernel sources and compressed source files. You may want to make a backup of the files before deletion.
+
+<h2>Notes:</h2> 
+<h3>Make sure to update the micro SD card</h3>
+
+The copyImage.sh script copies the Image to the current device. If you are building the kernel on an external device, for example a USB drive, you will probably want to copy the Image file over to the micro SD card in the micro SD's /boot directory. 
+Special thanks to Raffaello Bonghi (https://github.com/rbonghi) for jetson_easy scripts.
+Special thanks to Shreeyak (https://github.com/Shreeyak) for discussing alternatives to get source directly from NVIDIA git repositories.
+Special thanks to Dustin Franklin (https://github.com/dusty-nv/) for how to correctly determine the correct L4T version. (https://github.com/dusty-nv/jetson-inference/blob/7e81381a96c1ac5f57f1728afbfdec7f1bfeffc2/tools/install-pytorch.sh#L296) 
+
+Sometimes it is useful to log the builds:
+
+$ command 2>&1 | tee log.txt
+
+so you can go back and catch errors.
+
+<h4>Intended Use</h4>
+The intended use of this repository is to help automate building known configurations of the kernel and build modules. You should use the kernel-4.9/scripts/config script to set the kernel configuration that you desire. See the 'rootOnUSB' repository on the JetsonHacksNano Github account for an example.
+
+### Release Notes
+July, 2019
+* vL4T32.2
+* L4T 32.2 (JetPack 4.2.1)
+* Initial Release 
+
+
+command 2>&1 | tee log.txt

getKernelSources.sh

@@ -3,31 +3,49 @@
 # Copyright (c) 2016-19 Jetsonhacks 
 # MIT License
 
-JETSON_MODEL="jetson-nano"
-L4T_TARGET="32.1.0"
+JETSON_MODEL="NVIDIA Jetson Nano Developer Kit"
+L4T_TARGET="32.2"
 SOURCE_TARGET="/usr/src"
 KERNEL_RELEASE="4.9"
 
 # < is more efficient than cat command
 # NULL byte at end of board description gets bash upset; strip it out
 JETSON_BOARD=$(tr -d '\0' </proc/device-tree/model)
+echo "Jetson Model: "$JETSON_BOARD
 
 JETSON_L4T=""
-if [ -f /etc/nv_tegra_release ]; then
-    # L4T string
-    JETSON_L4T_STRING=$(head -n 1 /etc/nv_tegra_release)
-
-    # Load release and revision
-    JETSON_L4T_RELEASE=$(echo $JETSON_L4T_STRING | cut -f 1 -d ',' | sed 's/\# R//g' | cut -d ' ' -f1)
-    JETSON_L4T_REVISION=$(echo $JETSON_L4T_STRING | cut -f 2 -d ',' | sed 's/\ REVISION: //g' )
-    # unset variable
-    unset JETSON_L4T_STRING
-    
-    # Write Jetson description
-    JETSON_L4T="$JETSON_L4T_RELEASE.$JETSON_L4T_REVISION"
-fi
-echo "Jetson Model: "$JETSON_BOARD
-echo "Jetson L4T: "$JETSON_L4T
+
+# Starting with L4T 32.2, the recommended way to find the L4T Release Number
+# is to use dpkg
+function check_L4T_version()
+{   
+        if [ -f /etc/nv_tegra_release ]; then
+		JETSON_L4T_STRING=$(head -n 1 /etc/nv_tegra_release)
+		JETSON_L4T_RELEASE=$(echo $JETSON_L4T_STRING | cut -f 2 -d ' ' | grep -Po '(?<=R)[^;]+')
+		JETSON_L4T_REVISION=$(echo $JETSON_L4T_STRING | cut -f 2 -d ',' | grep -Po '(?<=REVISION: )[^;]+')
+
+	else
+		echo "$LOG Reading L4T version from \"dpkg-query --show nvidia-l4t-core\""
+
+		JETSON_L4T_STRING=$(dpkg-query --showformat='${Version}' --show nvidia-l4t-core)
+		local JETSON_L4T_ARRAY=(${JETSON_L4T_STRING//./ })	
+
+		#echo ${JETSON_L4T_ARRAY[@]}
+		#echo ${#JETSON_L4T_ARRAY[@]}
+
+		JETSON_L4T_RELEASE=${JETSON_L4T_ARRAY[0]}
+		JETSON_L4T_REVISION=${JETSON_L4T_ARRAY[1]}
+	fi
+
+	JETSON_L4T_VERSION="$JETSON_L4T_RELEASE.$JETSON_L4T_REVISION"
+	echo "$LOG Jetson BSP Version:  L4T R$JETSON_L4T_VERSION"
+
+}
+
+echo "Getting L4T Version"
+check_L4T_version
+JETSON_L4T="$JETSON_L4T_VERSION"
+echo "Jetson_L4T="$JETSON_L4T
 
 function usage
 {

removeAllKernelSources.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Remove all of the kernel sources that were downloaded and built during the kernel build process
+# Note that this will also remove the possibly changed .config file in:
+# /usr/src/kernel/kernel-4.9
+echo "Removing All Kernel Sources"
+sudo ./scripts/removeAllKernelSources.sh
+echo "Kernel sources removed"
+

sample-extlinux.conf

@@ -0,0 +1,16 @@
+TIMEOUT 30
+DEFAULT primary
+
+MENU TITLE p3450-porg eMMC boot options
+
+LABEL primary
+      MENU LABEL primary kernel
+      LINUX /boot/Image
+      INITRD /boot/initrd
+      APPEND ${cbootargs} rootfstype=ext4 root=/dev/sda1 rw rootwait
+
+LABEL emmc
+      MENU LABEL primary kernel
+      LINUX /boot/Image
+      INITRD /boot/initrd
+      APPEND ${cbootargs} rootfstype=ext4 root=/dev/mmcblk0p1 rw rootwait

scripts/copyImage.sh

@@ -4,16 +4,16 @@ echo "Source Target: ""$SOURCE_TARGET"kernel/kernel-$KERNEL_RELEASE/arch/arm64/b
 echo "Boot Path: ""$BOOT_TARGET"Image
 
 cd "$SOURCE_TARGET"kernel/kernel-$KERNEL_RELEASE
-# On the stock Jetson TX2 install, there is no zImage in the boot directory
+# On the stock Jetson Nano install, there is no zImage in the boot directory
 # So we just copy the Image file over
 # If the zImage is needed, you must either
 # $ make zImage
 # or
 # $ make
-# Both of these commands must be executed in /usr/src/kernel/kernel-4.4
+# Both of these commands must be executed in /usr/src/kernel/kernel-4.9
 # sudo cp arch/arm64/boot/zImage /boot/zImage
-# Note that if you are compiling on an external device, like a SSD, you should probably
-# copy this over to the internal eMMC if that is where the Jetson boots
+# Note that if you are compiling on an external device, like a SSD, you should
+# copy this over to the boot device (i.e SD Card) where the Jetson boots
 sudo cp arch/arm64/boot/Image "$BOOT_TARGET"Image
 
 

scripts/getKernelSources.sh

@@ -4,7 +4,7 @@ apt-add-repository universe
 apt-get update
 apt-get install pkg-config -y
 # We use 'make menuconfig' to edit the .config file; install dependencies
-apt-get install libncurses5-dev
+apt-get install libncurses5-dev -y
 echo "Installing kernel sources in: ""$SOURCE_TARGET"
 if [ ! -d "$SOURCE_TARGET" ]; then
    # Target directory does not exist; create
@@ -15,9 +15,9 @@ fi
 cd "$SOURCE_TARGET"
 echo "$PWD"
 
-wget -N https://developer.nvidia.com/embedded/dlc/l4t-sources-32-1-jetson-nano
+wget -N https://developer.download.nvidia.com/embedded/L4T/r32-2_Release_v1.0/Nano-TX1/public_sources.tbz2
 # l4t-sources is a tbz2 file
-tar -xvf l4t-sources-32-1-jetson-nano public_sources/kernel_src.tbz2
+tar -xvf public_sources.tbz2 public_sources/kernel_src.tbz2
 tar -xvf public_sources/kernel_src.tbz2
 # Space is tight; get rid of the compressed kernel source
 rm -r public_sources
@@ -28,7 +28,7 @@ zcat /proc/config.gz > .config
 cp .config config.orig
 # Default to the current local version
 KERNEL_VERSION=$(uname -r)
-# For L4T 32.1.0 the kernel is 4.9.140-tegra ; 
+# For L4T 32.2 the kernel is 4.9.140-tegra ; 
 # Everything after '4.9.140' is the local version
 # This removes the suffix
 LOCAL_VERSION=${KERNEL_VERSION#$"4.9.140"}

scripts/makeKernel.sh

@@ -8,7 +8,7 @@ echo "Source Target: "$SOURCE_TARGET
 MAKE_DIRECTORY="$SOURCE_TARGET"kernel/kernel-4.9
 
 cd "$SOURCE_TARGET"kernel/kernel-4.9
-make prepare
+# make prepare
 # Get the number of CPUs 
 NUM_CPU=$(nproc)
 

scripts/makeModules.sh

@@ -8,7 +8,6 @@ echo "Source Target: "$SOURCE_TARGET
 MAKE_DIRECTORY="$SOURCE_TARGET"kernel/kernel-4.9
 
 cd "$SOURCE_TARGET"kernel/kernel-4.9
-make modules_prepare
 # Get the number of CPUs 
 NUM_CPU=$(nproc)
 

scripts/removeAllKernelSources.sh

@@ -3,5 +3,5 @@
 cd /usr/src
 rm -r kernel
 rm -r hardware
-rm l4t-sources-32-1-jetson-nano
+rm public_sources.tbz2