Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: remove all references to sfdisk

Browse Source 
sfdisk is no longer used by the ARM build, since we can handle
everything with mtools (using mpartition instead of sfdisk).
This commit is contained in:
Ithamar R. Adema 2014-08-17 14:34:25 +02:00
parent ab325d984f
commit 21af7e541f
6 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ReadMe
View File

@ -62,7 +62,6 @@ The following tools are needed to compile Haiku for the ARM platform
* mkimage (http://www.denx.de/wiki/UBoot)
* Mtools (http://www.gnu.org/software/mtools/intro.html)
* sfdisk
Specific: Mac OS X
------------------

4
build/jam/board/neo_freerunner/BoardSetup
View File

@ -42,10 +42,6 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
# in MB
HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
# offset in blocks XXX: FIXME
# (autodetect from sfdisk or use cylinder count for fat size)
#HAIKU_BOARD_SDIMAGE_BFS_OFFSET = ;
# autoboot script
HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = uImage.bin ;

4
build/jam/board/overo/BoardSetup
View File

@ -33,10 +33,6 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
# in MB
HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
# offset in blocks XXX: FIXME
# (autodetect from sfdisk or use cylinder count for fat size)
HAIKU_BOARD_SDIMAGE_BFS_OFFSET = ;
# autoboot script
HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = gumstix-factory.script ;
HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "\

4
build/jam/board/verdex/BoardSetup
View File

@ -42,10 +42,6 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
# in MB
HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
# offset in blocks XXX: FIXME
# (autodetect from sfdisk or use cylinder count for fat size)
#HAIKU_BOARD_SDIMAGE_BFS_OFFSET = ;
# autoboot script
HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = gumstix-factory.script ;

11
configure vendored
View File

@ -447,8 +447,6 @@ HAIKU_HOST_BUILD_ONLY=0
HOST_EXTENDED_REGEX_SED="sed -r"
HOST_GCC_LD=`$CC -print-prog-name=ld`
HOST_GCC_OBJCOPY=`$CC -print-prog-name=objcopy`
SFDISK_BINARY=sfdisk
HOST_SFDISK=$SFDISK_BINARY
HOST_SHA256=
HOST_HAIKU_PORTER=
HAIKU_PORTS=
@ -635,7 +633,6 @@ done
case "${platform}" in
Darwin) HOST_PLATFORM=darwin ;;
FreeBSD) HOST_PLATFORM=freebsd
SFDISK_BINARY=sfdisk-linux
if [ "$HAIKU_HOST_USE_32BIT" = 1 ] ; then
echo Unsupported platform: FreeBSD ${platformMachine}
exit 1
@ -649,13 +646,6 @@ case "${platform}" in
exit 1 ;;
esac
# check common locations for sfdisk
for sfdiskDir in /sbin /usr/sbin /usr/local/sbin ; do
if [ -e ${sfdiskDir}/${SFDISK_BINARY} ]; then
HOST_SFDISK=${sfdiskDir}/${SFDISK_BINARY}
fi
done
# check for case-sensitive filesystem
mkdir haikuCaseTest 2>/dev/null
mkdir haikucasetest 2>/dev/null
@ -886,7 +876,6 @@ HOST_GCC_RAW_VERSION ?= ${HOST_GCC_RAW_VERSION} ;
HOST_GCC_MACHINE ?= ${HOST_GCC_MACHINE} ;
HOST_LD ?= ${HOST_GCC_LD} ;
HOST_OBJCOPY ?= ${HOST_GCC_OBJCOPY} ;
HOST_SFDISK ?= ${HOST_SFDISK} ;
HOST_SHA256 ?= ${HOST_SHA256} ;
HOST_HAIKU_PORTER ?= ${HOST_HAIKU_PORTER} ;

2
src/system/boot/platform/u-boot/Jamfile
View File

@ -149,7 +149,7 @@ actions BuildUImageScript1
}
# SD/mmc image rule
# requires sfdisk and mtools packages on linux
# requires mtools package on linux
rule BuildUBootSDImage image : files
{
Depends $(image) : $(files) ;