Fix version check for the update chainloader

This commit is contained in:
Kostas Missos 2018-09-19 00:36:40 +03:00
parent fc0f75495e
commit b54cbbfc3c
2 changed files with 5 additions and 5 deletions

View file

@ -5,6 +5,8 @@ endif
include $(DEVKITARM)/base_rules include $(DEVKITARM)/base_rules
TARGET := hekate TARGET := hekate
BLVERSION_MAJOR := 4
BLVERSION_MINOR := 0
BUILD := build BUILD := build
OUTPUT := output OUTPUT := output
SOURCEDIR = bootloader SOURCEDIR = bootloader
@ -53,7 +55,8 @@ OBJS += $(addprefix $(BUILD)/$(TARGET)/, \
) )
ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork 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) 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 LDFLAGS = $(ARCH) -nostartfiles -lgcc -Wl,--nmagic,--gc-sections

View file

@ -60,9 +60,6 @@
#include "ianos/ianos.h" #include "ianos/ianos.h"
#include "utils/dirlist.h" #include "utils/dirlist.h"
#define BLVERSIONMJ 4
#define BLVERSIONMN 0
#define BOOTLOADER_UPDATED_MAGIC_ADDR 0x4003E000 #define BOOTLOADER_UPDATED_MAGIC_ADDR 0x4003E000
#define BOOTLOADER_UPDATED_MAGIC 0x424f4f54 #define BOOTLOADER_UPDATED_MAGIC 0x424f4f54
@ -3212,7 +3209,7 @@ void ipl_main()
display_init(); display_init();
u32 *fb = display_init_framebuffer(); 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 #ifdef MENU_LOGO_ENABLE
Kc_MENU_LOGO = (u8 *)malloc(0x6000); Kc_MENU_LOGO = (u8 *)malloc(0x6000);