...
 
Commits (7)
......@@ -103,6 +103,9 @@ menuconfig: .ember_create_dirs .ember_prepare_br
savedefconfig:
@$(MAKE) O=$(OUTPUT_DIR) BR2_EXTERNAL=$(EXTERNAL_DIR) $@ -C $(BR_TOP_DIR)
%-build: .ember_create_dirs .ember_prepare_br
@$(MAKE) O=$(OUTPUT_DIR) BR2_EXTERNAL=$(EXTERNAL_DIR) `basename -s -build $@` -C $(BR_TOP_DIR)
%_defconfig: .ember_create_dirs .ember_prepare_br
@$(MAKE) O=$(OUTPUT_DIR) BR2_EXTERNAL=$(EXTERNAL_DIR) $@ -C $(BR_TOP_DIR)
......@@ -132,6 +135,7 @@ help:
@echo ' savedefconfig - generate defconfig based configuration (make savedefconfig)'
@echo
@echo ' Package options:'
@echo ' *-build - build package (make foo-build)'
@echo ' *-dirclean - delete build directory (make foo-dirclean)'
@echo ' *-menuconfig - configure build options (make foo-menuconfig)'
@echo
......
......@@ -20,7 +20,6 @@ EmbER is a free program that relies on donations to survive, these donations hel
**TODO**
- Implement live OTA
- Add support to build Aarch64 kernel in 32-bit userspace
- Add retroarch and emulationstation packages
- Add LibreELEC settings addon
- Add EmbERMod skin for Kodi
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
index ca07f1e4eb..4fdcbe3836 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
@@ -551,7 +551,7 @@ bool CAESinkALSA::Initialize(AEAudioFormat &format, std::string &device)
if (aml_present())
{
aml_set_audio_passthrough(m_passthrough);
-#if !defined(__aarch64__)
+#if 0
device = "default";
#endif
}
@@ -1409,7 +1409,7 @@ void CAESinkALSA::EnumerateDevice(AEDeviceInfoList &list, const std::string &dev
if (snd_card_get_name(cardNr, &cardName) == 0)
info.m_displayName = cardName;
-#if defined(HAS_LIBAMCODEC) && !defined(__aarch64__)
+#if 0
if (aml_present())
info.m_deviceType = AE_DEVTYPE_IEC958;
#endif
diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
index b8b21c0690..180b53b03a 100644
--- a/xbmc/utils/CPUInfo.cpp
+++ b/xbmc/utils/CPUInfo.cpp
@@ -641,7 +641,7 @@ bool CCPUInfo::getTemperature(CTemperature& temperature)
if (!ret)
{
ret = fscanf(m_fProcTemperature, "%d", &value);
-#if defined(HAS_LIBAMCODEC) && defined(__arm__)
+#if 0
if (!aml_present())
#endif
value = value / 1000;
......@@ -4,8 +4,6 @@ BR2_ARM_FPU_NEON_FP_ARMV8=y
BR2_OPTIMIZE_3=y
BR2_TOOLCHAIN_BUILDROOT_VENDOR="EmbER"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.14.29"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_GLIBC_VERSION_2_25=y
BR2_BINUTILS_VERSION_2_28_X=y
......@@ -105,6 +103,7 @@ BR2_PACKAGE_KODI_LIBSSH=y
BR2_PACKAGE_KODI_LIBTHEORA=y
BR2_PACKAGE_KODI_UPNP=y
BR2_PACKAGE_KODI_EXP_PATCHES=y
BR2_PACKAGE_KODI_CUS_PATCH_DIR="$(BR2_EXTERNAL_EmbER_PATH)/board/amlogic/patches/kodi"
BR2_PACKAGE_KODI_CUS_SETTINGS="ember_settings.xml"
BR2_PACKAGE_KODI_ADV_SETTINGS="amlogic_2gb_advancedsettings.xml"
BR2_PACKAGE_KODI_KEYMAP="variant.ember64.keyboard.xml"
......
......@@ -2,8 +2,6 @@ BR2_aarch64=y
BR2_OPTIMIZE_3=y
BR2_TOOLCHAIN_BUILDROOT_VENDOR="EmbER"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.14.29"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_GLIBC_VERSION_2_25=y
BR2_BINUTILS_VERSION_2_28_X=y
......
......@@ -2,8 +2,6 @@ BR2_aarch64=y
BR2_OPTIMIZE_3=y
BR2_TOOLCHAIN_BUILDROOT_VENDOR="EmbER"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.14.29"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_GLIBC_VERSION_2_25=y
BR2_BINUTILS_VERSION_2_28_X=y
......
......@@ -2,8 +2,6 @@ BR2_aarch64=y
BR2_OPTIMIZE_3=y
BR2_TOOLCHAIN_BUILDROOT_VENDOR="EmbER"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.14.29"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_GLIBC_VERSION_2_25=y
BR2_BINUTILS_VERSION_2_28_X=y
......
......@@ -2,8 +2,6 @@ BR2_aarch64=y
BR2_OPTIMIZE_3=y
BR2_TOOLCHAIN_BUILDROOT_VENDOR="EmbER"
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.14.29"
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_GLIBC_VERSION_2_25=y
BR2_BINUTILS_VERSION_2_28_X=y
......
......@@ -11,18 +11,20 @@ MALI_INSTALL_STAGING = YES
ifneq ($(BR2_BOARD_TYPE_AMLOGIC_GX),)
KVER = 3.14.x
LIB = mali450-arm64.so
else
KVER = 3.10.x
UMP = driver/$(KVER)/ump
UMP_ = ump_
UMP_OPTS = CONFIG_UMP=m
ifneq ($(BR2_BOARD_TYPE_AMLOGIC_M8),)
endif
ifeq ($(BR2_arm)$(BR2_BOARD_TYPE_AMLOGIC_GX)$(BR2_BOARD_TYPE_AMLOGIC_M8),yy)
LIB = mali450-armhf.so
else ifeq ($(BR2_BOARD_TYPE_AMLOGIC_GX),y)
LIB = mali450-arm64.so
else
LIB = mali400-armhf.so
endif
endif
MALI_MODULE_SUBDIRS = driver/$(KVER)/mali $(UMP)
MALI_MODULE_MAKE_OPTS = CONFIG_MALI400=m $(UMP_OPTS)
......
......@@ -40,15 +40,17 @@ index c110384a9..18b37dd28 100644
config BR2_LINUX_KERNEL_LINUX_BIN
bool "linux.bin"
diff --git a/linux/linux.mk b/linux/linux.mk
index 9da7e9bec..0760b3c7a 100644
index 9da7e9bec..be181c30d 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -86,12 +86,16 @@ ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)
@@ -86,12 +86,18 @@ ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)
LINUX_DEPENDENCIES += host-uboot-tools
endif
+TARGET_KERNEL_CROSS = $(TARGET_CROSS)
+ifeq ($(BR2_LINUX_BUILD_ARM64_KERNEL),y)
+LINUX_DEPENDENCIES += host-linaro-aarch64-toolchain
+TARGET_KERNEL_CROSS = $(HOST_DIR)/usr/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
+endif
+
LINUX_MAKE_FLAGS = \
......@@ -61,36 +63,17 @@ index 9da7e9bec..0760b3c7a 100644
DEPMOD=$(HOST_DIR)/sbin/depmod
LINUX_MAKE_ENV = \
diff --git a/package/Makefile.in b/package/Makefile.in
index b32ad8e44..a4bfcbaad 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -187,6 +187,12 @@ else
TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
endif
+ifeq ($(BR2_LINUX_BUILD_ARM64_KERNEL),y)
+TARGET_KERNEL_CROSS = $(HOST_DIR)/usr/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
+else
+TARGET_KERNEL_CROSS = $(TARGET_CROSS)
+endif
+
# Define TARGET_xx variables for all common binutils/gcc
TARGET_AR = $(TARGET_CROSS)ar
TARGET_AS = $(TARGET_CROSS)as
diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
index 566043935..2dcbbf89f 100644
index 566043935..1f2aa1957 100644
--- a/package/linux-headers/linux-headers.mk
+++ b/package/linux-headers/linux-headers.mk
@@ -100,10 +100,17 @@ LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
@@ -100,10 +100,15 @@ LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
# This step is required to have a separate linux headers location for
# uClibc building. This way uClibc doesn't modify linux headers on installation
# of "its" headers
+
+LINUX_HEADERS_ARCH = $(KERNEL_ARCH)
+ifeq ($(BR2_LINUX_BUILD_ARM64_KERNEL),y)
+LINUX_HEADERS_ARCH = arm
+else
+LINUX_HEADERS_ARCH = $(KERNEL_ARCH)
+endif
+
define LINUX_HEADERS_CONFIGURE_CMDS
......@@ -101,7 +84,7 @@ index 566043935..2dcbbf89f 100644
HOSTCC="$(HOSTCC)" \
HOSTCFLAGS="$(HOSTCFLAGS)" \
HOSTCXX="$(HOSTCXX)" \
@@ -114,7 +121,7 @@ endef
@@ -114,7 +119,7 @@ endef
define LINUX_HEADERS_INSTALL_STAGING_CMDS
(cd $(@D); \
$(TARGET_MAKE_ENV) $(MAKE) \
......@@ -110,3 +93,17 @@ index 566043935..2dcbbf89f 100644
HOSTCC="$(HOSTCC)" \
HOSTCFLAGS="$(HOSTCFLAGS)" \
HOSTCXX="$(HOSTCXX)" \
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index f47470498..345a56b49 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -96,7 +96,9 @@ define check_bin_arch
-a $(BR2_READELF_ARCH_NAME))
endef
+ifneq ($(BR2_LINUX_BUILD_ARM64_KERNEL),y)
GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch
+endif
# This hook checks that host packages that need libraries that we build
# have a proper DT_RPATH or DT_RUNPATH tag