From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Tue, 18 Aug 2009 21:47:11 +0000 (+0000)
Subject: ps3: Rename bl-option to ps3-bl-option
X-Git-Tag: reboot~22646
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1113ce0ba728a02f8f88944e5ef84dd239794f49;p=openwrt%2Fstaging%2Fpepe2k.git

ps3: Rename bl-option to ps3-bl-option

Rename the bootloader helper script bl-option to ps3-bl-option.
This change simply renames the file.  No other changes are
included.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

SVN-Revision: 17299
---

diff --git a/target/linux/ps3/petitboot/base-files/bin/login b/target/linux/ps3/petitboot/base-files/bin/login
index 2e649f04fe..b17efcdf42 100755
--- a/target/linux/ps3/petitboot/base-files/bin/login
+++ b/target/linux/ps3/petitboot/base-files/bin/login
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (C) 2008 OpenWrt.org
 
-bl_option=/sbin/bl-option
+bl_option=/sbin/ps3-bl-option
 
 if [ ! -f $bl_option ] ||
    [ ! `$bl_option --get-telnet-enabled` ] ||
diff --git a/target/linux/ps3/petitboot/base-files/sbin/bl-option b/target/linux/ps3/petitboot/base-files/sbin/bl-option
deleted file mode 100755
index 8eea93d979..0000000000
--- a/target/linux/ps3/petitboot/base-files/sbin/bl-option
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-#
-#  Copyright (C) 2008 Sony Computer Entertainment Inc.
-#  Copyright 2008 Sony Corp.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-usage() {
-	echo "" >&2
-	echo "SYNOPSIS" >&2
-	echo "     bl-option [OPTION]" >&2
-	echo "" >&2
-	echo "DESCRIPTION" >&2
-	echo "     Get and set PS3 bootloader options in flash." >&2
-	echo "" >&2
-	echo "OPTIONS" >&2
-	echo "     -m, --get-video-mode" >&2
-	echo "             Get the bootloader video mode." >&2
-	echo "" >&2
-	echo "     -M, --set-video-mode value" >&2
-	echo "             Set the bootloader video mode." >&2
-	echo "" >&2
-	echo "     -p, --get-petitboot-default" >&2
-	echo "             Get the default Petitboot menu item." >&2
-	echo "" >&2
-	echo "     -P, --set-petitboot-default value" >&2
-	echo "             Set the default Petitboot menu item." >&2
-	echo "" >&2
-	echo "     -t, --get-telnet-enabled" >&2
-	echo "             Get the telnet enabled flag." >&2
-	echo "" >&2
-	echo "     -T, --set-telnet-enabled value" >&2
-	echo "             Set the telnet enabled flag." >&2
-	echo "" >&2
-	echo "     -h, --help" >&2
-	echo "             Print a help message." >&2
-	echo "" >&2
-	echo "SEE ALSO" >&2
-	echo "     ps3-flash-util(8)" >&2
-	echo "" >&2
-	exit 1
-}
-
-if [ "$#" -eq 0 ] ; then
-	echo "ERROR: bad arg" >&2;
-	usage
-fi
-
-get_flag() {
-	flags=`ps3-flash-util --db-print $1 $2`
-	echo $(( ${flags:-0} & $3 ))
-}
-
-set_flag() {
-	flags=`ps3-flash-util --db-print $1 $2`
-
-	if [ $4 -eq 0  ]; then
-		ps3-flash-util --db-write-half $1 $2 $(( ${flags:-0} & ~$3 ))
-	else
-		ps3-flash-util --db-write-half $1 $2 $(( ${flags:-0} | $3 ))
-	fi
-}
-
-# owners
-petitboot="3"
-
-# keys
-menu="1"
-video="2"
-flags="3"
-
-# flags
-telnet="1"
-
-case "$1" in
-	-m | --get-video-mode)
-		ps3-flash-util --db-print ${petitboot} ${video}
-		;;
-	-M | --set-video-mode)
-		ps3-flash-util --db-write-half ${petitboot} ${video} $2
-		;;
-	-p | --get-petitboot-default)
-		ps3-flash-util --db-print ${petitboot} ${menu}
-		;;
-	-P | --set-petitboot-default)
-		ps3-flash-util --db-write-word ${petitboot} ${menu} $2
-		;;
-	-t | --get-telnet-enabled)
-		get_flag ${petitboot} ${flags} ${telnet}
-		;;
-	-T | --set-telnet-enabled)
-		set_flag ${petitboot} ${flags} ${telnet} $2
-		;;
-	-h | --help)
-		usage
-		;;
-	*)
-		echo "ERROR: bad arg $1" >&2;
-		usage
-		;;
-esac
diff --git a/target/linux/ps3/petitboot/base-files/sbin/ps3-bl-option b/target/linux/ps3/petitboot/base-files/sbin/ps3-bl-option
new file mode 100644
index 0000000000..8eea93d979
--- /dev/null
+++ b/target/linux/ps3/petitboot/base-files/sbin/ps3-bl-option
@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+#  Copyright (C) 2008 Sony Computer Entertainment Inc.
+#  Copyright 2008 Sony Corp.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+usage() {
+	echo "" >&2
+	echo "SYNOPSIS" >&2
+	echo "     bl-option [OPTION]" >&2
+	echo "" >&2
+	echo "DESCRIPTION" >&2
+	echo "     Get and set PS3 bootloader options in flash." >&2
+	echo "" >&2
+	echo "OPTIONS" >&2
+	echo "     -m, --get-video-mode" >&2
+	echo "             Get the bootloader video mode." >&2
+	echo "" >&2
+	echo "     -M, --set-video-mode value" >&2
+	echo "             Set the bootloader video mode." >&2
+	echo "" >&2
+	echo "     -p, --get-petitboot-default" >&2
+	echo "             Get the default Petitboot menu item." >&2
+	echo "" >&2
+	echo "     -P, --set-petitboot-default value" >&2
+	echo "             Set the default Petitboot menu item." >&2
+	echo "" >&2
+	echo "     -t, --get-telnet-enabled" >&2
+	echo "             Get the telnet enabled flag." >&2
+	echo "" >&2
+	echo "     -T, --set-telnet-enabled value" >&2
+	echo "             Set the telnet enabled flag." >&2
+	echo "" >&2
+	echo "     -h, --help" >&2
+	echo "             Print a help message." >&2
+	echo "" >&2
+	echo "SEE ALSO" >&2
+	echo "     ps3-flash-util(8)" >&2
+	echo "" >&2
+	exit 1
+}
+
+if [ "$#" -eq 0 ] ; then
+	echo "ERROR: bad arg" >&2;
+	usage
+fi
+
+get_flag() {
+	flags=`ps3-flash-util --db-print $1 $2`
+	echo $(( ${flags:-0} & $3 ))
+}
+
+set_flag() {
+	flags=`ps3-flash-util --db-print $1 $2`
+
+	if [ $4 -eq 0  ]; then
+		ps3-flash-util --db-write-half $1 $2 $(( ${flags:-0} & ~$3 ))
+	else
+		ps3-flash-util --db-write-half $1 $2 $(( ${flags:-0} | $3 ))
+	fi
+}
+
+# owners
+petitboot="3"
+
+# keys
+menu="1"
+video="2"
+flags="3"
+
+# flags
+telnet="1"
+
+case "$1" in
+	-m | --get-video-mode)
+		ps3-flash-util --db-print ${petitboot} ${video}
+		;;
+	-M | --set-video-mode)
+		ps3-flash-util --db-write-half ${petitboot} ${video} $2
+		;;
+	-p | --get-petitboot-default)
+		ps3-flash-util --db-print ${petitboot} ${menu}
+		;;
+	-P | --set-petitboot-default)
+		ps3-flash-util --db-write-word ${petitboot} ${menu} $2
+		;;
+	-t | --get-telnet-enabled)
+		get_flag ${petitboot} ${flags} ${telnet}
+		;;
+	-T | --set-telnet-enabled)
+		set_flag ${petitboot} ${flags} ${telnet} $2
+		;;
+	-h | --help)
+		usage
+		;;
+	*)
+		echo "ERROR: bad arg $1" >&2;
+		usage
+		;;
+esac