Browse Source

refactor LINUX_64 support, hide symbol for developers of boards

Waldemar Brodkorb 9 years ago
parent
commit
b740a110d0

+ 1 - 2
target/aarch64/systems/arm-fm

@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_ARM_FM
 	bool "ARMv8 Foundation Model"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_CORTEX_A57
-	select ADK_LINUX_64
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
 	select ADK_TARGET_WITH_SERIAL

+ 1 - 2
target/aarch64/systems/qemu-aarch64

@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_AARCH64
 	bool "Qemu Emulator"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_LINUX_64
 	select ADK_CPU_CORTEX_A57
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_IMAGE
 	help

+ 1 - 2
target/aarch64/systems/toolchain-aarch64

@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
 	bool "Toolchain only"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_LINUX_64
 	select ADK_CPU_CORTEX_A57
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 0 - 1
target/alpha/systems/qemu-alpha

@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_ALPHA
 	bool "Qemu Emulator"
-	select ADK_LINUX_64
 	select ADK_CPU_ALPHA
 	select ADK_TARGET_QEMU
 	help

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

@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_ALPHA
 	bool "Toolchain only"
-	select ADK_LINUX_64
 	select ADK_CPU_ALPHA
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ

+ 1 - 1
target/arm/systems/linksys-nslu2

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	bool "Linksys NSLU2"
-	select ADK_TARGET_BIG_ENDIAN
 	select ADK_CPU_XSCALE
+	select ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_ZIMAGE

+ 1 - 1
target/arm/systems/raspberry-pi

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_ARM1176JZF_S
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL

+ 1 - 1
target/arm/systems/raspberry-pi2

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	bool "Raspberry PI 2"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_CORTEX_A7
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL

+ 1 - 1
target/arm/systems/sharp-zaurus

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	bool "Sharp Zaurus CL3200 (Terrier)"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_XSCALE
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_CPU_WITH_IWMMXT
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL

+ 1 - 1
target/arm/systems/solidrun-imx6

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	bool "Solidrun IMX6 Embedded Systems"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_CPU_FREQ

+ 1 - 1
target/avr32/systems/atmel-ngw100

@@ -1,9 +1,9 @@
 config ADK_TARGET_SYSTEM_ATMEL_NGW100
 	bool "Atmel NGW100"
 	select ADK_CPU_AVR32
+	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_HOST_BUILD_U_BOOT
-	select ADK_TARGET_WITH_SERIAL
 	help
 	  Atmel NGW100
 

+ 1 - 1
target/c6x/systems/toolchain-c6x

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_C6X
 	bool "Toolchain only"
-	select ADK_TARGET_UCLINUX
 	select ADK_CPU_C6X
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 12 - 0
target/config/Config.in.cpu

@@ -4,11 +4,13 @@
 # CPU
 config ADK_CPU_ALPHA
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_AMDFAM10
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
@@ -36,11 +38,13 @@ config ADK_CPU_ARM926EJ_S
 
 config ADK_CPU_ARMV8
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_ATHLON
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -114,11 +118,13 @@ config ADK_CPU_CORTEX_A15
 
 config ADK_CPU_CORTEX_A53
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_CORTEX_A57
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -152,6 +158,7 @@ config ADK_CPU_I686
 
 config ADK_CPU_LOONGSON2F
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -176,11 +183,13 @@ config ADK_CPU_MIPS32R2
 
 config ADK_CPU_MIPS64
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
 config ADK_CPU_MIPS64R2
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -217,6 +226,7 @@ config ADK_CPU_PPC_440
 
 config ADK_CPU_PPC64
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -232,6 +242,7 @@ config ADK_CPU_SPARC_V8
 
 config ADK_CPU_SPARC_V9
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 
@@ -247,6 +258,7 @@ config ADK_CPU_X86
 
 config ADK_CPU_X86_64
 	bool
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 

+ 1 - 1
target/m68k/systems/qemu-m68k

@@ -1,8 +1,8 @@
 config ADK_TARGET_SYSTEM_QEMU_M68K
 	bool "Qemu M68K"
 	select ADK_CPU_CF_5208
-	select ADK_TARGET_QEMU
 	select ADK_TARGET_UCLINUX
+	select ADK_TARGET_QEMU
 	select ADK_TARGET_BINFMT_FLAT
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help

+ 1 - 1
target/mips/systems/dragino-ms14s

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	bool "Dragino2 ms14-s"
-	select ADK_TARGET_BIG_ENDIAN
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_SERIAL

+ 1 - 1
target/mips/systems/mikrotik-rb4xx

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	bool "Mikrotik Routerboard 4xx"
-	select ADK_TARGET_BIG_ENDIAN
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_WATCHDOG

+ 1 - 1
target/mips/systems/mikrotik-rb532

@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	bool "Mikrotik Routerboard 532"
-	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_CPU_MIPS32
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG

+ 1 - 2
target/mips64/systems/lemote-yeelong

@@ -1,8 +1,7 @@
 config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	bool "Lemote Yeelong laptop"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_LINUX_64
 	select ADK_CPU_LOONGSON2F
+	select ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_VGA

+ 0 - 1
target/mips64/systems/qemu-mips64

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	bool "Qemu Emulator"
 	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help

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

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
 	bool "Toolchain only"
 	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 0 - 1
target/ppc64/systems/qemu-ppc64

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_PPC64
 	bool "Qemu Emulator"
 	select ADK_CPU_PPC64
-	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	help
 	 Support for Qemu Emulator PPC64 architecture.

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

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
 	bool "Toolchain only"
 	select ADK_CPU_PPC64
-	select ADK_LINUX_64
 	select ADK_TAGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 0 - 1
target/sparc64/systems/qemu-sparc64

@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	bool "Qemu Emulator"
-	select ADK_LINUX_64
 	select ADK_CPU_SPARC_V9
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE

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

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
 	bool "Toolchain only"
 	select ADK_CPU_SPARC_V9
-	select ADK_LINUX_64
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 0 - 1
target/x86_64/systems/pcengines-apu

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_PCENGINES_APU
 	bool "PC Engines APU"
 	select ADK_CPU_X86_64
-	select ADK_LINUX_64
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_SERIAL

+ 0 - 1
target/x86_64/systems/qemu-x86_64

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_X86_64
 	bool "Qemu Emulator"
 	select ADK_CPU_X86_64
-	select ADK_LINUX_64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
 	help

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

@@ -1,7 +1,6 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
 	bool "Toolchain only"
 	select ADK_CPU_X86_64
-	select ADK_LINUX_64
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help

+ 2 - 3
toolchain/gcc/Makefile

@@ -135,10 +135,9 @@ endif
 endif
 
 ifeq ($(ADK_TARGET_ARCH_X86_64),y)
-ifeq ($(ADK_TARGET_ABI_X32),y)
+ifneq ($(ADK_TARGET_ABI_X32),)
 GCC_FINAL_CONFOPTS+=	--with-abi=x32
-endif
-ifeq ($(ADK_TARGET_ABI_64),y)
+else
 GCC_FINAL_CONFOPTS+=	--disable-biarch --disable-multilib
 endif
 endif