Procházet zdrojové kódy

bfin: prefer FDPIC

Use FDPIC by default.
Limit gcc to a working one. Default to a working gdb version.
Be sure to use uCLinux symbol only for BFLAT.
Waldemar Brodkorb před 9 roky
rodič
revize
dd02d07d94

+ 0 - 1
target/bfin/systems/sim-bfin

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_SIM_BFIN
 	bool "GDB simulator"
 	select ADK_CPU_BFIN
-	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_SIM
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 0 - 1
target/bfin/systems/toolchain-bfin

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_BFIN
 	bool "Toolchain only"
 	select ADK_CPU_BFIN
-	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 7 - 6
target/config/Config.in.binfmt

@@ -14,19 +14,20 @@ config ADK_TARGET_BINFMT_ELF
 	bool "ELF"
 	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && !ADK_TARGET_UCLINUX
 
+config ADK_TARGET_BINFMT_FDPIC
+	bool "FDPIC"
+	depends on ADK_TARGET_ARCH_BFIN
+
 config ADK_TARGET_BINFMT_FLAT
 	bool "FLAT"
-	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_BFIN || ADK_TARGET_ARCH_M68K) && ADK_TARGET_UCLINUX \
-		|| ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32
+	select ADK_TARGET_UCLINUX if ADK_TARGET_ARCH_BFIN
+	depends on (ADK_TARGET_ARCH_ARM || ADK_TARGET_ARCH_M68K) && ADK_TARGET_UCLINUX \
+		|| ADK_TARGET_ARCH_H8300 || ADK_TARGET_ARCH_LM32 || ADK_TARGET_ARCH_BFIN
 
 config ADK_TARGET_BINFMT_DSBT
 	bool "DSBT"
 	depends on ADK_TARGET_ARCH_C6X
 
-config ADK_TARGET_BINFMT_FDPIC
-	bool "FDPIC"
-	depends on ADK_TARGET_ARCH_BFIN
-
 endchoice
 
 # Set up flat binary type

+ 1 - 1
target/config/Config.in.gcc

@@ -31,9 +31,9 @@ config ADK_TOOLCHAIN_GCC_5_2_0
 
 config ADK_TOOLCHAIN_GCC_4_9_3
 	bool "4.9.3"
-	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_METAG

+ 3 - 0
target/config/Config.in.gdb

@@ -3,6 +3,7 @@
 
 choice
 prompt "GNU debugger version"
+default ADK_TOOLCHAIN_GDB_7_9_1 if ADK_TARGET_ARCH_BFIN
 default ADK_TOOLCHAIN_GDB_7_10
 
 config ADK_TOOLCHAIN_GDB_GIT
@@ -13,6 +14,7 @@ config ADK_TOOLCHAIN_GDB_7_10
 	bool "7.10"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_BFIN
 
 config ADK_TOOLCHAIN_GDB_7_9_1
 	bool "7.9.1"
@@ -22,6 +24,7 @@ config ADK_TOOLCHAIN_GDB_7_9_1
 config ADK_TOOLCHAIN_GDB_7_8_2
 	bool "7.8.2"
 	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_H8300
 
 config ADK_TOOLCHAIN_GDB_6_7_1

+ 4 - 1
target/config/Config.in.target

@@ -97,6 +97,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	select ADK_KERNEL_IP_PNP
 	select ADK_KERNEL_IP_PNP_DHCP
 	depends on !ADK_TARGET_QEMU && \
+		   !ADK_TARGET_SIM && \
 	           !ADK_TARGET_VBOX && \
 		   !ADK_TARGET_SYSTEM_ARANYM_M68K && \
 		   !ADK_TARGET_SYSTEM_ARM_FM
@@ -134,7 +135,8 @@ config ADK_TARGET_ROOTFS_ISO
 
 config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 	bool "Archive usable for initramfs creation"
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532 \
+		&& !ADK_TARGET_SIM
 	select ADK_KERNEL_BLK_DEV_INITRD
 	help
 	  Use this option if your planning to create a initramfs,
@@ -145,6 +147,7 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
 	select ADK_KERNEL_EXT2_FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
 	select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU
+	depends on !ADK_TARGET_SIM
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.