Bug#667681: Updated patches for Dreamplug / Marvell Kirkwood FDT

[Loïc Minier <lool@dooz.org>]

Sorry for the delay

On Mon, Jun 04, 2012, Ian Campbell wrote:
> +Machine: Globalscale Technologies Dreamplug
> +Kernel-Flavors: kirkwood
> +U-Boot-Kernel-Address: 0x00008000
> +U-Boot-Initrd-Address: 0x0
> +Boot-Kernel-Path: /boot/uImage
> +Boot-Initrd-Path: /boot/uInitrd

Could we use Boot-Device + relative pathnames instead?  I find this to
be a cleaner abstraction for the "firmware area", it mounts the firmware
area only when needed, and doesn't impose as many constraints on it; if
one uses /boot to mount the "firmware area" where the bootloader reads
uImage and such, it has to be sufficiently large to carry all installed
kernel packages, might require support for symlinks (problematic for
vfat) or might break more easily with certain fs types (e.g. ext2) if
the device isn't stopped properly.

> --- a/functions
> +++ b/functions
> @@ -21,6 +21,7 @@
>  BOOTSCRIPTS_DIR="${FK_CHECKOUT:-$FK_DIR}/bootscript"
>  MACHINE_DB="$(cat "${FK_CHECKOUT:-$FK_DIR}/db/"*.db)"
>  PROC_CPUINFO="${FK_PROC_CPUINFO:-/proc/cpuinfo}"
> +PROC_DTMODEL="${FK_PROC_DRMODEL:-/proc/device-tree/model}"
>  PROC_MTD="/proc/mtd"
>  
>  
> @@ -94,6 +95,16 @@ check_supported() {
>  get_cpuinfo_hardware() {
>  	grep "^Hardware" "$PROC_CPUINFO" | sed 's/Hardware\s*:\s*//'
>  }
> +get_dt_model() {
> +	cat "$PROC_DTMODEL"
> +}
> +get_machine() {
> +	if [ -f "$PROC_DTMODEL" ] ; then
> +		get_dt_model
> +	else
> +		get_cpuinfo_hardware
> +	fi
> +}
>  
>  get_kfile_suffix() {
>  	local kfile="$1"
> @@ -302,7 +313,7 @@ elif [ -n "$FK_MACHINE" ]; then
>  	machine="$FK_MACHINE"
>  	[ "x$machine" = "xnone" ] && exit
>  else
> -	machine="$(get_cpuinfo_hardware)"
> +	machine="$(get_machine)"
>  fi
>  
>  if [ "x$1" = "x--supported" ]; then

This looks good!  Ideally we'd expand the testsuite

-- 
Loïc Minier