From ef40d38b12df5247acdb15dc5e341c38a025a9c0 Mon Sep 17 00:00:00 2001
From: Ryan Bray <rbray89@gmail.com>
Date: Sat, 11 Aug 2018 15:38:27 -0600
Subject: [PATCH] rename hardkernel-sbl to hardkernel-boot

---
 buildroot-external/Config.in                  |  2 +-
 buildroot-external/configs/odroidc2_defconfig |  4 ++--
 .../Config.in                                 |  8 +++----
 .../hardkernel-boot.mk}                       | 24 +++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)
 rename buildroot-external/package/{hardkernel-sbl => hardkernel-boot}/Config.in (58%)
 rename buildroot-external/package/{hardkernel-sbl/hardkernel-sbl.mk => hardkernel-boot/hardkernel-boot.mk} (58%)

diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in
index 124bc9b20..eb56fe71b 100644
--- a/buildroot-external/Config.in
+++ b/buildroot-external/Config.in
@@ -3,4 +3,4 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-rtl8723/Config.in"
-source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-sbl/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/hardkernel-boot/Config.in"
diff --git a/buildroot-external/configs/odroidc2_defconfig b/buildroot-external/configs/odroidc2_defconfig
index a209efe32..e56a7f5b9 100644
--- a/buildroot-external/configs/odroidc2_defconfig
+++ b/buildroot-external/configs/odroidc2_defconfig
@@ -83,7 +83,7 @@ BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSOS=y
 BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="123"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/aarch64-homeassistant"
+BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
 BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"
 BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
@@ -92,4 +92,4 @@ BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2"
 BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
 BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
-BR2_PACKAGE_HARDKERNEL_SBL=y
+BR2_PACKAGE_HARDKERNEL_BOOT=y
diff --git a/buildroot-external/package/hardkernel-sbl/Config.in b/buildroot-external/package/hardkernel-boot/Config.in
similarity index 58%
rename from buildroot-external/package/hardkernel-sbl/Config.in
rename to buildroot-external/package/hardkernel-boot/Config.in
index 32a50de56..8a1462916 100644
--- a/buildroot-external/package/hardkernel-sbl/Config.in
+++ b/buildroot-external/package/hardkernel-boot/Config.in
@@ -1,15 +1,15 @@
-config BR2_PACKAGE_HARDKERNEL_SBL
+config BR2_PACKAGE_HARDKERNEL_BOOT
 	bool "Hardkernel Secure Boot Loader"
 	depends on BR2_TARGET_UBOOT
 	help
 	  Augment uboot for secure loading on hardkernel targets.
 
-if BR2_PACKAGE_HARDKERNEL_SBL
+if BR2_PACKAGE_HARDKERNEL_BOOT
 choice
 	prompt "Target"
-	default BR2_PACKAGE_HARDKERNEL_SBL_ODROID_C2
+	default BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2
 
-config BR2_PACKAGE_HARDKERNEL_SBL_ODROID_C2
+config BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2
 	bool "Odroid-C2"
 	help
 	  For the Odroid-C2
diff --git a/buildroot-external/package/hardkernel-sbl/hardkernel-sbl.mk b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk
similarity index 58%
rename from buildroot-external/package/hardkernel-sbl/hardkernel-sbl.mk
rename to buildroot-external/package/hardkernel-boot/hardkernel-boot.mk
index 5812f1982..d9bbdd7e6 100644
--- a/buildroot-external/package/hardkernel-sbl/hardkernel-sbl.mk
+++ b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk
@@ -4,19 +4,19 @@
 #
 ################################################################################
 
-HARDKERNEL_SBL_VERSION = 205c7b3259559283161703a1a200b787c2c445a5
-HARDKERNEL_SBL_SOURCE = $(HARDKERNEL_SBL_VERSION).tar.gz
-HARDKERNEL_SBL_SITE = https://github.com/hardkernel/u-boot/archive
-HARDKERNEL_SBL_LICENSE = GPL-2.0+
-HARDKERNEL_SBL_LICENSE_FILES = Licenses/gpl-2.0.txt
-HARDKERNEL_SBL_INSTALL_IMAGES = YES
-HARDKERNEL_SBL_DEPENDENCIES = uboot
+HARDKERNEL_BOOT_VERSION = 205c7b3259559283161703a1a200b787c2c445a5
+HARDKERNEL_BOOT_SOURCE = $(HARDKERNEL_BOOT_VERSION).tar.gz
+HARDKERNEL_BOOT_SITE = https://github.com/hardkernel/u-boot/archive
+HARDKERNEL_BOOT_LICENSE = GPL-2.0+
+HARDKERNEL_BOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
+HARDKERNEL_BOOT_INSTALL_IMAGES = YES
+HARDKERNEL_BOOT_DEPENDENCIES = uboot
 
 
-ifeq ($(BR2_PACKAGE_HARDKERNEL_SBL_ODROID_C2),y)
-HARDKERNEL_SBL_BINS += sd_fuse/bl1.bin.hardkernel \
+ifeq ($(BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2),y)
+HARDKERNEL_BOOT_BINS += sd_fuse/bl1.bin.hardkernel \
                        u-boot.gxbb
-define HARDKERNEL_SBL_BUILD_CMDS
+define HARDKERNEL_BOOT_BUILD_CMDS
 	$(@D)/fip/fip_create --bl30  $(@D)/fip/gxb/bl30.bin \
 												--bl301 $(@D)/fip/gxb/bl301.bin \
 												--bl31  $(@D)/fip/gxb/bl31.bin \
@@ -30,8 +30,8 @@ define HARDKERNEL_SBL_BUILD_CMDS
 endef
 endif
 
-define HARDKERNEL_SBL_INSTALL_IMAGES_CMDS
-	$(foreach f,$(HARDKERNEL_SBL_BINS), \
+define HARDKERNEL_BOOT_INSTALL_IMAGES_CMDS
+	$(foreach f,$(HARDKERNEL_BOOT_BINS), \
 			cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
 	)
 endef