Update Package for ata.device / sagasd.device / fat-handler / sfs.device / Format / HDToolbox / iPrefs (ApolloTeam-dev#132)

* Updated CLI, Banners and ata.device 44.1 (dual controller / dual drive)

* Updated CLI, Banners and ata.device 44.1 (dual controller / dual drive)

* Updated lowlevel to Unit_OutS/UnitInS

* Cleanup lowlevel.c

* Cleanup lowlevel

* [44.19] Release Candidate (tested on SA and MC)

* ApolloROM R9.5RC6 - ata.device 44.20

* [44.21] ATAPI Support ApolloTeam-dev#1

* [44.22] ata.device = improved mount CD

* Minor

* Minor

* [44.25] ATAPI Read large file works

* [44.26] fixec retrycount

* [44.27] Added reject in case of M/S conflict (Kingston CF for example)

* Added Keymap files

* Enabled Lowlevel Debug

* Disable debug lowlevel

* [44.29] Kingston fixed

* ata.device [44.30] ApolloROM R9.5-RC7

* ata.device [44.32] - fixed timing on CD mount

* ata.device [44.34] - Removable ApolloTeam-dev#1

* ata.device [44.35] Removable Support ApolloTeam-dev#2

* ApolloROM R95RC8

* R9.6-RC1 + ATA 44.38 + Format + HDToolBox + iPrefs + Input

* R9.6-RC1 + ATA 44.38+iPrefs+Input+Format+HDTB

* Working ApolloOS boot (debug enabled)

* Cleanup Debug

* ata.device 44.39 - Stable on ID=0

* Cleanup Debug

* Cleanup

* Corrected TestUnit()

* Fixed Format issue with OK button

* Updated System/Format (BHFormat)

* Format (WIP#1)

* Format (WIP#2)

* Minor

* Removed .gitmodules

* Added catalogs copy

* Delete catalogs submodule

* Reinstated catalogs

* gui.h (BHFormat)

* Minor

* Added workbench/libs/catalogs copy

* Delete catalogs

* Reinstate

* rom/dos/catalogs

* Reinstate

* rom/filesys/catalogs

* rom/security/catalogs

* R~einstated

* catalogs copies

* catalogs reinstated

* Reinstate translations

* developer submodules

* reinstate developers folders

* Stable on ID=0 / Format with % progressbar

* ApolloRom R95 Release

* Removable Support

* ata.device [44.41] - AutoMount CD/DVD Fixed

* ata.device [44.42] improved ATAPI support and System/Format improved

* ata.device [44.43] added cdfs to rom - DOS/0 default - StartCyl ApolloTeam-dev#2 - Format check for DOS/o

* ata.device [44.44] Boot with SFS ZIP Media inserted is now OK

* Update on fat-handler for ZIP

* Cleaning up Filesystems (afs/sfs/fat)

* SFS Update 1.860

* Implementing MODESENSE in ATAPI - Part 1

* [SFS} 1.861

* [SFS] 1.862

* [SFS] 1.863 - Ghost Icons fixed

* [SFS] 1.864 Cleanup and Speedup

* [SFS] 1.865 + DiskChange Active + Cleanup/Speedup

* [ata] noreset |  DOSBoot debug |

* Disabled NoMedia screen to save ROM space

* ApolloROM size optimise + ROM size output on rebuild_ scripts

* [sagasd.device] added to ROM and enabled boot from SD

* [fat-handler 41.66] Start work on ROM integration

* Reduce Debug Output

* [fat-handler 42.00] re-instated

* [fat-handler 42.01]

* [fat-handler 42.02] - improved FAT32 compatibility

* Fixed FAT names (Capitals) and IMproved Format (DosType added)

* IMproved Debug output

* Fixed Memory Manager Error after Format + Improved Debug Output

* sagasd - updated present and detect routines (working now without HW pin detect)

* sagasd - addchangeint added

* [sagasd.device 2.54] SD-Card present/detect added to task + addchangeint() = HotSwap

* Updated Format tool with correct DosType and Volume fields

* System/Format - Improved Checks

* [sagasd.device 2.55] [afs-handler  41.8] Fixed AddChangeInt / Improved NewMedia

* Minor

* [fat-handler 42.04] Fixed booting with/without SD (1 partition support)

* Partition boot sequence limited to RDB (to allow fat-handler take control over MBR)

* Improved Bootstrap

* [sagasd] reset default boot prio to -5

* Improved Boot Menu and skipping FAT now in Boot Partition (so fat-handler takes over)

* fat+sagasd - multiple FS (boot) versus FAT-only mode (after boot)

* fat+sagasd - improved boot detection process

* [WIP sagasd2nd.device]

* restored sagasd_device_raw

* 2nd SD-Card activated (single unit still, working on unified for multiple support)

* sagasd - single SD (SPI2) stable

* sagasd - improved detection speed

* sagasd - stable SPI1+2

* Updated ColdReboot so now it works OK with Apollo V4 - Added Requester when mounting non-FAT - Cleanup

* Fixed timing / semaphore issue (__dos_boot)

* Restructured DEBUG

* Fixed no drive error for FAT in Format and added RemoveNode for SFS in Format

* Cleanup + 2Gb RM (SFS issue remains)

* SFS issue fixed

* SFS issue fixed 2

* Enabled HW SD Pin detect and fixed detection issues with UniCorn SD

* updated gitignore

Author: WDrijver

.gitignore

@@ -2138,3 +2138,5 @@ config/config.log
 compiler/include/geninc.cfg
 bin/Sources/.freetype-2.10.0-fetched
 aros.rom
+ApolloOS.code-workspace
+arch/m68k-amiga/boot/romlog.txt

.gitmodules

@@ -1,204 +0,0 @@
-[submodule "workbench/libs/muimaster/catalogs"]
-	path = workbench/libs/muimaster/catalogs
-	url = https://github.com/aros-translation-team/muimaster.library.git
-[submodule "arch/all-pc/acpitool/catalogs"]
-	path = arch/all-pc/acpitool/catalogs
-	url = https://github.com/aros-translation-team/acpitool.git
-[submodule "rom/dos/catalogs"]
-	path = rom/dos/catalogs
-	url = https://github.com/aros-translation-team/dos.library.git
-[submodule "rom/filesys/SFS/SFSdefrag/Catalogs"]
-	path = rom/filesys/SFS/SFSdefrag/Catalogs
-	url = https://github.com/aros-translation-team/sfsdefrag.git
-[submodule "rom/hidds/pci/pcitool/catalogs"]
-	path = rom/hidds/pci/pcitool/catalogs
-	url = https://github.com/aros-translation-team/pcitool.git
-[submodule "rom/security/catalogs"]
-	path = rom/security/catalogs
-	url = https://github.com/aros-translation-team/security.library.git
-[submodule "rom/usb/trident/catalogs"]
-	path = rom/usb/trident/catalogs
-	url = https://github.com/aros-translation-team/trident.git
-[submodule "workbench/c/LoadResource/catalogs"]
-	path = workbench/c/LoadResource/catalogs
-	url = https://github.com/aros-translation-team/loadresource.git
-[submodule "workbench/c/R/catalogs"]
-	path = workbench/c/R/catalogs
-	url = https://github.com/aros-translation-team/r.git
-[submodule "workbench/classes/zune/aboutwindow/catalogs"]
-	path = workbench/classes/zune/aboutwindow/catalogs
-	url = https://github.com/aros-translation-team/aboutwindow.git
-[submodule "workbench/classes/zune/prefswindow/catalogs"]
-	path = workbench/classes/zune/prefswindow/catalogs
-	url = https://github.com/aros-translation-team/prefswindow.git
-[submodule "workbench/classes/zune/systemprefswindow/catalogs"]
-	path = workbench/classes/zune/systemprefswindow/catalogs
-	url = https://github.com/aros-translation-team/systemprefswindow.git
-[submodule "workbench/devs/diskimage/device/catalogs"]
-	path = workbench/devs/diskimage/device/catalogs
-	url = https://github.com/aros-translation-team/diskimage.device.git
-[submodule "workbench/devs/diskimage/zune_gui/catalogs"]
-	path = workbench/devs/diskimage/zune_gui/catalogs
-	url = https://github.com/aros-translation-team/diskimage-zune.git
-[submodule "workbench/libs/asl/catalogs"]
-	path = workbench/libs/asl/catalogs
-	url = https://github.com/aros-translation-team/asl.library.git
-[submodule "workbench/libs/identify/catalogs"]
-	path = workbench/libs/identify/catalogs
-	url = https://github.com/aros-translation-team/identify.library.git
-[submodule "workbench/libs/identify/tools/catalogs"]
-	path = workbench/libs/identify/tools/catalogs
-	url = https://github.com/aros-translation-team/identify.git
-[submodule "workbench/libs/reqtools/catalogs"]
-	path = workbench/libs/reqtools/catalogs
-	url = https://github.com/aros-translation-team/reqtools.library.git
-[submodule "workbench/devs/AHI/AHI/translations"]
-	path = workbench/devs/AHI/AHI/translations
-	url = https://github.com/aros-translation-team/ahi-prefs.git
-[submodule "workbench/devs/AHI/Device/translations"]
-	path = workbench/devs/AHI/Device/translations
-	url = https://github.com/aros-translation-team/ahi.device.git
-[submodule "workbench/utilities/MultiView/catalogs"]
-	path = workbench/utilities/MultiView/catalogs
-	url = https://github.com/aros-translation-team/multiview.git
-[submodule "workbench/utilities/More/catalogs"]
-	path = workbench/utilities/More/catalogs
-	url = https://github.com/aros-translation-team/more.git
-[submodule "workbench/utilities/Installer/catalogs"]
-	path = workbench/utilities/Installer/catalogs
-	url = https://github.com/aros-translation-team/installer.git
-[submodule "workbench/utilities/Clock/catalogs"]
-	path = workbench/utilities/Clock/catalogs
-	url = https://github.com/aros-translation-team/clock.git
-[submodule "workbench/system/Wanderer/Catalogs"]
-	path = workbench/system/Wanderer/Catalogs
-	url = https://github.com/aros-translation-team/wanderer.git
-[submodule "workbench/tools/SysExplorer/catalogs"]
-	path = workbench/tools/SysExplorer/catalogs
-	url = https://github.com/aros-translation-team/sysexplorer.git
-[submodule "workbench/system/AboutAROS/catalogs"]
-	path = workbench/system/AboutAROS/catalogs
-	url = https://github.com/aros-translation-team/aboutaros.git
-[submodule "workbench/tools/InstallAROS/catalogs"]
-	path = workbench/tools/InstallAROS/catalogs
-	url = https://github.com/aros-translation-team/installaros.git
-[submodule "workbench/tools/HDToolBox/catalogs"]
-	path = workbench/tools/HDToolBox/catalogs
-	url = https://github.com/aros-translation-team/hdtoolbox.git
-[submodule "workbench/tools/BoingIconBar/catalogs"]
-	path = workbench/tools/BoingIconBar/catalogs
-	url = https://github.com/aros-translation-team/boingiconbar.git
-[submodule "workbench/system/SysMon/catalogs"]
-	path = workbench/system/SysMon/catalogs
-	url = https://github.com/aros-translation-team/sysmon.git
-[submodule "workbench/tools/commodities/catalogs"]
-	path = workbench/tools/commodities/catalogs
-	url = https://github.com/aros-translation-team/commodities.git
-[submodule "workbench/prefs/palette/catalogs"]
-	path = workbench/prefs/palette/catalogs
-	url = https://github.com/aros-translation-team/palette-prefs.git
-[submodule "developer/debug/test/crt/posixc/posix.1"]
-	path = developer/debug/test/crt/posixc/posix.1
-	url = https://github.com/agordon/posix-libc-examples.git
-[submodule "workbench/prefs/appearance/catalogs"]
-	path = workbench/prefs/appearance/catalogs
-	url = https://github.com/aros-translation-team/appearance-prefs.git
-[submodule "workbench/prefs/boingiconbar/catalogs"]
-	path = workbench/prefs/boingiconbar/catalogs
-	url = https://github.com/aros-translation-team/boingiconbar-prefs.git
-[submodule "workbench/prefs/font/catalogs"]
-	path = workbench/prefs/font/catalogs
-	url = https://github.com/aros-translation-team/font-prefs.git
-[submodule "workbench/prefs/input/catalogs"]
-	path = workbench/prefs/input/catalogs
-	url = https://github.com/aros-translation-team/input-prefs.git
-[submodule "workbench/prefs/locale/catalogs"]
-	path = workbench/prefs/locale/catalogs
-	url = https://github.com/aros-translation-team/locale-prefs.git
-[submodule "workbench/prefs/reqtools/catalogs"]
-	path = workbench/prefs/reqtools/catalogs
-	url = https://github.com/aros-translation-team/reqtools-prefs.git
-[submodule "workbench/prefs/boot/catalogs"]
-	path = workbench/prefs/boot/catalogs
-	url = https://github.com/aros-translation-team/boot-prefs.git
-[submodule "workbench/prefs/icontrol/catalogs"]
-	path = workbench/prefs/icontrol/catalogs
-	url = https://github.com/aros-translation-team/icontrol-prefs.git
-[submodule "workbench/prefs/network/catalogs"]
-	path = workbench/prefs/network/catalogs
-	url = https://github.com/aros-translation-team/network-prefs.git
-[submodule "workbench/prefs/pointer/catalogs"]
-	path = workbench/prefs/pointer/catalogs
-	url = https://github.com/aros-translation-team/pointer-prefs.git
-[submodule "workbench/prefs/printer/catalogs"]
-	path = workbench/prefs/printer/catalogs
-	url = https://github.com/aros-translation-team/printer-prefs.git
-[submodule "workbench/prefs/Editor/catalogs"]
-	path = workbench/prefs/Editor/catalogs
-	url = https://github.com/aros-translation-team/editor-prefs.git
-[submodule "workbench/prefs/PSI/catalogs"]
-	path = workbench/prefs/PSI/catalogs
-	url = https://github.com/aros-translation-team/psi-prefs.git
-[submodule "workbench/prefs/screenmode/catalogs"]
-	path = workbench/prefs/screenmode/catalogs
-	url = https://github.com/aros-translation-team/screenmode-prefs.git
-[submodule "workbench/prefs/serial/catalogs"]
-	path = workbench/prefs/serial/catalogs
-	url = https://github.com/aros-translation-team/serial-prefs.git
-[submodule "workbench/prefs/time/catalogs"]
-	path = workbench/prefs/time/catalogs
-	url = https://github.com/aros-translation-team/time-prefs.git
-[submodule "workbench/prefs/trackdisk/catalogs"]
-	path = workbench/prefs/trackdisk/catalogs
-	url = https://github.com/aros-translation-team/trackdisk-prefs.git
-[submodule "workbench/prefs/wanderer/catalogs"]
-	path = workbench/prefs/wanderer/catalogs
-	url = https://github.com/aros-translation-team/wanderer-prefs.git
-[submodule "workbench/prefs/Zune/catalogs"]
-	path = workbench/prefs/Zune/catalogs
-	url = https://github.com/aros-translation-team/zune-prefs.git
-[submodule "workbench/network/stacks/AROSTCP/MUI.MiamiPanel/catalogs"]
-	path = workbench/network/stacks/AROSTCP/MUI.MiamiPanel/catalogs
-	url = https://github.com/aros-translation-team/miamipanel.git
-[submodule "workbench/system/BHFormat/catalogs"]
-	path = workbench/system/BHFormat/catalogs
-	url = https://github.com/aros-translation-team/format.git
-[submodule "workbench/system/find/catalogs"]
-	path = workbench/system/find/catalogs
-	url = https://github.com/aros-translation-team/find.git
-[submodule "workbench/system/ftmanager/catalogs"]
-	path = workbench/system/ftmanager/catalogs
-	url = https://github.com/aros-translation-team/ftmanager.git
-[submodule "workbench/system/Snoopy/catalogs"]
-	path = workbench/system/Snoopy/catalogs
-	url = https://github.com/aros-translation-team/snoopy.git
-[submodule "workbench/system/Wanderer/Tools/DiskInfo/catalogs"]
-	path = workbench/system/Wanderer/Tools/DiskInfo/catalogs
-	url = https://github.com/aros-translation-team/diskinfo.git
-[submodule "workbench/system/Wanderer/Tools/ExecuteCommand/catalogs"]
-	path = workbench/system/Wanderer/Tools/ExecuteCommand/catalogs
-	url = https://github.com/aros-translation-team/executecommand.git
-[submodule "workbench/system/Wanderer/Tools/ExecuteStartup/catalogs"]
-	path = workbench/system/Wanderer/Tools/ExecuteStartup/catalogs
-	url = https://github.com/aros-translation-team/executestartup.git
-[submodule "workbench/system/Wanderer/Tools/WBNewDrawer/catalogs"]
-	path = workbench/system/Wanderer/Tools/WBNewDrawer/catalogs
-	url = https://github.com/aros-translation-team/wbnewdrawer.git
-[submodule "workbench/system/Wanderer/Tools/WBRename/catalogs"]
-	path = workbench/system/Wanderer/Tools/WBRename/catalogs
-	url = https://github.com/aros-translation-team/wbrename.git
-[submodule "workbench/tools/Edit/catalogs"]
-	path = workbench/tools/Edit/catalogs
-	url = https://github.com/aros-translation-team/editor.git
-[submodule "workbench/tools/KeyShow/catalogs"]
-	path = workbench/tools/KeyShow/catalogs
-	url = https://github.com/aros-translation-team/keyshow.git
-[submodule "workbench/tools/ScreenGrabber/catalogs"]
-	path = workbench/tools/ScreenGrabber/catalogs
-	url = https://github.com/aros-translation-team/screengrabber.git
-[submodule "workbench/tools/WiMP/catalogs"]
-	path = workbench/tools/WiMP/catalogs
-	url = https://github.com/aros-translation-team/wimp.git
-[submodule "developer/debug/test/datatypes"]
-	path = developer/debug/test/datatypes
-	url = https://github.com/aros-development-team/datatype-test-binaries.git

arch/m68k-all/dosboot/bootcode.c

@@ -65,6 +65,8 @@ void dosboot_BootPoint(struct BootNode *bn)
     struct DosEnvec *de;
     IPTR bootblocks;
 
+    D(Bug("dosboot_BootPoint\n"));
+
     dn = bn->bn_DeviceNode;
     if (dn == NULL || dn->dn_Name == BNULL)
         return;

arch/m68k-amiga/boot/debug.c

@@ -51,7 +51,7 @@ int DebugMayGetChar(void)
 	return c;
 }
 
-#if AROS_SERIAL_DEBUG
+#if APOLLO_DEBUG2
 
 void DebugPutStr(register const char *buff)
 {

arch/m68k-amiga/boot/debug.h

@@ -18,7 +18,7 @@ void DebugInit(void);
 int DebugPutChar(register int chr);
 int DebugMayGetChar(void);
 
-#if AROS_SERIAL_DEBUG
+#if APOLLO_DEBUG2
 void DebugPutStr(register const char *buff);
 void DebugPutHex(const char *what, ULONG val);
 void DebugPutDec(const char *what, ULONG val);
@@ -28,7 +28,7 @@ void DebugPutHexVal(ULONG val);
 #define DEBUGPUTD(x) do { DebugPutDec x; } while(0)
 #define DEBUGPUTHEX(x) do { DebugPutHex x; } while(0)
 #endif
-#endif /* !AROS_SERIAL_DEBUG */
+#endif /* !APOLLO_DEBUG */
 
 #ifndef DEBUGPUTS
 #define DEBUGPUTS(x) do { } while (0)

arch/m68k-amiga/boot/mmakefile.src

@@ -37,6 +37,7 @@ include $(SRCDIR)/config/aros.cfg
 #MM     kernel-filesystem-kobj \
 #MM     kernel-freeanim-kobj \
 #MM     kernel-fs-core-kobj \
+#MM		kernel-fs-fat-kobj \
 #MM     kernel-fs-con-kobj \
 #MM     kernel-fs-ram-kobj \
 #MM     kernel-gameport-kobj \
@@ -93,7 +94,7 @@ include $(SRCDIR)/config/aros.cfg
 #MM- kernel-workbench-devs-amiga-m68k : workbench-devs-amiga-m68k
 
 # Make sure we optimize this code for size ..
-OPTIMIZATION_CFLAGS := -O2
+OPTIMIZATION_CFLAGS := -Os
 
 USELIBS := amiga arossupport autoinit libinit stdc.static
 LIBS    := -L$(GENDIR)/lib -lloadseg $(addprefix -l,$(USELIBS))
@@ -122,17 +123,18 @@ ROMLOC_ss  := 0x003f800
 # Main ROM (0xf80000 - 0xffffff)
 ROMLOC_rom := 0x0f80000
 
-FILES=start early debug mmu
+FILES=start early debug
+# debug mmu
 AFILES=rom_entry rom_init cpu_detect superstack_swap
 
 # APOLLOROM = V4 -> Native V4
 ifeq ($(APOLLOROM),V4)
-	KLIBS   := exec aros dos utility oop expansion partition debug
+	KLIBS   := exec aros dos utility oop expansion partition 
 	KDEVS   := timer input keyboard console gameport audio
-	KHNDLRS := con afs ram
+	KHNDLRS := afs fat ram 
 	KHIDDS  := amigakbd amigamouse amigavideo ata_gayle gfx hiddclass keyboard mouse 
-	KRSRCS  := battclock kernel processor task lddemon dosboot cia potgo disk FileSystem misc shell card bootloader vampire
-	KHOOKS  := diag romboot
+	KRSRCS  := battclock kernel processor task lddemon dosboot cia potgo disk FileSystem vampire
+	KHOOKS  := 
 endif
 
 # APOLLOROM = UAE -> UAE with P96
@@ -141,8 +143,8 @@ ifeq ($(APOLLOROM),UAE)
 	KDEVS   := timer input keyboard console gameport audio
 	KHNDLRS := con afs ram
 	KHIDDS  := amigakbd amigamouse amigavideo ata_gayle gfx hiddclass keyboard mouse p96gfx
-	KRSRCS  := battclock kernel processor task lddemon dosboot cia potgo disk FileSystem 
-	KHOOKS  := 
+	KRSRCS  := kernel processor task lddemon dosboot cia potgo disk FileSystem 
+	KHOOKS  := diag romboot
 endif
 
 KOBJS_rom := $(addprefix $(KOBJSDIR)/,$(addsuffix _library.ko ,$(KLIBS))) \
@@ -165,23 +167,25 @@ AFILES  := ext_entry
 # APOLLOROM = V4 -> Native V4
 ifeq ($(APOLLOROM),V4)
 	KLIBS   := keymap graphics layers intuition gadtools workbench mathffp mathieeesingbas freeanim lowlevel setpatch
-	KDEVS   := cd ata trackdisk
-	KHNDLRS := cdrom
-	KHIDDS  := bus storage system
-	KRSRCS  := shellcommands wbtag
-	KHOOKS  := alert
+	KDEVS   := sagasd ata trackdisk
+	KHNDLRS := con
+	KHIDDS  := bus storage system 
+	KRSRCS  := shellcommands wbtag misc shell card bootloader
+	KHOOKS  := alert diag romboot
 endif
 
 # APOLLOROM = UAE -> UAE with P96
 ifeq ($(APOLLOROM),UAE)
 	KLIBS   := keymap graphics layers intuition gadtools workbench mathffp mathieeesingbas freeanim lowlevel setpatch
-	KDEVS   := cd ata trackdisk
-	KHNDLRS := cdrom
+	KDEVS   := ata trackdisk
+	KHNDLRS := 
 	KHIDDS  := bus storage system
 	KRSRCS  := shellcommands wbtag misc shell card bootloader
-	KHOOKS  := alert diag romboot
+	KHOOKS  := alert 
 endif
 
+# diag romboot
+
 ROMLOC_ext := 0xe00000
 KOBJS_ext := \
 	$(addprefix $(KOBJSDIR)/,$(addsuffix _library.ko ,$(KLIBS)  )) \
@@ -236,7 +240,7 @@ $(GENDIR)/boot/aros-amiga-m68k.elf: $(GENDIR)/boot/aros-amiga-m68k-reloc.elf
 		--section-start .ext=$(ROMLOC_ext) \
 		--section-start .ss=$(ROMLOC_ss) \
 		$<
-	$(Q)$(TARGET_OBJDUMP) -h $@ | grep '[rea][oxm][mte]   '
+	$(Q)$(TARGET_OBJDUMP) -h $@ | grep '[rea][oxm][mte]   ' > romlog.txt
 
 $(GENDIR)/boot/aros-amiga-m68k-%.bin : $(GENDIR)/boot/aros-amiga-m68k.elf $(HOSTGENDIR)/tools/romcheck
 	$(Q)$(TARGET_OBJCOPY) \

arch/m68k-amiga/boot/rom_init.S

@@ -99,8 +99,8 @@ arosbootstrap_init:
 
 	#if VAMPIRECARDSERIES==4
 	//V4 version
-	move.l	#0x01800000,%a0		//Reserve 8MB for ApolloFloppy
-	move.l	#0x40000000,%a1
+	move.l	#0x01800000,%a0		// Reserve 8MB for ApolloFloppy
+	move.l	#0x80000000,%a1		// UniCorn 2Gb
 	move.l	#0x00100000,%d0
 	jsr	__MemoryTest
 	#else

arch/m68k-amiga/boot/romlog.txt

@@ -0,0 +1,3 @@
+Idx Name          Size      VMA       LMA       File off  Algn
+  0 .rom          00077adc  00f80000  00f80000  0007c000  2**2
+  1 .ext          000783ea  00e00000  00e00000  00002000  2**2

arch/m68k-amiga/boot/start.c

@@ -566,7 +566,7 @@ void doColdCapture(void)
 
 static void RomInfo(IPTR rom)
 {
-#if AROS_SERIAL_DEBUG && (DEBUG > 0)
+#if DEBUG > 0
     APTR ptr = (APTR)rom;
     CONST_STRPTR str;
 
@@ -612,7 +612,7 @@ static UWORD GetAttnFlags(ULONG *cpupcr)
             attnflags |= AFF_68881 | AFF_68882;
     }
 
-#if AROS_SERIAL_DEBUG && (DEBUG > 0)
+#if DEBUG > 0
     DEBUGPUTS(("CPU: "));
     if (attnflags & AFF_68080)
         DEBUGPUTS(("Apollo Core 68080"));
@@ -765,7 +765,7 @@ void exec_boot(ULONG *membanks, ULONG *cpupcr)
 
     membanks[i + 1] -= membanks[i + 0];
 
-#if AROS_SERIAL_DEBUG && (DEBUG > 0)
+#if DEBUG > 0
     for (i = 0; membanks[i + 1]; i += 2) {
         ULONG addr = membanks[i + 0];
         ULONG size = membanks[i + 1];
@@ -827,7 +827,7 @@ void exec_boot(ULONG *membanks, ULONG *cpupcr)
         Early_Alert(AT_DeadEnd | AG_NoMemory);
     }
 
-#if AROS_SERIAL_DEBUG && (DEBUG > 0)
+#if DEBUG > 0
     for (i = 0; kickrom [i] != (UWORD*)~0; i += 2) {
         DEBUGPUTHEX(("Resident start", (ULONG)kickrom[i]));
         DEBUGPUTHEX(("Resident end  ", (ULONG)kickrom[i + 1]));