Rename build/linux-4.4 to build/kernel-4.4

TX2 sound kernel modules have kernel-4.4 somehow hardcoded and the compiled
object files are always put there. To make the directory structure less
confusing, let's put everything to kernel-4.4.

diff --git a/build/Makefile b/build/Makefile
index ad12f99d130801fb0ba305f3ae50be2f76246cd3..6e6050b43a9efad4d53243d428340041c2218417 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,10 +1,10 @@
-all: buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
+all: buildroot/images/rootfs.cpio.uboot kernel-4.4/vmlinux
 
 NPROC:=$(shell nproc)
 
 # TX2 U-Boot does not support FIT images
-image.fit: buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
-       mkimage -f auto -d linux-4.4/arch/arm64/boot/Image -i buildroot/images/rootfs.cpio.uboot -b linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb image.fit
+image.fit: buildroot/images/rootfs.cpio.uboot kernel-4.4/vmlinux
+       mkimage -f auto -d kernel-4.4/arch/arm64/boot/Image -i buildroot/images/rootfs.cpio.uboot -b kernel-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb image.fit
 
 buildroot/images/rootfs.cpio.uboot: ./buildroot/.config
 buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/4.4.38+/modules.dep
@@ -24,7 +24,7 @@ jailhouse: ../jailhouse/hypervisor/jailhouse.bin
 JAILHOUSE_DESTDIR=$(CURDIR)/rootfs-overlay
 
 jailhouse-install: FORCE
-       $(MAKE) -C ../jailhouse -j$(NPROC) install KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 DESTDIR=$(abspath $(JAILHOUSE_DESTDIR)) prefix=/usr
+       $(MAKE) -C ../jailhouse -j$(NPROC) install KDIR=$(CURDIR)/kernel-4.4 ARCH=arm64 DESTDIR=$(abspath $(JAILHOUSE_DESTDIR)) prefix=/usr
        mkdir -p $(JAILHOUSE_DESTDIR)/jailhouse/configs/ $(JAILHOUSE_DESTDIR)/jailhouse/demos/
 #      cp ../jailhouse/inmates/demos/arm64/my-demo.bin rootfs-overlay/jailhouse/demos/
        cp ../jailhouse/configs/arm64/jetson-tx2.cell $(JAILHOUSE_DESTDIR)/jailhouse/configs/
@@ -43,9 +43,9 @@ jailhouse-install-remote: jailhouse-install
        rsync -rlptD rootfs-overlay/lib/modules/ $(INSTALL_HOST):/lib/modules
 
 ../jailhouse/hypervisor/jailhouse.bin: ../jailhouse/include/jailhouse/config.h
-../jailhouse/hypervisor/jailhouse.bin: linux-4.4/vmlinux
+../jailhouse/hypervisor/jailhouse.bin: kernel-4.4/vmlinux
 ../jailhouse/hypervisor/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd ../jailhouse && git ls-files))
-       $(MAKE) -C ../jailhouse -j$(NPROC) KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 prefix=/usr
+       $(MAKE) -C ../jailhouse -j$(NPROC) KDIR=$(CURDIR)/kernel-4.4 ARCH=arm64 prefix=/usr
 
 ../jailhouse/include/jailhouse/config.h: Makefile
        rm -f $@.tmp
@@ -54,10 +54,10 @@ jailhouse-install-remote: jailhouse-install
        echo '#define CONFIG_MACH_JETSON_TX2         1' >> $@.tmp
        mv --update $@.tmp $@
 
-rootfs-overlay/lib/modules/4.4.38+/modules.dep: linux-4.4/vmlinux
-       $(MAKE) -C linux-4.4 -j$(NPROC)  modules_install INSTALL_MOD_PATH=$(CURDIR)/rootfs-overlay
+rootfs-overlay/lib/modules/4.4.38+/modules.dep: kernel-4.4/vmlinux
+       $(MAKE) -C kernel-4.4 -j$(NPROC)  modules_install INSTALL_MOD_PATH=$(CURDIR)/rootfs-overlay
 
-linux-4.4/vmlinux:
+kernel-4.4/vmlinux:
        $(MAKE) -C $(@D) -j$(NPROC)
 
 .PHONY: FORCE
@@ -66,10 +66,10 @@ linux-4.4/vmlinux:
        $(MAKE) -C ../test
 
 clean:
