From 3f79a66f3fbe2c8d6b595c2dde6e36e06c1e19f0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Apr 2015 08:13:08 -0500 Subject: remove -C $(LINUX_DIR) from OPTS variable Otherwise toolchain only compiling of gcc is failing while trying to install header files. --- target/arm/Makefile | 6 +++--- target/ppc/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/arm/Makefile b/target/arm/Makefile index 0e7441090..93777af2c 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -114,13 +114,13 @@ kernel-install: kernel-strip dtb-install: ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) - env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE) + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y) - env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE) + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \ + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE) endif for x in $(LINUX_DIR)/arch/arm/boot/dts/*.dtb; do \ diff --git a/target/ppc/Makefile b/target/ppc/Makefile index 9a5529642..2f9ed8bf1 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -71,7 +71,7 @@ kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} dtb-install: - env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \ + env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ -j${ADK_MAKE_JOBS} virtex440-ml507.dtb $(MAKE_TRACE) $(CP) $(LINUX_DIR)/arch/powerpc/boot/virtex440-ml507.dtb \ $(FW_DIR)/ppc.dtb -- cgit v1.2.3 From b740a110d070e065a1129a9612f2b1d5ff77524f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Apr 2015 12:13:50 -0500 Subject: refactor LINUX_64 support, hide symbol for developers of boards --- target/aarch64/systems/arm-fm | 3 +-- target/aarch64/systems/qemu-aarch64 | 3 +-- target/aarch64/systems/toolchain-aarch64 | 3 +-- target/alpha/systems/qemu-alpha | 1 - target/alpha/systems/toolchain-alpha | 1 - target/arm/systems/linksys-nslu2 | 2 +- target/arm/systems/raspberry-pi | 2 +- target/arm/systems/raspberry-pi2 | 2 +- target/arm/systems/sharp-zaurus | 2 +- target/arm/systems/solidrun-imx6 | 2 +- target/avr32/systems/atmel-ngw100 | 2 +- target/c6x/systems/toolchain-c6x | 2 +- target/config/Config.in.cpu | 12 ++++++++++++ target/m68k/systems/qemu-m68k | 2 +- target/mips/systems/dragino-ms14s | 2 +- target/mips/systems/mikrotik-rb4xx | 2 +- target/mips/systems/mikrotik-rb532 | 2 +- target/mips64/systems/lemote-yeelong | 3 +-- target/mips64/systems/qemu-mips64 | 1 - target/mips64/systems/toolchain-mips64 | 1 - target/ppc64/systems/qemu-ppc64 | 1 - target/ppc64/systems/toolchain-ppc64 | 1 - target/sparc64/systems/qemu-sparc64 | 1 - target/sparc64/systems/toolchain-sparc64 | 1 - target/x86_64/systems/pcengines-apu | 1 - target/x86_64/systems/qemu-x86_64 | 1 - target/x86_64/systems/toolchain-x86_64 | 1 - toolchain/gcc/Makefile | 5 ++--- 28 files changed, 29 insertions(+), 33 deletions(-) (limited to 'target') diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm index abd335767..441e0c66c 100644 --- a/target/aarch64/systems/arm-fm +++ b/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 diff --git a/target/aarch64/systems/qemu-aarch64 b/target/aarch64/systems/qemu-aarch64 index 4d455beb7..6e0092b1d 100644 --- a/target/aarch64/systems/qemu-aarch64 +++ b/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 diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64 index c53324d22..b23b056df 100644 --- a/target/aarch64/systems/toolchain-aarch64 +++ b/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 diff --git a/target/alpha/systems/qemu-alpha b/target/alpha/systems/qemu-alpha index 74684c047..8c540d2e2 100644 --- a/target/alpha/systems/qemu-alpha +++ b/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 diff --git a/target/alpha/systems/toolchain-alpha b/target/alpha/systems/toolchain-alpha index 78abdad98..efa21c747 100644 --- a/target/alpha/systems/toolchain-alpha +++ b/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 diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 1133eb00b..9fb12ee34 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/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 diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index 049b4dcac..96f2fe1f5 100644 --- a/target/arm/systems/raspberry-pi +++ b/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 diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 702aae0f5..da6a8265c 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/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 diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index 568b41865..ee18de579 100644 --- a/target/arm/systems/sharp-zaurus +++ b/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 diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index ae32b3a1b..acc5ccc78 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/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 diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100 index 1ed2d216e..4433184fa 100644 --- a/target/avr32/systems/atmel-ngw100 +++ b/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 diff --git a/target/c6x/systems/toolchain-c6x b/target/c6x/systems/toolchain-c6x index 02ac571ec..78093e92d 100644 --- a/target/c6x/systems/toolchain-c6x +++ b/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 diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 1dcd72fd0..43c610a2d 100644 --- a/target/config/Config.in.cpu +++ b/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 diff --git a/target/m68k/systems/qemu-m68k b/target/m68k/systems/qemu-m68k index a33a1b729..a8f35ee3b 100644 --- a/target/m68k/systems/qemu-m68k +++ b/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 diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s index 112e2cd01..67fec9b50 100644 --- a/target/mips/systems/dragino-ms14s +++ b/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 diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx index 87886524a..3954738f4 100644 --- a/target/mips/systems/mikrotik-rb4xx +++ b/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 diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532 index 55688d288..1fe4159fc 100644 --- a/target/mips/systems/mikrotik-rb532 +++ b/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 diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong index bdb835fab..2a01dff07 100644 --- a/target/mips64/systems/lemote-yeelong +++ b/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 diff --git a/target/mips64/systems/qemu-mips64 b/target/mips64/systems/qemu-mips64 index feffc6322..eda927cfd 100644 --- a/target/mips64/systems/qemu-mips64 +++ b/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 diff --git a/target/mips64/systems/toolchain-mips64 b/target/mips64/systems/toolchain-mips64 index 89cf048b2..5b92b796a 100644 --- a/target/mips64/systems/toolchain-mips64 +++ b/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 diff --git a/target/ppc64/systems/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64 index 29038a6a4..cee9c5a6c 100644 --- a/target/ppc64/systems/qemu-ppc64 +++ b/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. diff --git a/target/ppc64/systems/toolchain-ppc64 b/target/ppc64/systems/toolchain-ppc64 index 3bac81c5e..389c71007 100644 --- a/target/ppc64/systems/toolchain-ppc64 +++ b/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 diff --git a/target/sparc64/systems/qemu-sparc64 b/target/sparc64/systems/qemu-sparc64 index f8be214a1..9079671dc 100644 --- a/target/sparc64/systems/qemu-sparc64 +++ b/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 diff --git a/target/sparc64/systems/toolchain-sparc64 b/target/sparc64/systems/toolchain-sparc64 index f6b62d285..9a86635bf 100644 --- a/target/sparc64/systems/toolchain-sparc64 +++ b/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 diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu index 980a87265..6159eda1c 100644 --- a/target/x86_64/systems/pcengines-apu +++ b/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 diff --git a/target/x86_64/systems/qemu-x86_64 b/target/x86_64/systems/qemu-x86_64 index ad051030e..1c96e03d5 100644 --- a/target/x86_64/systems/qemu-x86_64 +++ b/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 diff --git a/target/x86_64/systems/toolchain-x86_64 b/target/x86_64/systems/toolchain-x86_64 index 31fb45964..de11ff163 100644 --- a/target/x86_64/systems/toolchain-x86_64 +++ b/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 diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 6285b2af6..caa4b2437 100644 --- a/toolchain/gcc/Makefile +++ b/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 -- cgit v1.2.3 From 8cbbd126e2608735bf50135b21778a21cc4c2dc9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Apr 2015 13:42:00 -0500 Subject: add some basic banana pro support --- package/u-boot-git/Makefile | 78 ++++++++++++++++++++++++++++++++ package/u-boot-git/files/fw_env.config | 1 + package/u-boot-git/files/uboot_print_env | 5 ++ package/u-boot-git/files/uboot_set_env | 5 ++ scripts/install.sh | 7 ++- target/arm/Makefile | 6 +++ target/arm/kernel/banana-pro | 7 +++ target/arm/systems/banana-pro | 19 ++++++++ target/config/Config.in.kernel | 2 +- 9 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 package/u-boot-git/Makefile create mode 100644 package/u-boot-git/files/fw_env.config create mode 100755 package/u-boot-git/files/uboot_print_env create mode 100755 package/u-boot-git/files/uboot_set_env create mode 100644 target/arm/kernel/banana-pro create mode 100644 target/arm/systems/banana-pro (limited to 'target') diff --git a/package/u-boot-git/Makefile b/package/u-boot-git/Makefile new file mode 100644 index 000000000..d5f22ba97 --- /dev/null +++ b/package/u-boot-git/Makefile @@ -0,0 +1,78 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= u-boot-git +PKG_VERSION:= d8c1d5d5fb6eafbc532982125f006e49f2c40e71 +PKG_RELEASE:= 1 +PKG_DESCR:= portable bootloader +PKG_SECTION:= base/boot +HOST_BUILDDEP:= openssl-host +PKG_BUILDDEP:= u-boot-host +PKG_URL:= http://www.denx.de/wiki/U-Boot +PKG_SITES:= git://git.denx.de/u-boot.git + +PKG_CFLINE_U_BOOT_GIT:= select ADK_KERNEL_ATAGS if ADK_TARGET_ARCH_ARM +PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 atmel-ngw100 banana-pro + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +UBOOT:= u-boot.bin +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) +CONFIG:= rpi_defconfig +endif +ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y) +CONFIG:= rpi_defconfig +endif +ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y) +CONFIG:= atngw100_defconfig +endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) +CONFIG:= Bananapro_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin +endif + +HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ + HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" +HOST_STYLE:= manual +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +host-build: + (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ + $(HOST_MAKE_FLAGS) sandbox_defconfig ) + (cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \ + $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) ) + +u-boot-git-hostinstall: + $(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \ + $(STAGING_HOST_DIR)/usr/bin + +do-configure: + (cd $(WRKBUILD) && $(MAKE) $(CONFIG)) + +do-build: + (cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \ + GCC_HONOUR_COPTS=s $(MAKE)) + #(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \ + # GCC_HONOUR_COPTS=s $(MAKE) env) + +u-boot-git-install: + $(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR) + $(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/etc + $(CP) ./files/fw_env.config $(IDIR_U_BOOT_GIT)/etc + $(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/usr/bin + #$(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \ + # $(IDIR_U_BOOT_GIT)/usr/bin + #(cd $(IDIR_U_BOOT_GIT)/usr/bin && ln -sf fw_printenv fw_setenv) + #$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT_GIT)/usr/bin + #$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT_GIT)/usr/bin + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/u-boot-git/files/fw_env.config b/package/u-boot-git/files/fw_env.config new file mode 100644 index 000000000..5571d60e0 --- /dev/null +++ b/package/u-boot-git/files/fw_env.config @@ -0,0 +1 @@ +/mnt/uboot.env 0x0000 0x4000 diff --git a/package/u-boot-git/files/uboot_print_env b/package/u-boot-git/files/uboot_print_env new file mode 100755 index 000000000..7231e1a47 --- /dev/null +++ b/package/u-boot-git/files/uboot_print_env @@ -0,0 +1,5 @@ +#!/bin/sh + +mount -r /dev/mmcblk0p1 /mnt +fw_printenv "$@" +umount /mnt diff --git a/package/u-boot-git/files/uboot_set_env b/package/u-boot-git/files/uboot_set_env new file mode 100755 index 000000000..7b5a33ccc --- /dev/null +++ b/package/u-boot-git/files/uboot_set_env @@ -0,0 +1,5 @@ +#!/bin/sh + +mount /dev/mmcblk0p1 /mnt +fw_setenv "$@" +umount /mnt diff --git a/scripts/install.sh b/scripts/install.sh index 7df634213..6d27c4854 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -142,7 +142,7 @@ tgt=$2 src=$3 case $target { -(raspberry-pi|raspberry-pi2|solidrun-imx6|default) ;; +(banana-pro|raspberry-pi|raspberry-pi2|solidrun-imx6|default) ;; (*) print -u2 "Unknown target '$target', exiting" exit 1 ;; @@ -499,6 +499,9 @@ dd if="$T/firsttrack" of="$tgt" > /dev/null 2>&1 fwdir=$(dirname "$src") case $target { +(banana-pro) + dd if="$fwdir/u-boot-sunxi-with-spl.bin" of="$tgt" bs=1024 seek=8 > /dev/null 2>&1 + ;; (solidrun-imx6) dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 > /dev/null 2>&1 dd if="$fwdir/u-boot.img" of="$tgt" bs=1024 seek=42 > /dev/null 2>&1 @@ -523,7 +526,7 @@ if (( datafssz )); then (raspberry-pi|raspberry-pi2) echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >> "$R"/etc/fstab ;; - (solidrun-imx6) + (banana-pro|solidrun-imx6) echo "/dev/mmcblk0p2 /data ext4 rw 0 0" >> "$R"/etc/fstab ;; } diff --git a/target/arm/Makefile b/target/arm/Makefile index 93777af2c..6b2a8ee79 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -55,6 +55,12 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y) @echo "Use following command to install with a writable data partition" @echo "sudo ./scripts/install.sh -d 256 raspberry-pi2 /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) + @echo "Use following command to install it on SD card:" + @echo "sudo ./scripts/install.sh banana-pro /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "Use following command to install with a writable data partition" + @echo "sudo ./scripts/install.sh -d 256 banana-pro /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" +endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) ifeq ($(ADK_APPLIANCE_KODI),y) @echo "Use following command to install with a writable data partition" diff --git a/target/arm/kernel/banana-pro b/target/arm/kernel/banana-pro new file mode 100644 index 000000000..c06104359 --- /dev/null +++ b/target/arm/kernel/banana-pro @@ -0,0 +1,7 @@ +CONFIG_ARM=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_SUN7I=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_SUNXI=y diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro new file mode 100644 index 000000000..d4e687a92 --- /dev/null +++ b/target/arm/systems/banana-pro @@ -0,0 +1,19 @@ +config ADK_TARGET_SYSTEM_BANANA_PRO + bool "Banana Pro" + select ADK_CPU_CORTEX_A7 + select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_WITH_NEON + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_WITH_CPU_FREQ + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_SD + select ADK_TARGET_WITH_I2C + select ADK_TARGET_WITH_SPI + select ADK_TARGET_WITH_SMP + select ADK_TARGET_WITH_ROOT_RW + select ADK_TARGET_KERNEL_ZIMAGE + select ADK_PACKAGE_U_BOOT_GIT + help + Banana Pro diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index 8e96264d0..0495a75ef 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -74,4 +74,4 @@ config ADK_TARGET_KERNEL_MINICONFIG default "atmel-ngw100" if ADK_TARGET_SYSTEM_ATMEL_NGW100 default "apple-macmini" if ADK_TARGET_SYSTEM_APPLE_MACMINI default "sun-voyager" if ADK_TARGET_SYSTEM_SUN_VOYAGER - + default "banana-pro" if ADK_TARGET_SYSTEM_BANANA_PRO -- cgit v1.2.3