Extended Raspi config, fixed flash.sh script

configs/raspi_defconfig

@@ -1,35 +1,24 @@
 BR2_arm=y
 BR2_arm1176jzf_s=y
-BR2_ARM_EABIHF=y
-
 BR2_DL_DIR="$(HOME)/.buildroot-dl"
 BR2_CCACHE=y
-
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="raspberrypi"
 BR2_TARGET_GENERIC_ISSUE="Welcome to the CamCorder"
 BR2_TARGET_GENERIC_ROOT_PASSWD="camcorder"
-
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
-
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
-
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-
+BR2_SYSTEM_DHCP="eth0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL)/board/raspi/post_image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="d33d0293e245badc4ca6ede3984d8bb8ea63cb1a"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_ZIMAGE=y
-
-# Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"
-
-BR2_PACKAGE_RPI_FIRMWARE=y
-# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
-
 BR2_PACKAGE_FFMPEG=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
-
+BR2_PACKAGE_RPI_FIRMWARE=y
+# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set

flash.sh

@@ -14,45 +14,52 @@ done
 echo Overwriting old partition table
 sudo dd if=/dev/zero of=$1 bs=1024 count=1024
 
-echo Recreating new partition table
-sudo fdisk $1 << EOF
-n
-p
-1
-
-+16MB
-t
-53
-n
-p
-2
-
-
-w
+if [ -e output/images/u-boot.sd ] ; then
+	echo Recreating new partition table
+	sed 's/#.*//' << EOF | tr -d " \t"  | sudo fdisk $1
+		n	# new partition
+		p	# primary partition
+		1	# number 1
+			# default start
+		+16M	# 16MB
+		t	# New Type field
+		53	# OnTrack DM6 Aux3
+		n	# new partition
+		p	# primary partition
+		2	# number 2
+			# default start
+			# default size
+		w	# write changes
 EOF
 
-if [ -e output/images/imx23_olinuxino_dev_linux.sb ] ; then
-	echo Writing mxs-bootlet bootstream
-	sudo dd if=output/images/imx23_olinuxino_dev_linux.sb bs=512 of="$1"1 seek=4
-elif [ -e output/images/u-boot.sd ] ; then
 	echo Writing U-Boot bootstream
 	sudo dd if=output/images/u-boot.sd of="$1"1
-elif [ -e output/images/ ] ; then
-    echo Creaeting boot filesystem
-    sudo mkfs.vfat -F 16 -n boot "$1"1
+elif [ -d output/images/rpi-firmware ] ; then
+	SIZE=`sudo fdisk -l $1 | grep Disk | grep bytes | awk '{print $5}'`	
+	echo Disk size: $SIZE bytes
+	CYLINDERS=`echo $SIZE/255/63/512 | bc`
+	echo Cylinders: $CYLINDERS
+
+	sed 's/#.*//' << EOF | tr -d " \t"  | sudo sfdisk -D -H 255 -S 63 -C $CYLINDERS $1
+		,9,0x0C,*	# From http://downloads.angstrom-distribution.org/demo/beaglebone/mkcard.txt
+		,,,-		# Found in http://elinux.org/RPi_Advanced_Setup#Advanced_SD_card_setup
+EOF
+
+	echo Creaeting boot filesystem
+	sudo mkfs.vfat -F 32 -n boot "$1"1
 
-    echo Mounting boot filesystem
+	echo Mounting boot filesystem
 	sudo mkdir -p /media/boot
 	sudo mount "$1"1 /media/boot
 
-    echo Copying bootloader files
-    sudo cp output/images/rpi-firmware/* /media/boot/
-    sudo cp output/images/*.dtb /media/boot/
+	echo Copying bootloader files
+	sudo cp output/images/rpi-firmware/* /media/boot/
+	sudo cp output/images/*.dtb /media/boot/
 
-    echo Preparing and copying Kernel Image
-    output/host/usr/bin/mkknlimg output/images/zImage /media/boot/zImage
+	echo Preparing and copying Kernel Image
+	sudo output/host/usr/bin/mkknlimg output/images/zImage /media/boot/zImage
 
-    echo Synchronising changes to disk
+	echo Synchronising changes to disk
 	sudo sync
 
 	echo Unmounting boot filesystem
@@ -86,6 +93,6 @@ elif [ -e output/images/rootfs.ext2 ] ; then
 	echo Synchronising changes to disk
 	sudo sync
 else
-    echo Could not find a suitable root filesystem!
+	echo Could not find a suitable root filesystem!
 fi