aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaghuram Subramani <raghus2247@gmail.com>2025-01-06 01:59:34 -0500
committerRaghuram Subramani <raghus2247@gmail.com>2025-01-06 01:59:34 -0500
commit95eeb922ec31fd14a259c3d133a054bd13f845a2 (patch)
tree6d9c06f211cfc0c025087ccd524083e365b951cf
parent3c37020f60815acc6e0084360413f633f7044243 (diff)
misc: cmos->bubbl
-rw-r--r--.bochsrc2
-rw-r--r--CMakeLists.txt6
-rw-r--r--kernel/boot/grub.cfg2
-rwxr-xr-xscripts/fetch-toolchain.sh2
4 files changed, 6 insertions, 6 deletions
diff --git a/.bochsrc b/.bochsrc
index 1d02005..51a138d 100644
--- a/.bochsrc
+++ b/.bochsrc
@@ -3,7 +3,7 @@ cpu: count=1
romimage: file=$BXSHARE/BIOS-bochs-legacy
vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
-ata0-slave: type=cdrom, path="cmos.iso", status=inserted
+ata0-slave: type=cdrom, path="bubbl.iso", status=inserted
boot: cdrom
clock: sync=realtime
config_interface: wx
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c213194..1370de4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(BOCHS_CMD bochs)
set(QEMU_SYSTEM_CMD qemu-system-i386)
set(QEMU_ARGUMENTS
- -cdrom ${CMAKE_BINARY_DIR}/cmos.iso
+ -cdrom ${CMAKE_BINARY_DIR}/bubbl.iso
-device isa-debug-exit,iobase=0xf4,iosize=0x04
-m 32M
-smp 1
@@ -27,7 +27,7 @@ add_custom_target(iso
mkdir -p ${CMAKE_BINARY_DIR}/iso/boot/grub &&
cp ${KERNEL_BINARY_DIR}/kernel ${CMAKE_BINARY_DIR}/iso/boot &&
cp ${KERNEL_SOURCE}/boot/grub.cfg ${CMAKE_BINARY_DIR}/iso/boot/grub &&
- grub-mkrescue -o ${CMAKE_BINARY_DIR}/cmos.iso ${CMAKE_BINARY_DIR}/iso
+ grub-mkrescue -o ${CMAKE_BINARY_DIR}/bubbl.iso ${CMAKE_BINARY_DIR}/iso
DEPENDS kernel
)
@@ -75,7 +75,7 @@ add_custom_target(run-gdb
add_custom_target(clean-custom
rm -rf
${CMAKE_BINARY_DIR}/iso
- ${CMAKE_BINARY_DIR}/cmos.iso
+ ${CMAKE_BINARY_DIR}/bubbl.iso
DEPENDS clean
)
diff --git a/kernel/boot/grub.cfg b/kernel/boot/grub.cfg
index 73a002c..a7aa4a0 100644
--- a/kernel/boot/grub.cfg
+++ b/kernel/boot/grub.cfg
@@ -1,6 +1,6 @@
set timeout=0
set default=0
-menuentry "cmos" {
+menuentry "bubbl" {
multiboot /boot/kernel
}
diff --git a/scripts/fetch-toolchain.sh b/scripts/fetch-toolchain.sh
index f6c10fa..fdf22ca 100755
--- a/scripts/fetch-toolchain.sh
+++ b/scripts/fetch-toolchain.sh
@@ -21,7 +21,7 @@
set -xe
rm -rf toolchain.tar.gz toolchain/host toolchain/cross
-aria2c https://github.com/compromyse/cmos/releases/latest/download/toolchain.tar.gz
+aria2c https://github.com/compromyse/bubbl/releases/latest/download/toolchain.tar.gz
tar xvf toolchain.tar.gz
rm toolchain.tar.gz