...
 
Commits (7)
......@@ -145,7 +145,7 @@ menu "Libretro Cores"
source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-pokemini/Config.in"
source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-virtualjaguar/Config.in"
source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-uzem/Config.in"
source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-minivmac/Config.in
source "$BR2_EXTERNAL_RECALBOX_PATH/package/libretro-minivmac/Config.in"
endmenu
endif
menu "Doom packages"
......
......@@ -33,7 +33,7 @@ xu4_fusing() {
dd if="${BINARIES_DIR}/bl1.bin.hardkernel" of="${RECALBOXIMG}" seek=$signed_bl1_position conv=notrunc || return 1
echo "BL2 fusing"
dd if="${BINARIES_DIR}/bl2.bin.hardkernel" of="${RECALBOXIMG}" seek=$bl2_position conv=notrunc || return 1
dd if="${BINARIES_DIR}/bl2.bin.hardkernel.720k_uboot" of="${RECALBOXIMG}" seek=$bl2_position conv=notrunc || return 1
echo "u-boot fusing"
dd if="${BINARIES_DIR}/u-boot.bin.hardkernel" of="${RECALBOXIMG}" seek=$uboot_position conv=notrunc || return 1
......@@ -121,11 +121,18 @@ case "${RECALBOX_TARGET}" in
cp "${BINARIES_DIR}/rootfs.tar.xz" "${RECALBOX_BINARIES_DIR}/root.tar.xz" || exit 1
# boot.tar.xz
(cd "${BINARIES_DIR}" && tar -cJf "${RECALBOX_BINARIES_DIR}/boot.tar.xz" boot.ini zImage exynos5422-odroidxu3.dtb recalbox-boot.conf) || exit 1
(cd "${BINARIES_DIR}" && tar -cJf "${RECALBOX_BINARIES_DIR}/boot.tar.xz" boot.ini zImage exynos5422-odroidxu4.dtb recalbox-boot.conf) || exit 1
# The bl1.bin.hardkernel file provided by the uboot hardkernel repository is overwritten
# by the bl2.bin.hardkernel in the sd_fusing.sh script because it is too big.
# In order to implement this in genimage, we need to truncate the bl1.bin file
# so that it does not exceed the available place.
# An issue has been filled about this: https://github.com/hardkernel/u-boot/issues/45
truncate -s 15360 ${BINARIES_DIR}/bl1.bin.hardkernel
# recalbox.img
support/scripts/genimage.sh -c "${BR2_EXTERNAL_RECALBOX_PATH}/board/recalbox/xu4/genimage.cfg" || exit 1
xu4_fusing "${BINARIES_DIR}" "${BINARIES_DIR}/recalbox.img" || exit 1
#xu4_fusing "${BINARIES_DIR}" "${BINARIES_DIR}/recalbox.img" || exit 1
sync || exit 1
;;
......
ODROIDXU-UBOOT-CONFIG
# U-Boot Parameters (DO NOT MODIFY)
setenv version 3.10
setenv zimage zImage
setenv fdtbin exynos5422-odroidxu3.dtb
setenv fdtbin exynos5422-odroidxu4.dtb
# --- Screen Configuration for HDMI --- #
# ---------------------------------------
......@@ -117,19 +116,20 @@ setenv hdmi_phy_control "HPD=${HPD} vout=${vout}"
setenv zimage_addr_r 0x40008000
setenv fdtbin_addr_r 0x44000000
setenv initrd_high "0xffffffff"
setenv fdt_high "0xffffffff"
# Default boot argument
setenv bootrootfs "root=/dev/mmcblk0p2 rootwait ro"
setenv bootrootfs "root=/dev/mmcblk1p2 rootwait ro"
setenv console "console=ttySAC2,115200n8 consoleblank=0 vt.global_cursor_default=0"
# boot commands
fatload mmc 0:1 ${zimage_addr_r} ${zimage}
fatload mmc 0:1 ${fdtbin_addr_r} ${fdtbin}
setenv bootargs "${bootrootfs} ${console} governor=${governor} ${videoconfig} ${hdmi_phy_control}"
setenv bootcmd "load mmc 0:1 ${zimage_addr_r} ${zimage}; load mmc 0:1 ${fdtbin_addr_r} ${fdtbin}; bootz ${zimage_addr_r} - ${fdtbin_addr_r}"
fdt addr 0x44000000
if test "${cecenable}" = "false"; then fdt rm /cec@101B0000; fi
setenv bootargs "${bootrootfs} ${console} governor=${governor} ${videoconfig} ${hdmi_phy_control}"
# Boot the board
boot
bootz ${zimage_addr_r} - ${fdtbin_addr_r}
......@@ -4,7 +4,7 @@ image boot.vfat {
files = {
"boot.ini",
"zImage",
"exynos5422-odroidxu3.dtb",
"exynos5422-odroidxu4.dtb",
"recalbox-boot.conf"
}
}
......@@ -15,10 +15,38 @@ image recalbox.img {
hdimage {
}
partition bl1 {
in-partition-table = "no"
image = "bl1.bin.hardkernel"
offset = 512
size = 15360
}
partition bl2 {
in-partition-table = "no"
image = "bl2.bin.hardkernel.720k_uboot"
offset = 15872
size = 16384
}
partition u-boot {
in-partition-table = "no"
image = "u-boot-dtb.bin"
offset = 32256
size = 720k
}
partition tzsw {
in-partition-table = "no"
image = "tzsw.bin.hardkernel"
offset = 769536
size = 256k
}
partition vfat {
partition-type = 0xC
image = "boot.vfat"
offset = 646656
offset = 2097152
}
partition rootfs {
......
......@@ -30,13 +30,16 @@ BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/fsoverlay $(BR2
BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/recalbox-patch-target.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/copy-recalbox-archives.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,hardkernel,linux,47a5fc086ac384dbc813e63e4304aafb2442d5d0)/linux-47a5fc086ac384dbc813e63e4304aafb2442d5d0.tar.gz"
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/xu4/kernel_patches"
BR2_LINUX_KERNEL_DEFCONFIG="odroidxu3"
#BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
#BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,hardkernel,linux,47a5fc086ac384dbc813e63e4304aafb2442d5d0)/linux-47a5fc086ac384dbc813e63e4304aafb2442d5d0.tar.gz"
#BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/xu4/kernel_patches"
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="4.14.16-104"
BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/xu4/kernel-odroid-3.10-defconfig-fragment.config"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu3"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"
BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_RECALBOX_PATH)/board/recalbox/busybox.custom.config"
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
......@@ -219,7 +222,19 @@ BR2_PACKAGE_RECALBOX_THEMES=y
BR2_PACKAGE_RECALBOX_CONFIGGEN=y
BR2_PACKAGE_MOONLIGHT_EMBEDDED=y
BR2_PACKAGE_RECALBOX_MANAGER2=y
BR2_PACKAGE_UBOOT_XU4=y
BR2_PACKAGE_UBOOT_XU4=n
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_GIT=y
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/hardkernel/u-boot.git"
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="88af53fbcef8386cb4d5f04c19f4b2bcb69e90ca"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu4"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="sd_fuse/bl1.bin.hardkernel sd_fuse/bl2.bin.hardkernel.720k_uboot sd_fuse/tzsw.bin.hardkernel "
#
BR2_PACKAGE_MALI_T62X=y
BR2_PACKAGE_EVWAIT=y
BR2_PACKAGE_RECALBOX_EMULATIONSTATION2=y
......
......@@ -350,7 +350,7 @@ BR2_PACKAGE_LIBRETRO_BEETLE_PSX=y
BR2_PACKAGE_LIBRETRO_BEETLE_PSX_HW=y
BR2_PACKAGE_LIBRETRO_MAME2010=y
BR2_PACKAGE_LIBRETRO_MAME2015=y
BR2_PACKAGE_LIBRETRO_MAME2016=y
#BR2_PACKAGE_LIBRETRO_MAME2016=y
BR2_PACKAGE_LIBRETRO_DESMUME=y
BR2_PACKAGE_LIBRETRO_MELONDS=y
BR2_PACKAGE_LIBRETRO_PX68K=y
......
......@@ -351,7 +351,7 @@ BR2_PACKAGE_LIBRETRO_BEETLE_PSX=y
BR2_PACKAGE_LIBRETRO_BEETLE_PSX_HW=y
BR2_PACKAGE_LIBRETRO_MAME2010=y
BR2_PACKAGE_LIBRETRO_MAME2015=y
BR2_PACKAGE_LIBRETRO_MAME2016=y
#BR2_PACKAGE_LIBRETRO_MAME2016=y
BR2_PACKAGE_LIBRETRO_DESMUME=y
BR2_PACKAGE_LIBRETRO_MELONDS=y
BR2_PACKAGE_LIBRETRO_PX68K=y
......
......@@ -8,7 +8,7 @@ RETROARCH_VERSION = v1.7.7
RETROARCH_SITE = git://github.com/libretro/RetroArch.git
RETROARCH_SITE_METHOD = git
RETROARCH_LICENSE = GPLv3+
RETROARCH_CONF_OPTS += --disable-oss --enable-zlib
RETROARCH_CONF_OPTS += --disable-oss --enable-zlib --disable-opengl1 --disable-opengl
RETROARCH_DEPENDENCIES = host-pkgconf recalbox-system
ifeq ($(BR2_PACKAGE_SDL2),y)
......@@ -43,12 +43,12 @@ endif
# Add dispamnx renderer and no opengl1.1 for Pi
ifeq ($(BR2_PACKAGE_RPI_FIRMWARE),y)
RETROARCH_CONF_OPTS += --enable-dispmanx --disable-opengl1
RETROARCH_CONF_OPTS += --enable-dispmanx
endif
# odroid xu4
ifeq ($(BR2_PACKAGE_RECALBOX_TARGET_XU4),y)
RETROARCH_CONF_OPTS += --enable-floathard --disable-opengl1 --disable-opengl
RETROARCH_CONF_OPTS += --enable-floathard
endif
# x86 : SSE
......@@ -148,13 +148,23 @@ RETROARCH_PRE_CONFIGURE_HOOKS += RETROARCH_MALI_FIXUP
RETROARCH_CONF_OPTS += --enable-opengles --enable-mali_fbdev
endif
ifeq ($(BR2_i386),y)
RETROARCH_COMPILER_COMMONS_CFLAGS = $(COMPILER_COMMONS_CFLAGS_NOLTO)
RETROARCH_COMPILER_COMMONS_CXXFLAGS = $(COMPILER_COMMONS_CXXFLAGS_NOLTO)
RETROARCH_COMPILER_COMMONS_LDFLAGS = $(COMPILER_COMMONS_LDFLAGS_NOLTO)
else
RETROARCH_COMPILER_COMMONS_CFLAGS = $(COMPILER_COMMONS_CFLAGS_SO)
RETROARCH_COMPILER_COMMONS_CXXFLAGS = $(COMPILER_COMMONS_CXXFLAGS_SO)
RETROARCH_COMPILER_COMMONS_LDFLAGS = $(COMPILER_COMMONS_LDFLAGS_SO)
endif
define RETROARCH_CONFIGURE_CMDS
(cd $(@D); rm -rf config.cache; \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(COMPILER_COMMONS_CFLAGS_SO)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(COMPILER_COMMONS_CXXFLAGS_SO)" \
LDFLAGS="$(TARGET_LDFLAGS) $(COMPILER_COMMONS_LDFLAGS_SO) -lc" \
CFLAGS="$(TARGET_CFLAGS) $(RETROARCH_COMPILER_COMMONS_CFLAGS)" \
CXXFLAGS="$(TARGET_CXXFLAGS) $(RETROARCH_COMPILER_COMMONS_CXXFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) $(RETROARCH_COMPILER_COMMONS_LDFLAGS) -lc" \
CROSS_COMPILE="$(HOST_DIR)/bin/" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig/" \
./configure \
......
......@@ -4,16 +4,16 @@
#
################################################################################
UBOOT_XU4_VERSION = 8a47b2602ed2e348ed2a57dc2cd874c4605c538d
UBOOT_XU4_VERSION = 88af53fbcef8386cb4d5f04c19f4b2bcb69e90ca
UBOOT_XU4_SITE = $(call github,hardkernel,u-boot,$(UBOOT_XU4_VERSION))
UBOOT_XU4_INSTALL_TARGET = NO
UBOOT_XU4_INSTALL_IMAGES = YES
define UBOOT_XU4_INSTALL_IMAGES_CMDS
cp -dpf $(@D)/sd_fuse/hardkernel/u-boot.bin.hardkernel \
$(@D)/sd_fuse/hardkernel/bl1.bin.hardkernel \
$(@D)/sd_fuse/hardkernel/bl2.bin.hardkernel \
$(@D)/sd_fuse/hardkernel/tzsw.bin.hardkernel \
cp -dpf $(@D)/sd_fuse/u-boot.bin.hardkernel \
$(@D)/sd_fuse/bl1.bin.hardkernel \
$(@D)/sd_fuse/bl2.bin.hardkernel.720k_uboot \
$(@D)/sd_fuse/tzsw.bin.hardkernel \
$(BINARIES_DIR)
endef
$(eval $(generic-package))