Commit 27a54148 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next' 



Conflicts:
	package/gdb/Config.in.host

Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parents f6162290 fc90fa94

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ export HOSTARCH := $(shell uname -m | \ 
	    -e s/sun4u/sparc64/ \

	    -e s/arm.*/arm/ \

	    -e s/sa110/arm/ \

	    -e s/ppc64/powerpc/ \

	    -e s/ppc64/powerpc64/ \

	    -e s/ppc/powerpc/ \

	    -e s/macppc/powerpc/\

	    -e s/sh.*/sh/)
@@ -309,7 +309,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \ 
	-e s/aarch64/arm64/ \

	-e s/bfin/blackfin/ \

	-e s/parisc64/parisc/ \

	-e s/powerpc64/powerpc/ \

	-e s/powerpc64.*/powerpc/ \

	-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \

	-e s/sh.*/sh/ \

	-e s/microblazeel/microblaze/)

arch/Config.in

+20 −1
Original line number Diff line number Diff line
@@ -140,6 +140,25 @@ config BR2_powerpc 
	bool "PowerPC"

	help

	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.

	  Big endian.

	  http://www.power.org/

	  http://en.wikipedia.org/wiki/Powerpc



config BR2_powerpc64

	bool "PowerPC64 (big endian)"

	select BR2_ARCH_IS_64

	help

	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.

	  Big endian.

	  http://www.power.org/

	  http://en.wikipedia.org/wiki/Powerpc



config BR2_powerpc64le

	bool "PowerPC64 (little endian)"

	select BR2_ARCH_IS_64

	help

	  PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance.

	  Little endian.

	  http://www.power.org/

	  http://en.wikipedia.org/wiki/Powerpc
@@ -321,7 +340,7 @@ if BR2_nios2 
source "arch/Config.in.nios2"

endif



if BR2_powerpc

if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le

source "arch/Config.in.powerpc"

endif

arch/Config.in.powerpc

+65 −6
Original line number Diff line number Diff line 
config BR2_POWERPC_CPU_HAS_ALTIVEC

	bool



config BR2_POWERPC_CPU_HAS_SPE

	bool



choice

	prompt "Target Architecture Variant"

	depends on BR2_powerpc

	default BR2_generic_powerpc

	help

	  Specific CPU variant to use
@@ -8,84 +13,130 @@ config BR2_generic_powerpc 
	bool "generic"

config BR2_powerpc_401

	bool "401"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_403

	bool "403"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_405

	bool "405"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_405fp

	bool "405 with FPU"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_440

	bool "440"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_440fp

	bool "440 with FPU"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_464

	bool "464"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_464fp

	bool "464 with FPU"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_476

	bool "476"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_476fp

	bool "476 with FPU"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_505

	bool "505"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_601

	bool "601"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_602

	bool "602"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_603

	bool "603"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_603e

	bool "603e"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_604

	bool "604"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_604e

	bool "604e"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_620

	bool "620"

config BR2_powerpc_630

	bool "630"

config BR2_powerpc_740

	bool "740"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_7400

	bool "7400"

	select BR2_POWERPC_CPU_HAS_ALTIVEC

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_7450

	bool "7450"

	select BR2_POWERPC_CPU_HAS_ALTIVEC

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_750

	bool "750"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_821

	bool "821"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_823

	bool "823"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_860

	bool "860"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_970

	bool "970"

	select BR2_POWERPC_CPU_HAS_ALTIVEC

config BR2_powerpc_8540

	bool "8540 / e500v1"

	depends on !BR2_ARCH_IS_64

	select BR2_POWERPC_CPU_HAS_SPE

config BR2_powerpc_8548

	bool "8548 / e500v2"

	depends on !BR2_ARCH_IS_64

	select BR2_POWERPC_CPU_HAS_SPE

config BR2_powerpc_e300c2

	bool "e300c2"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_e300c3

	bool "e300c3"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_e500mc

	bool "e500mc"

	depends on !BR2_ARCH_IS_64

config BR2_powerpc_power4

	bool "power4"

config BR2_powerpc_power5

	bool "power5"

config BR2_powerpc_power6

	bool "power6"

	select BR2_POWERPC_CPU_HAS_ALTIVEC

config BR2_powerpc_power7

	bool "power7"

	select BR2_POWERPC_CPU_HAS_ALTIVEC

config BR2_powerpc_power8

	bool "power8"

	select BR2_POWERPC_CPU_HAS_ALTIVEC

endchoice



choice

	prompt "Target ABI"

	depends on BR2_powerpc

	default BR2_powerpc_SPE if BR2_powerpc_8540 || BR2_powerpc_8548

	default BR2_powerpc_SPE if BR2_POWERPC_CPU_HAS_SPE

	default BR2_powerpc_CLASSIC

	help

	  Application Binary Interface to use



config BR2_powerpc_CLASSIC

	bool "Classic"

	depends on !(BR2_powerpc_8540 || BR2_powerpc_8548)

	depends on !BR2_POWERPC_CPU_HAS_SPE

config BR2_powerpc_SPE

	bool "SPE"

	depends on BR2_powerpc_8540 || BR2_powerpc_8548

	depends on BR2_POWERPC_CPU_HAS_SPE

endchoice



config BR2_POWERPC_SOFT_FLOAT
@@ -99,9 +150,12 @@ config BR2_POWERPC_SOFT_FLOAT 


config BR2_ARCH

	default "powerpc"	if BR2_powerpc

	default "powerpc64"	if BR2_powerpc64

	default "powerpc64le"	if BR2_powerpc64le



config BR2_ENDIAN

	default "BIG"

	default "BIG"    if BR2_powerpc || BR2_powerpc64

	default "LITTLE" if BR2_powerpc64le



config BR2_GCC_TARGET_TUNE

	default "401"		if BR2_powerpc_401
@@ -136,6 +190,11 @@ config BR2_GCC_TARGET_TUNE 
	default "e300c2"	if BR2_powerpc_e300c2

	default "e300c3"	if BR2_powerpc_e300c3

	default "e500mc"	if BR2_powerpc_e500mc

	default "power4"	if BR2_powerpc_power4

	default "power5"	if BR2_powerpc_power5

	default "power6"	if BR2_powerpc_power6

	default "power7"	if BR2_powerpc_power7

	default "power8"	if BR2_powerpc_power8



config BR2_GCC_TARGET_ABI

	default "altivec"		if BR2_PPC_ABI_altivec

fs/squashfs/Config.in

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ choice 
config BR2_TARGET_ROOTFS_SQUASHFS4_GZIP

	bool "gzip"



config BR2_TARGET_ROOTFS_SQUASHFS4_LZ4

	bool "lz4"



config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA

	bool "lzma"

fs/squashfs/squashfs.mk

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs



ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y)

ROOTFS_SQUASHFS_ARGS += -comp lz4

else

ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)

ROOTFS_SQUASHFS_ARGS += -comp lzo

else
@@ -19,6 +22,7 @@ ROOTFS_SQUASHFS_ARGS += -comp gzip 
endif

endif

endif

endif



define ROOTFS_SQUASHFS_CMD

	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \