浏览代码

toolchain/arm: add support for Marvell PJ4

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Gustavo Zacarias 12 年之前
父节点
当前提交
8f434ff274
共有 2 个文件被更改,包括 9 次插入5 次删除
  1. 4 0
      arch/Config.in.arm
  2. 5 5
      toolchain/gcc/Config.in

+ 4 - 0
arch/Config.in.arm

@@ -47,6 +47,8 @@ config BR2_cortex_a15
 	select BR2_ARM_CPU_HAS_NEON
 	select BR2_ARM_CPU_HAS_NEON
 config BR2_fa526
 config BR2_fa526
 	bool "fa526/626"
 	bool "fa526/626"
+config BR2_pj4
+	bool "pj4"
 config BR2_strongarm
 config BR2_strongarm
 	bool "strongarm sa110/sa1100"
 	bool "strongarm sa110/sa1100"
 config BR2_xscale
 config BR2_xscale
@@ -115,6 +117,7 @@ config BR2_GCC_TARGET_TUNE
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a15"	if BR2_cortex_a15
 	default "cortex-a15"	if BR2_cortex_a15
 	default "fa526"		if BR2_fa526
 	default "fa526"		if BR2_fa526
+	default "marvell-pj4"	if BR2_pj4
 	default "strongarm"	if BR2_strongarm
 	default "strongarm"	if BR2_strongarm
 	default "xscale"	if BR2_xscale
 	default "xscale"	if BR2_xscale
 	default "iwmmxt"	if BR2_iwmmxt
 	default "iwmmxt"	if BR2_iwmmxt
@@ -135,6 +138,7 @@ config BR2_GCC_TARGET_ARCH
 	default "armv7-a"	if BR2_cortex_a9
 	default "armv7-a"	if BR2_cortex_a9
 	default "armv7-a"	if BR2_cortex_a15
 	default "armv7-a"	if BR2_cortex_a15
 	default "armv4"		if BR2_fa526
 	default "armv4"		if BR2_fa526
+	default "armv7-a"	if BR2_pj4
 	default "armv4"		if BR2_strongarm
 	default "armv4"		if BR2_strongarm
 	default "armv5te"	if BR2_xscale
 	default "armv5te"	if BR2_xscale
 	default "iwmmxt"	if BR2_iwmmxt
 	default "iwmmxt"	if BR2_iwmmxt

+ 5 - 5
toolchain/gcc/Config.in

@@ -18,25 +18,25 @@ choice
 	       bool "gcc 4.2.2-avr32-2.1.5"
 	       bool "gcc 4.2.2-avr32-2.1.5"
 
 
 	config BR2_GCC_VERSION_4_3_X
 	config BR2_GCC_VERSION_4_3_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.3.x"
 		bool "gcc 4.3.x"
 
 
 	config BR2_GCC_VERSION_4_4_X
 	config BR2_GCC_VERSION_4_4_X
-		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526
+		depends on !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4
 		bool "gcc 4.4.x"
 		bool "gcc 4.4.x"
 
 
 	config BR2_GCC_VERSION_4_5_X
 	config BR2_GCC_VERSION_4_5_X
-		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526
+		depends on !BR2_avr32 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.5.x"
 		bool "gcc 4.5.x"
 
 
 	config BR2_GCC_VERSION_4_6_X
 	config BR2_GCC_VERSION_4_6_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.6.x"
 		bool "gcc 4.6.x"
 
 
 	config BR2_GCC_VERSION_4_7_X
 	config BR2_GCC_VERSION_4_7_X
-		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8
+		depends on !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4
 		select BR2_GCC_NEEDS_MPC
 		select BR2_GCC_NEEDS_MPC
 		bool "gcc 4.7.x"
 		bool "gcc 4.7.x"