diff options
| -rw-r--r-- | package/kexec-tools/Makefile | 2 | ||||
| -rw-r--r-- | package/kexec-tools/kexec-config.in | 2 | ||||
| -rwxr-xr-x | scripts/metadata.pl | 1 | ||||
| -rw-r--r-- | target/Config.in | 3 | ||||
| -rw-r--r-- | target/linux/ps3/Makefile | 1 | ||||
| -rw-r--r-- | target/linux/ps3/petitboot/target.mk | 2 | ||||
| -rw-r--r-- | toolchain/Config.in | 6 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 2 |
9 files changed, 13 insertions, 8 deletions
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 3f6137d3d..81ae9d37c 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/kexec-tools SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@armeb||@i386||@TARGET_ps3||@mipsel||@mips +zlib + DEPENDS:=@armeb||@i386||@powerpc64||@mipsel||@mips +zlib TITLE:=Kernel boots kernel URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/ MENU:=1 diff --git a/package/kexec-tools/kexec-config.in b/package/kexec-tools/kexec-config.in index 0910ac202..7aa3f1db2 100644 --- a/package/kexec-tools/kexec-config.in +++ b/package/kexec-tools/kexec-config.in @@ -2,7 +2,7 @@ config KEXEC_TOOLS_TARGET_NAME string prompt "Target name for kexec kernel" if PACKAGE_kexec-tools - default EXTRA_TARGET_ARCH_NAME if TARGET_ps3 + default EXTRA_TARGET_ARCH_NAME if powerpc64 default ARCH help Defines the target type of the kernels that kexec deals diff --git a/scripts/metadata.pl b/scripts/metadata.pl index e8850c937..39304dfbe 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -165,6 +165,7 @@ sub target_config_features(@) { /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n"; /fpu/ and $ret .= "\tselect HAS_FPU\n"; /ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n"; + /powerpc64/ and $ret .= "\tselect powerpc64\n"; } return $ret; } diff --git a/target/Config.in b/target/Config.in index 8bfeb83b2..ffd81d3f6 100644 --- a/target/Config.in +++ b/target/Config.in @@ -100,6 +100,9 @@ config powerpc select BIG_ENDIAN bool +config powerpc64 + bool + config sh3 bool diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile index 64d847719..b59e16158 100644 --- a/target/linux/ps3/Makefile +++ b/target/linux/ps3/Makefile @@ -11,6 +11,7 @@ BOARD:=ps3 BOARDNAME:=Sony PS3 Game Console MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com> SUBTARGETS=petitboot +FEATURES+=powerpc64 LINUX_VERSION:=2.6.28.10 diff --git a/target/linux/ps3/petitboot/target.mk b/target/linux/ps3/petitboot/target.mk index 04ec11bb3..845c4316d 100644 --- a/target/linux/ps3/petitboot/target.mk +++ b/target/linux/ps3/petitboot/target.mk @@ -1,5 +1,5 @@ BOARDNAME:=Petitboot -FEATURES:=fpu ramdisk +FEATURES+=fpu ramdisk define Target/Description Build Petitboot bootloader diff --git a/toolchain/Config.in b/toolchain/Config.in index 6fc7b6fce..f01b6c23b 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -13,7 +13,7 @@ menuconfig TOOLCHAINOPTS menuconfig EXTRA_TARGET_ARCH bool prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS - default y if TARGET_ps3 || TARGET_pxcab + default y if powerpc64 || TARGET_pxcab default n help Some builds may require a 'biarch' toolchain. This option @@ -23,7 +23,7 @@ menuconfig EXTRA_TARGET_ARCH config EXTRA_TARGET_ARCH_NAME string - default "powerpc64" if TARGET_ps3 || TARGET_pxcab + default "powerpc64" if powerpc64 || TARGET_pxcab prompt "Extra architecture name" if EXTRA_TARGET_ARCH help Specify the cpu name (eg powerpc64 or x86_64) of the @@ -31,7 +31,7 @@ menuconfig EXTRA_TARGET_ARCH config EXTRA_TARGET_ARCH_OPTS string - default "-m64" if TARGET_ps3 || TARGET_pxcab + default "-m64" if powerpc64 || TARGET_pxcab prompt "Extra architecture compiler options" if EXTRA_TARGET_ARCH help If you're specifying an addition target architecture, diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index 41943c8cc..6cbf2cdb6 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -6,7 +6,7 @@ choice default GCC_VERSION_4_2_4 if TARGET_avr32 default GCC_VERSION_4_2_4 if TARGET_ppc40x default GCC_VERSION_4_2_4 if TARGET_ppc44x - default GCC_VERSION_4_3_3 if TARGET_ps3_petitboot + default GCC_VERSION_4_3_3 if powerpc64 default GCC_VERSION_4_3_3 if TARGET_pxcab default GCC_VERSION_4_3_3 if TARGET_etrax default GCC_VERSION_4_3_3 if TARGET_coldfire diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 53688c217..5a0f66887 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -52,7 +52,7 @@ if !TOOLCHAINOPTS default y if TARGET_ppc44x config GCC_VERSION_4_3_3 - default y if TARGET_ps3_petitboot + default y if powerpc64 default y if TARGET_pxcab default y if TARGET_etrax default y if TARGET_coldfire |