diff options
-rw-r--r-- | package/glibc/Makefile | 6 | ||||
-rw-r--r-- | target/aarch64/systems/arm-fm | 2 | ||||
-rw-r--r-- | target/aarch64/systems/qemu-aarch64 | 2 | ||||
-rw-r--r-- | target/aarch64/systems/toolchain-aarch64 | 2 | ||||
-rw-r--r-- | target/arm/systems/linksys-nslu2 | 2 | ||||
-rw-r--r-- | target/arm/systems/qemu-arm | 2 | ||||
-rw-r--r-- | target/arm/systems/raspberry-pi | 2 | ||||
-rw-r--r-- | target/arm/systems/raspberry-pi2 | 2 | ||||
-rw-r--r-- | target/arm/systems/sharp-zaurus | 2 | ||||
-rw-r--r-- | target/arm/systems/solidrun-imx6 | 2 | ||||
-rw-r--r-- | target/config/Config.in.cpu | 26 | ||||
-rw-r--r-- | target/config/Config.in.endian.choice | 6 | ||||
-rw-r--r-- | target/config/Config.in.endian.default | 14 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.kernel | 4 | ||||
-rw-r--r-- | target/mips/systems/dragino-ms14s | 2 | ||||
-rw-r--r-- | target/mips/systems/mikrotik-rb4xx | 2 | ||||
-rw-r--r-- | target/mips/systems/mikrotik-rb532 | 2 | ||||
-rw-r--r-- | target/mips64/systems/lemote-yeelong | 2 | ||||
-rw-r--r-- | toolchain/gcc/Makefile | 2 |
20 files changed, 39 insertions, 47 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 6b15d1219..4d5190930 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -64,21 +64,21 @@ glibc-dev-install: # install linker script cp ./files/libc.so.$(ADK_TARGET_CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so ifeq ($(ADK_TARGET_ABI_O32),y) -ifeq ($(ADK_big),y) +ifeq ($(ADK_TARGET_BIG_ENDIAN),y) $(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so else $(SED) "s#@@ELFTARGET@@#elf32-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so endif endif ifeq ($(ADK_TARGET_ABI_N32),y) -ifeq ($(ADK_big),y) +ifeq ($(ADK_TARGET_BIG_ENDIAN),y) $(SED) "s#@@ELFTARGET@@#elf32-ntradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so else $(SED) "s#@@ELFTARGET@@#elf32-ntradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so endif endif ifeq ($(ADK_TARGET_ABI_N64),y) -ifeq ($(ADK_big),y) +ifeq ($(ADK_TARGET_BIG_ENDIAN),y) $(SED) "s#@@ELFTARGET@@#elf64-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so else $(SED) "s#@@ELFTARGET@@#elf64-tradlittlemips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm index a756dd8a5..ae988d021 100644 --- a/target/aarch64/systems/arm-fm +++ b/target/aarch64/systems/arm-fm @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_ARM_FM bool "ARMv8 Foundation Model" select ADK_aarch64 select ADK_arm_fm - select ADK_little + select ADK_TARGET_LITTLE_ENDIAN select ADK_LINUX_64 select ADK_CPU_CORTEX_A57 select ADK_TARGET_KERNEL_IMAGE diff --git a/target/aarch64/systems/qemu-aarch64 b/target/aarch64/systems/qemu-aarch64 index 38f30f8ec..0ae0bb578 100644 --- a/target/aarch64/systems/qemu-aarch64 +++ b/target/aarch64/systems/qemu-aarch64 @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_AARCH64 bool "Qemu Emulator" select ADK_aarch64 select ADK_qemu_aarch64 - select ADK_little + select ADK_TARGET_LITTLE_ENDIAN select ADK_LINUX_64 select ADK_CPU_CORTEX_A57 select ADK_TARGET_QEMU diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64 index c0a7272cf..4c63276de 100644 --- a/target/aarch64/systems/toolchain-aarch64 +++ b/target/aarch64/systems/toolchain-aarch64 @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64 bool "Toolchain only" select ADK_aarch64 select ADK_toolchain_aarch64 - select ADK_little + select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_CORTEX_A57 select ADK_LINUX_64 select ADK_TARGET_TOOLCHAIN diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 152855995..3b6a8b64a 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 bool "Linksys NSLU2" select ADK_arm - select ADK_big select ADK_linksys_nslu2 + select ADK_TARGET_BIG_ENDIAN select ADK_CPU_XSCALE select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/qemu-arm b/target/arm/systems/qemu-arm index dcaea67c7..770bdd4b1 100644 --- a/target/arm/systems/qemu-arm +++ b/target/arm/systems/qemu-arm @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM bool "Qemu Emulator" select ADK_arm select ADK_qemu_arm - select ADK_little + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index d6fd93baf..a1c5a072e 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI bool "Raspberry PI" select ADK_arm - select ADK_little select ADK_raspberry_pi + select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 93038cc11..4596c4643 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 bool "Raspberry PI 2" select ADK_arm - select ADK_little select ADK_raspberry_pi2 + select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_BOARD_BCM28XX diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index a5f76f308..ce8352078 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS bool "Sharp Zaurus CL3200 (Terrier)" select ADK_arm select ADK_sharp_zaurus - select ADK_little + select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index a1964a60d..ebda88096 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 bool "Solidrun IMX6 Embedded Systems" select ADK_arm - select ADK_little select ADK_solidrun_imx6 + select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_CORTEX_A9 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index a1fd577b9..39e94a4e0 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -337,12 +337,12 @@ config ADK_TARGET_CPU_FLAGS config ADK_TARGET_CPU_ARCH string - default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_little + default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_TARGET_LITTLE_ENDIAN default "alpha" if ADK_TARGET_ARCH_ALPHA - default "arm" if ADK_TARGET_ARCH_ARM && ADK_little - default "armeb" if ADK_TARGET_ARCH_ARM && ADK_big - default "arc" if ADK_TARGET_ARCH_ARC && ADK_little - default "arceb" if ADK_TARGET_ARCH_ARC && ADK_big + default "arm" if ADK_TARGET_ARCH_ARM && ADK_TARGET_LITTLE_ENDIAN + default "armeb" if ADK_TARGET_ARCH_ARM && ADK_TARGET_BIG_ENDIAN + default "arc" if ADK_TARGET_ARCH_ARC && ADK_TARGET_LITTLE_ENDIAN + default "arceb" if ADK_TARGET_ARCH_ARC && ADK_TARGET_BIG_ENDIAN default "avr32" if ADK_CPU_AVR32 default "bfin" if ADK_CPU_BFIN default "c6x" if ADK_CPU_C6X @@ -357,18 +357,18 @@ config ADK_TARGET_CPU_ARCH default "i686" if ADK_CPU_ATHLON default "hppa" if ADK_TARGET_ARCH_HPPA default "m68k" if ADK_TARGET_ARCH_M68K - default "microblaze" if ADK_TARGET_ARCH_MICROBLAZE && ADK_big - default "microblazeel" if ADK_TARGET_ARCH_MICROBLAZE && ADK_little - default "mips64" if ADK_TARGET_ARCH_MIPS64 && ADK_big - default "mips64el" if ADK_TARGET_ARCH_MIPS64 && ADK_little - default "mips" if ADK_TARGET_ARCH_MIPS && ADK_big - default "mipsel" if ADK_TARGET_ARCH_MIPS && ADK_little + default "microblaze" if ADK_TARGET_ARCH_MICROBLAZE && ADK_TARGET_BIG_ENDIAN + default "microblazeel" if ADK_TARGET_ARCH_MICROBLAZE && ADK_TARGET_LITTLE_ENDIAN + default "mips64" if ADK_TARGET_ARCH_MIPS64 && ADK_TARGET_BIG_ENDIAN + default "mips64el" if ADK_TARGET_ARCH_MIPS64 && ADK_TARGET_LITTLE_ENDIAN + default "mips" if ADK_TARGET_ARCH_MIPS && ADK_TARGET_BIG_ENDIAN + default "mipsel" if ADK_TARGET_ARCH_MIPS && ADK_TARGET_LITTLE_ENDIAN default "nios2" if ADK_TARGET_ARCH_NIOS2 default "ppc" if ADK_CPU_PPC default "ppc" if ADK_CPU_PPC_440 default "ppc64" if ADK_CPU_PPC64 - default "sh4" if ADK_TARGET_ARCH_SH && ADK_little - default "sh4eb" if ADK_TARGET_ARCH_SH && ADK_big + default "sh4" if ADK_TARGET_ARCH_SH && ADK_TARGET_LITTLE_ENDIAN + default "sh4eb" if ADK_TARGET_ARCH_SH && ADK_TARGET_BIG_ENDIAN default "sparc" if ADK_TARGET_ARCH_SPARC default "sparc64" if ADK_TARGET_ARCH_SPARC64 default "tilegx" if ADK_CPU_TILE diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice index a4249f85a..0017a0e55 100644 --- a/target/config/Config.in.endian.choice +++ b/target/config/Config.in.endian.choice @@ -15,11 +15,9 @@ depends on !ADK_TARGET_SYSTEM_QEMU_ARM depends on !ADK_TARGET_SYSTEM_LINKSYS_NSLU2 config ADK_TARGET_LITTLE_ENDIAN - boolean "Little endian" - select ADK_little + bool "Little endian" config ADK_TARGET_BIG_ENDIAN - boolean "Big endian" - select ADK_big + bool "Big endian" endchoice diff --git a/target/config/Config.in.endian.default b/target/config/Config.in.endian.default index 6599016eb..2ed3be897 100644 --- a/target/config/Config.in.endian.default +++ b/target/config/Config.in.endian.default @@ -1,18 +1,12 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -config ADK_big - boolean - -config ADK_little - boolean - config ADK_TARGET_ENDIAN string - default "little" if ADK_little - default "big" if ADK_big + default "little" if ADK_TARGET_LITTLE_ENDIAN + default "big" if ADK_TARGET_BIG_ENDIAN config ADK_JFFS2_OPTS string - default "-l" if ADK_little - default "-b" if ADK_big + default "-l" if ADK_TARGET_LITTLE_ENDIAN + default "-b" if ADK_TARGET_BIG_ENDIAN diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index d9d13a616..c08fac5c9 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -188,7 +188,7 @@ config ADK_KERNEL_PATA_MACIO depends on ADK_TARGET_SYSTEM_QEMU_PPC config ADK_KERNEL_PATA_PLATFORM - tristate + tristate "PATA platform driver" select ADK_KERNEL_SCSI select ADK_KERNEL_ATA select ADK_KERNEL_ATA_SFF diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 81f7cedeb..c6269056f 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -118,11 +118,11 @@ config ADK_KERNEL_THUMB2_KERNEL # endianess config ADK_KERNEL_CPU_BIG_ENDIAN bool - default y if ADK_big + default y if ADK_TARGET_BIG_ENDIAN config ADK_KERNEL_CPU_LITTLE_ENDIAN bool - default y if ADK_little + default y if ADK_TARGET_LITTLE_ENDIAN choice prompt "Kernel Compression" diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s index d46bee961..d96d37fe0 100644 --- a/target/mips/systems/dragino-ms14s +++ b/target/mips/systems/dragino-ms14s @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_DRAGINO_MS14S bool "Dragino2 ms14-s" select ADK_mips - select ADK_big select ADK_dragino_ms14s + select ADK_TARGET_BIG_ENDIAN select ADK_CPU_MIPS32 select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_NAND diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx index acb427c1b..d5ca50a63 100644 --- a/target/mips/systems/mikrotik-rb4xx +++ b/target/mips/systems/mikrotik-rb4xx @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX bool "Mikrotik Routerboard 4xx" select ADK_mips - select ADK_big select ADK_mikrotik_rb4xx + select ADK_TARGET_BIG_ENDIAN select ADK_CPU_MIPS32 select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_SERIAL diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532 index 3edda2d36..f78c5c518 100644 --- a/target/mips/systems/mikrotik-rb532 +++ b/target/mips/systems/mikrotik-rb532 @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532 bool "Mikrotik Routerboard 532" select ADK_mips - select ADK_little select ADK_mikrotik_rb532 + select ADK_TARGET_LITTLE_ENDIAN select ADK_CPU_MIPS32 select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_MINIPCI diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong index 65f400048..9b21db1cb 100644 --- a/target/mips64/systems/lemote-yeelong +++ b/target/mips64/systems/lemote-yeelong @@ -1,8 +1,8 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG bool "Lemote Yeelong laptop" select ADK_mips64 - select ADK_little select ADK_lemote_yeelong + select ADK_TARGET_LITTLE_ENDIAN select ADK_LINUX_64 select ADK_CPU_LOONGSON2F select ADK_TARGET_WITH_USB_BOOT diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 65899a334..b27497e87 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -114,7 +114,7 @@ GCC_FINAL_CONFOPTS+= --disable-biarch --disable-multilib endif ifeq ($(ADK_TARGET_ARCH_SH),y) -ifeq ($(ADK_little),y) +ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y) GCC_CONFOPTS+= --with-endian=little else GCC_CONFOPTS+= --with-endian=big |