-       rm -rf buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux buildroot/target `find buildroot/ -name .stamp_target_installed` jailhouse-install
+       rm -rf buildroot/images/rootfs.cpio.uboot kernel-4.4/vmlinux buildroot/target `find buildroot/ -name .stamp_target_installed` jailhouse-install
 
 deploy: ../test/prem-test
 #deploy: ../jailhouse/hypervisor/jailhouse.bin
        scp ../test/prem-test tx2:/bin
 #      scp ../jailhouse/hypervisor/jailhouse.bin tx2:/lib/firmware
-#      ssh tx2 'sh /etc/init.d/S20jailhouse.sh stop && sh /etc/init.d/S20jailhouse.sh start'
+       ssh tx2 'sh /etc/init.d/S20jailhouse.sh stop && sh /etc/init.d/S20jailhouse.sh start'

diff --git a/build/boot-flashfs b/build/boot-flashfs
index f62844f6251c361cdb7723d642203f98bb2be795..14f4fec01aa03570c1aec8dd15497a4a4576b60a 100755 (executable)
--- a/build/boot-flashfs
+++ b/build/boot-flashfs
@@ -2,8 +2,8 @@
 
 # Boot localy built Linux kernel with root filesystem from the flash
 
-load linux-4.4/arch/arm64/boot/Image root=/dev/mmcblk0p1 rw rootwait console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1 root=/dev/mmcblk0p1 rw rootwait rootfstype=ext4
-#load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
+load kernel-4.4/arch/arm64/boot/Image root=/dev/mmcblk0p1 rw rootwait console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1 root=/dev/mmcblk0p1 rw rootwait rootfstype=ext4
+#load kernel-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 
 # Use FDT prepared by firmware at address fdt_addr
 UBOOT_CMD=booti ${kernel_addr_r} - ${fdt_addr}

diff --git a/build/boot-linux b/build/boot-linux
index 7dd28ab599388a42306de2b989b465bc20ca7cd5..a2f7db0b7f77955a97cb2a677510fa4e2298ee4c 100755 (executable)
--- a/build/boot-linux
+++ b/build/boot-linux
@@ -2,8 +2,8 @@
 
 # Boot localy built Linux kernel and initramfs
 
-load linux-4.4/arch/arm64/boot/Image mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1
-#load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
+load kernel-4.4/arch/arm64/boot/Image mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1
+#load kernel-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 load buildroot/images/rootfs.cpio.uboot
 
 # Use FDT prepared by firmware at address fdt_addr

diff --git a/build/boot-nfs b/build/boot-nfs
index 6b28efa627590976838b07832e266f167a65881e..78d3bce9f242905bbdce103dd4679193b0baabd0 100755 (executable)
--- a/build/boot-nfs
+++ b/build/boot-nfs
@@ -2,8 +2,8 @@
 
 # Boot localy built Linux kernel with root filesystem from the flash
 
-load linux-4.4/arch/arm64/boot/Image nfsrootdebug root=/dev/nfs nfsroot=10.35.95.3:/home/sojka/tx2/rootfs,tcp,vers=3 ip=dhcp rw rootwait mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1
-#load linux-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
+load kernel-4.4/arch/arm64/boot/Image nfsrootdebug root=/dev/nfs nfsroot=10.35.95.3:/home/sojka/tx2/rootfs,tcp,vers=3 ip=dhcp rw rootwait mem=7808M vmalloc=512M console=ttyS0,115200n8 OS=l4t fbcon=map:0 net.ifnames=0 memtype=0 video=tegrafb no_console_suspend=1 earlycon=uart8250,mmio32,0x03100000 nvdumper_reserved=0x2772e0000 gpt tegraid=18.1.2.0.0 tegra_keep_boot_clocks maxcpus=6 androidboot.serialno=0320418051135 bl_prof_dataptr=0x10000@0x277240000 sdhci_tegra.en_boot_part_access=1
+#load kernel-4.4/arch/arm64/boot/dts/tegra186-quill-p3310-1000-c03-00-base.dtb
 
 # Use FDT prepared by firmware at address fdt_addr
 UBOOT_CMD=booti ${kernel_addr_r} - ${fdt_addr}

diff --git a/build/linux-4.4/.config b/build/kernel-4.4/.config
similarity index 100%
rename from build/linux-4.4/.config
rename to build/kernel-4.4/.config

diff --git a/build/linux-4.4/.gitignore b/build/kernel-4.4/.gitignore
similarity index 100%
rename from build/linux-4.4/.gitignore
rename to build/kernel-4.4/.gitignore

diff --git a/build/linux-4.4/GNUmakefile b/build/kernel-4.4/GNUmakefile
similarity index 100%
rename from build/linux-4.4/GNUmakefile
rename to build/kernel-4.4/GNUmakefile