From b54cbbfc3c90e9fdad06750b9f82c3e2e8e6b679 Mon Sep 17 00:00:00 2001
From: Kostas Missos <ctcaer@gmail.com>
Date: Wed, 19 Sep 2018 00:36:40 +0300
Subject: [PATCH] Fix version check for the update chainloader

---
 Makefile          | 5 ++++-
 bootloader/main.c | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8c5be23..00dc31c 100755
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ endif
 include $(DEVKITARM)/base_rules
 
 TARGET := hekate
+BLVERSION_MAJOR := 4
+BLVERSION_MINOR := 0
 BUILD := build
 OUTPUT := output
 SOURCEDIR = bootloader
@@ -53,7 +55,8 @@ OBJS += $(addprefix $(BUILD)/$(TARGET)/, \
 )
 
 ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-CUSTOMDEFINES := -DMENU_LOGO_ENABLE #-DDEBUG
+CUSTOMDEFINES := -DBLVERSIONMJ=$(BLVERSION_MAJOR) -DBLVERSIONMN=$(BLVERSION_MINOR)
+CUSTOMDEFINES += -DMENU_LOGO_ENABLE #-DDEBUG
 CFLAGS = $(ARCH) -O2 -nostdlib -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-inline -std=gnu11 -Wall $(CUSTOMDEFINES)
 LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections
 
diff --git a/bootloader/main.c b/bootloader/main.c
index 165b49a..e202339 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -60,9 +60,6 @@
 #include "ianos/ianos.h"
 #include "utils/dirlist.h"
 
-#define BLVERSIONMJ 4
-#define BLVERSIONMN 0
-
 #define BOOTLOADER_UPDATED_MAGIC_ADDR 0x4003E000
 #define BOOTLOADER_UPDATED_MAGIC 0x424f4f54
 
@@ -3212,7 +3209,7 @@ void ipl_main()
 	display_init();
 
 	u32 *fb = display_init_framebuffer();
-	gfx_init_ctxt(&gfx_ctxt, fb, 720, 1280, 768);
+	gfx_init_ctxt(&gfx_ctxt, fb, 720, 1280, 720);
 
 #ifdef MENU_LOGO_ENABLE
 	Kc_MENU_LOGO = (u8 *)malloc(0x6000);