Skip to content

Commit 701e53f

Browse files
committed
[fw-boot] Start of work on supporting NAOMI.
1 parent e7775f0 commit 701e53f

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

firmware/bootloader/src/main.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
extern uint8 romdisk[];
1515
KOS_INIT_FLAGS(INIT_IRQ | INIT_THD_PREEMPT);
1616
#else
17+
# ifndef __NAOMI__
1718
static void early_init(void) {
1819
/*
1920
Older KallistiOS doesn't get back the Master after working with G1 ATA.
@@ -23,6 +24,7 @@ static void early_init(void) {
2324
g1_ata_select_device(G1_ATA_MASTER);
2425
}
2526
KOS_INIT_EARLY(early_init);
27+
# endif
2628
KOS_INIT_FLAGS(INIT_DEFAULT);
2729
#endif
2830

@@ -197,11 +199,15 @@ int main(int argc, char **argv) {
197199

198200
if(vid_check_cable() == CT_VGA) {
199201
vid_set_mode(DM_640x480_VGA, PM_RGB565);
200-
} else if(flashrom_get_region_only() == FLASHROM_REGION_EUROPE) {
202+
}
203+
#ifndef __NAOMI__
204+
else if(flashrom_get_region_only() == FLASHROM_REGION_EUROPE) {
201205
vid_set_mode(DM_640x480_PAL_IL, PM_RGB565);
202-
} else {
206+
}
207+
else {
203208
vid_set_mode(DM_640x480_NTSC_IL, PM_RGB565);
204209
}
210+
#endif
205211

206212
#ifndef EMU
207213

0 commit comments

Comments
 (0)