free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

This commit is contained in:
Bob Mottram 2016-06-28 17:26:02 +01:00
parent 33e6f2c2be
commit 6cf270250f
No known key found for this signature in database
GPG Key ID: BA68F26108DC9F87
1 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/freedombone-image-hardware-setup
View File

@ -93,17 +93,17 @@ beaglebone_flash() {
} }
beaglebone_repack_kernel() { beaglebone_repack_kernel() {
# process installed kernel to create uImage, uInitrd, dtb # process installed kernel to create uImage, uInitrd, dtb
# using flash-kernel would be a good approach, except it fails in the # using flash-kernel would be a good approach, except it fails in the
# cross build environment due to too many environment checks... # cross build environment due to too many environment checks...
#FK_MACHINE="TI AM335x BeagleBone" flash-kernel #FK_MACHINE="TI AM335x BeagleBone" flash-kernel
# so, let's do it manually... # so, let's do it manually...
# flash-kernel's hook-functions provided to mkinitramfs have the # flash-kernel's hook-functions provided to mkinitramfs have the
# unfortunate side-effect of creating /conf/param.conf in the initrd # unfortunate side-effect of creating /conf/param.conf in the initrd
# when run from our emulated chroot environment, which means our root= # when run from our emulated chroot environment, which means our root=
# on the kernel command line is completely ignored! repack the initrd # on the kernel command line is completely ignored! repack the initrd
# to remove this evil... # to remove this evil...
echo "info: repacking beaglebone kernel and initrd" echo "info: repacking beaglebone kernel and initrd"
@ -115,22 +115,22 @@ beaglebone_repack_kernel() {
mkdir /tmp/initrd-repack mkdir /tmp/initrd-repack
(cd /tmp/initrd-repack ; \ (cd /tmp/initrd-repack ; \
zcat /boot/$initRd | cpio -i ; \ zcat /boot/$initRd | cpio -i ; \
rm -f conf/param.conf ; \ rm -f conf/param.conf ; \
find . | cpio --quiet -o -H newc | \ find . | cpio --quiet -o -H newc | \
gzip -9 > /boot/$initRd ) gzip -9 > /boot/$initRd )
rm -rf /tmp/initrd-repack rm -rf /tmp/initrd-repack
(cd /boot ; \ (cd /boot ; \
cp /usr/lib/$kernelVersion/am335x-boneblack.dtb dtb ; \ cp /usr/lib/$kernelVersion/am335x-boneblack.dtb dtb ; \
cat $vmlinuz dtb >> temp-kernel ; \ cat $vmlinuz dtb >> temp-kernel ; \
mkimage -A arm -O linux -T kernel -n "Debian kernel ${version}" \ mkimage -A arm -O linux -T kernel -n "Debian kernel ${version}" \
-C none -a 0x80200000 -e 0x80200000 -d temp-kernel uImage ; \ -C none -a 0x80200000 -e 0x80200000 -d temp-kernel uImage ; \
rm -f temp-kernel ; \ rm -f temp-kernel ; \
mkimage -A arm -O linux -T ramdisk -C gzip -a 0x81000000 -e 0x81000000 \ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x81000000 -e 0x81000000 \
-n "Debian ramdisk ${version}" \ -n "Debian ramdisk ${version}" \
-d $initRd uInitrd ) -d $initRd uInitrd )
} }
odroidc2_setup_boot() { odroidc2_setup_boot() {
@ -187,9 +187,9 @@ a20_setup_boot() {
# Setup boot.cmd # Setup boot.cmd
if grep -q btrfs /etc/fstab ; then if grep -q btrfs /etc/fstab ; then
fstype=btrfs fstype=btrfs
else else
fstype=ext4 fstype=ext4
fi fi
kernelVersion=$(ls /usr/lib/*/$dtb | head -1 | cut -d/ -f4) kernelVersion=$(ls /usr/lib/*/$dtb | head -1 | cut -d/ -f4)
version=$(echo $kernelVersion | sed 's/linux-image-\(.*\)/\1/') version=$(echo $kernelVersion | sed 's/linux-image-\(.*\)/\1/')
@ -241,33 +241,33 @@ EOF
case "$MACHINE" in case "$MACHINE" in
beaglebone) beaglebone)
beaglebone_setup_boot beaglebone_setup_boot
beaglebone_flash beaglebone_flash
beaglebone_repack_kernel beaglebone_repack_kernel
enable_serial_console ttyO0 enable_serial_console ttyO0
;; ;;
odroid-c2) odroid-c2)
odroidc2_setup_boot meson64_odroidc2 odroidc2_setup_boot meson64_odroidc2
enable_serial_console ttyO0 enable_serial_console ttyO0
;; ;;
cubietruck) cubietruck)
a20_setup_boot sun7i-a20-cubietruck.dtb a20_setup_boot sun7i-a20-cubietruck.dtb
enable_serial_console ttyS0 enable_serial_console ttyS0
;; ;;
a20-olinuxino-lime) a20-olinuxino-lime)
a20_setup_boot sun7i-a20-olinuxino-lime.dtb a20_setup_boot sun7i-a20-olinuxino-lime.dtb
enable_serial_console ttyS0 enable_serial_console ttyS0
;; ;;
a20-olinuxino-lime2) a20-olinuxino-lime2)
a20_setup_boot sun7i-a20-olinuxino-lime2.dtb a20_setup_boot sun7i-a20-olinuxino-lime2.dtb
enable_serial_console ttyS0 enable_serial_console ttyS0
;; ;;
a20-olinuxino-micro) a20-olinuxino-micro)
a20_setup_boot sun7i-a20-olinuxino-micro.dtb a20_setup_boot sun7i-a20-olinuxino-micro.dtb
enable_serial_console ttyS0 enable_serial_console ttyS0
;; ;;
cubieboard2) cubieboard2)
a20_setup_boot sun7i-a20-cubieboard2.dtb a20_setup_boot sun7i-a20-cubieboard2.dtb
enable_serial_console ttyS0 enable_serial_console ttyS0
;; ;;
esac esac