mist64 / geos

Source code of GEOS 2.0 for the Commodore 64 and 128
414 stars 66 forks source link

Make bsw128 variant (mostly) bootable #6

Closed rhalkyard closed 5 years ago

rhalkyard commented 5 years ago

Initial groundwork to make the bsw128 variant bootable:

Currently this version only boots if built with the drv1571 disk driver (and a 1571 is used as the boot device). I haven't gotten to the bottom of this issue yet, but I thought I'd get a PR out.

xlar54 commented 5 years ago

can we get this and the other PR merged?

mist64 commented 5 years ago

I'd like to "rebase and merge", but "This branch cannot be rebased due to conflicts". Can you check why this is?

xlar54 commented 5 years ago

Hmm.. Im not sure really. It appears neither PR has a conflict. Odd. Are you sure you want to rebase?

mist64 commented 5 years ago

The conflict was mostly caused by my rename of mse1531 to mse1351. I manually merged the three commits. Closing. :)