From 3d7785f25d4edd53b447a55d0c23f28159bb37ec Mon Sep 17 00:00:00 2001 From: Johny Mattsson Date: Mon, 2 Oct 2017 13:10:38 +1100 Subject: [PATCH] Updated boards to explicitly state bootfs type. To match change in libdevuansdk. --- boards/beaglebone-black.sh | 4 +++- boards/chromebook-acer.sh | 5 +++-- boards/chromebook-veyron.sh | 5 +++-- boards/nokia-n900.sh | 3 ++- boards/odroid-xu.sh | 3 ++- boards/odroid-xu4.sh | 3 ++- boards/ouya.sh | 3 ++- boards/raspberry-pi1.sh | 3 ++- boards/raspberry-pi2.sh | 3 ++- boards/raspberry-pi3.sh | 3 ++- boards/sunxi.sh | 3 ++- 11 files changed, 25 insertions(+), 13 deletions(-) diff --git a/boards/beaglebone-black.sh b/boards/beaglebone-black.sh index 819f250..bb9738a 100644 --- a/boards/beaglebone-black.sh +++ b/boards/beaglebone-black.sh @@ -20,7 +20,8 @@ ## kernel build script for BeagleBone Black boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size inittab) +vars+=(parted_type parted_boot parted_root bootable_part bootfs) vars+=(gitkernel gitbranch) arrs+=(custmodules) @@ -33,6 +34,7 @@ parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" bootable_part="1" +bootfs="vfat" extra_packages+=() custmodules=() diff --git a/boards/chromebook-acer.sh b/boards/chromebook-acer.sh index 1be4b04..d540410 100644 --- a/boards/chromebook-acer.sh +++ b/boards/chromebook-acer.sh @@ -20,10 +20,10 @@ ## kernel build script for Acer Chromebook boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type) vars+=(gitkernel gitbranch) arrs+=(custmodules) -arrs+=(gpt_root gpt_boot) +arrs+=(gpt_root gpt_boot bootfs) device_name="chromeacer" arch="armhf" @@ -33,6 +33,7 @@ size=1730 parted_type="gpt" gpt_boot=(8192 32768) gpt_root=(40960) +bootfs="none" extra_packages+=(abootimg cgpt u-boot-tools) extra_packages+=(vboot-utils vboot-kernel-utils) diff --git a/boards/chromebook-veyron.sh b/boards/chromebook-veyron.sh index ff63c4b..b4a468d 100644 --- a/boards/chromebook-veyron.sh +++ b/boards/chromebook-veyron.sh @@ -20,10 +20,10 @@ ## kernel build script for Acer Chromebook boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type) vars+=(gitkernel gitbranch) arrs+=(custmodules) -arrs+=(gpt_root gpt_boot) +arrs+=(gpt_root gpt_boot bootfs) device_name="chromeveyron" arch="armhf" @@ -33,6 +33,7 @@ size=1730 parted_type="gpt" gpt_boot=(8192 32768) gpt_root=(40960) +bootfs="none" extra_packages+=(abootimg cgpt u-boot-tools) extra_packages+=(vboot-utils vboot-kernel-utils) diff --git a/boards/nokia-n900.sh b/boards/nokia-n900.sh index f1399d1..fe051ce 100644 --- a/boards/nokia-n900.sh +++ b/boards/nokia-n900.sh @@ -20,7 +20,7 @@ ## kernel build script for Nokia N900 ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch) arrs+=(custmodules) @@ -32,6 +32,7 @@ size=666 parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" +bootfs="vfat" extra_packages+=(firmware-ti-connectivity) custmodules=() diff --git a/boards/odroid-xu.sh b/boards/odroid-xu.sh index 4fed79e..0d54055 100644 --- a/boards/odroid-xu.sh +++ b/boards/odroid-xu.sh @@ -20,7 +20,7 @@ ## kernel build script for ODROID XU boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch hosttuple) arrs+=(custmodules extra_packages) @@ -36,6 +36,7 @@ hosttuple=${compiler:0:-1} parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" +bootfs="vfat" extra_packages+=() custmodules=() diff --git a/boards/odroid-xu4.sh b/boards/odroid-xu4.sh index e8246f5..58d09b4 100644 --- a/boards/odroid-xu4.sh +++ b/boards/odroid-xu4.sh @@ -21,7 +21,7 @@ ## https://lastlog.de/blog/posts/odroid_xu4_with_nixos.html ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch hosttuple) arrs+=(custmodules extra_packages) @@ -33,6 +33,7 @@ inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100") parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" +bootfs="vfat" extra_packages+=() custmodules=() diff --git a/boards/ouya.sh b/boards/ouya.sh index 126abce..7d03052 100644 --- a/boards/ouya.sh +++ b/boards/ouya.sh @@ -21,7 +21,7 @@ ## NOTE: see 'doc/quirks.md' for more info on this device ## settings & config -vars+=(device_name arch size parted_boot parted_root inittab) +vars+=(device_name arch size parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch) arrs+=(custmodules) @@ -33,6 +33,7 @@ inittab=("T0:2345:respawn:/sbin/getty -L ttyS0 115200 linux") parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" +bootfs="vfat" extra_packages+=(libasound2 libglib2.0-0 libgstreamer-plugins-base0.10-0 libxv1) custmodules=() diff --git a/boards/raspberry-pi1.sh b/boards/raspberry-pi1.sh index 680089b..89a6e95 100644 --- a/boards/raspberry-pi1.sh +++ b/boards/raspberry-pi1.sh @@ -20,7 +20,7 @@ ## kernel build script for Raspberry Pi 1 boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch rpifirmware) arrs+=(custmodules) @@ -32,6 +32,7 @@ inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100") parted_type="dos" parted_boot="fat32 0 64" parted_root="ext4 64 -1" +bootfs="vfat" extra_packages+=() custmodules=(snd_bcm2835) diff --git a/boards/raspberry-pi2.sh b/boards/raspberry-pi2.sh index 5fd6a4d..aa510f4 100644 --- a/boards/raspberry-pi2.sh +++ b/boards/raspberry-pi2.sh @@ -20,7 +20,7 @@ ## kernel build script for Raspberry Pi 2/3 boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch rpifirmware) arrs+=(custmodules) @@ -32,6 +32,7 @@ inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100") parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" +bootfs="vfat" extra_packages+=() custmodules=(snd_bcm2835) diff --git a/boards/raspberry-pi3.sh b/boards/raspberry-pi3.sh index 135528d..48cbb3e 100644 --- a/boards/raspberry-pi3.sh +++ b/boards/raspberry-pi3.sh @@ -20,7 +20,7 @@ ## kernel build script for Raspberry Pi 3 boards ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch rpifirmware) arrs+=(custmodules) @@ -32,6 +32,7 @@ inittab=("T0:23:respawn:/sbin/agetty -L ttyAMA0 115200 vt100") parted_type="dos" parted_boot="fat32 0 64" parted_root="ext4 64 -1" +bootfs="vfat" extra_packages+=() custmodules=(snd_bcm2835) diff --git a/boards/sunxi.sh b/boards/sunxi.sh index e4aa00f..1391418 100644 --- a/boards/sunxi.sh +++ b/boards/sunxi.sh @@ -21,7 +21,7 @@ ## http://linux-sunxi.org ## settings & config -vars+=(device_name arch size parted_type parted_boot parted_root inittab) +vars+=(device_name arch size parted_type parted_boot parted_root bootfs inittab) vars+=(gitkernel gitbranch) arrs+=(custmodules) @@ -33,6 +33,7 @@ inittab=("T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100") parted_type="dos" parted_boot="fat32 2048s 264191s" parted_root="ext4 264192s 100%" +bootfs="vfat" extra_packages+=() custmodules=()