odroidn2: back to hk uboot

Signed-off-by: Nicolas Adenis-Lamarre <nicolas.adenis.lamarre@gmail.com>

Author: nadenislamarre

Config.in

@@ -19,6 +19,7 @@ menu "System"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-xu4/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-goa/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-amlogic/Config.in"
+    source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/uboot-odroid-n2/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rockpro64-blobs/Config.in"
     source "$BR2_EXTERNAL_BATOCERA_PATH/package/batocera/boot/rock960-blobs/Config.in"
   endmenu

board/batocera/amlogic/odroidn2/genimage.cfg

@@ -3,7 +3,7 @@ image boot.vfat {
 			extraargs = "-F 32 -n BATOCERA"
 			file boot/linux                         { image = 'boot/linux' }
 			file boot/batocera                      { image = 'boot/batocera' }
-	                file boot/initrd.gz                     { image = 'boot/initrd.gz' }
+	                file boot/uInitrd                       { image = 'boot/uInitrd' }
 			file boot/meson-g12b-odroid-n2.dtb      { image = 'boot/meson-g12b-odroid-n2.dtb' }
 			file boot/meson-g12b-odroid-n2_plus.dtb { image = 'boot/meson-g12b-odroid-n2_plus.dtb'}
 			file boot/extlinux/extlinux.conf        { image = 'boot/extlinux.conf' }
@@ -48,8 +48,8 @@ image batocera.img {
 
        partition part_uboot {
                in-partition-table = "no"
-               image = "u-boot.bin.sd.bin"
-               offset = 0
+               image = "u-boot.bin"
+               offset = 512
        }
 
 	partition vfat {

board/batocera/amlogic/odroidn2/post-image-script-odroidn2.sh

@@ -28,15 +28,15 @@ cp "${BINARIES_DIR}/batocera-boot.conf"                "${BINARIES_DIR}/boot/bat
 cp "${BINARIES_DIR}/uImage"                            "${BINARIES_DIR}/boot/boot/linux"                            || exit 1
 cp "${BINARIES_DIR}/meson-g12b-odroid-n2.dtb"          "${BINARIES_DIR}/boot/boot/meson-g12b-odroid-n2.dtb"         || exit 1
 cp "${BINARIES_DIR}/meson-g12b-odroid-n2-plus.dtb"     "${BINARIES_DIR}/boot/boot/meson-g12b-odroid-n2_plus.dtb"    || exit 1
-cp "${BINARIES_DIR}/initrd.gz"                         "${BINARIES_DIR}/boot/boot/initrd.gz"                        || exit 1
+cp "${BINARIES_DIR}/uInitrd"                           "${BINARIES_DIR}/boot/boot/uInitrd"                          || exit 1
 cp "${BINARIES_DIR}/rootfs.squashfs"                   "${BINARIES_DIR}/boot/boot/batocera.update"                  || exit 1
 cp "${BOARD_DIR}/boot/extlinux.conf"                   "${BINARIES_DIR}/boot/extlinux"                              || exit 1
 cp "${BINARIES_DIR}/u-boot.bin"                        "${BINARIES_DIR}/boot/u-boot.bin"                            || exit 1
 cp "${BOARD_DIR}/boot/extlinux.conf"                   "${BINARIES_DIR}/boot/boot/extlinux.conf"                    || exit 1
 cp "${BOARD_DIR}/boot/boot.ini"                        "${BINARIES_DIR}/boot/boot.ini"                              || exit 1
 cp "${BOARD_DIR}/boot/config.ini"                      "${BINARIES_DIR}/boot/config.ini"                            || exit 1
 cp -pr "${BINARIES_DIR}/tools"                         "${BINARIES_DIR}/boot/" || exit 1
-cp "${BINARIES_DIR}/u-boot.bin.sd.bin"                  "${BINARIES_DIR}/boot/" || exit 1
+cp "${BINARIES_DIR}/u-boot.bin"                        "${BINARIES_DIR}/boot/" || exit 1
 
 # boot.tar.xz
 echo "creating boot.tar.xz"

configs/batocera-odroidn2_defconfig

@@ -72,12 +72,13 @@ BR2_PACKAGE_MALI_G52=y
 BR2_PACKAGE_UBOOT_AMLOGIC=y
 
 # Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
+#BR2_TARGET_UBOOT=y
+#BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+#BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+#BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+#BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2"
+#BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_PACKAGE_UBOOT_ODROID_N2=y
 
 # Required tools to create the SD image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y

package/batocera/boot/uboot-odroid-n2/Config.in

@@ -0,0 +1,4 @@
+config BR2_PACKAGE_UBOOT_ODROID_N2
+        bool "uboot files for odroid n2"
+        help
+          uboot files for odroid n2

package/batocera/boot/uboot-odroid-n2/uboot-odroid-n2.mk

@@ -0,0 +1,15 @@
+################################################################################
+#
+# uboot files for odroid n2
+#
+################################################################################
+# Version.: Commits on Mar 28, 2020
+UBOOT_ODROID_N2_VERSION = 141
+UBOOT_ODROID_N2_SOURCE = u-boot-odroidn2-$(UBOOT_ODROID_N2_VERSION).tar.gz
+UBOOT_ODROID_N2_SITE = https://github.com/hardkernel/u-boot/releases/download/travis%2Fodroidn2-$(UBOOT_ODROID_N2_VERSION)
+
+define UBOOT_ODROID_N2_INSTALL_TARGET_CMDS
+	cp $(@D)/u-boot.bin $(BINARIES_DIR)/u-boot.bin
+endef
+
+$(eval $(generic-package))