Date: Tue, 23 Jun 2009 11:34:46 -0700 (PDT) From: Neelkanth Natu <neelnatu@yahoo.com> To: freebsd-mips@freebsd.org Subject: Simple diff required for booting on MALTA Message-ID: <618819.81685.qm@web34404.mail.mud.yahoo.com>
next in thread | raw e-mail | index | archive | help
--0-975419909-1245782086=:81685
Content-Type: text/plain; charset=us-ascii
Hi,
I am attaching a couple of simple diffs I had to make to get the mips
port booted on MALTA hardware with a MIPS 4Kc processor.
The change to uart_cpu_maltausart.c is to retain the baudrate set up by
YAMON instead of hardcoding it to 115200 (the baudrate set up by YAMON
is 38400).
The change to malta_machdep.c is to make sure that we call mips_timer_early_init() before the first write to console. This is necessary because the ns8250 driver calls DELAY() and without this change we hit a
divide-by-zero error.
Can somebody review these changes and commit them if they look alright?
best
Neel
--0-975419909-1245782086=:81685
Content-Type: application/octet-stream; name="diff.out"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="diff.out"
PT09PSAvL2RlcG90L3VzZXIvbmVlbG5hdHUvZnJlZWJzZF9zaWJ5dGUvc3Jj
L3N5cy9taXBzL21hbHRhL3VhcnRfY3B1X21hbHRhdXNhcnQuYyM0IC0gL3Uv
bmVlbG5hdHUvcDQvZnJlZWJzZF9zaWJ5dGUvc3JjL3N5cy9taXBzL21hbHRh
L3VhcnRfY3B1X21hbHRhdXNhcnQuYyA9PT09CkBAIC03MCw3ICs3MCw3IEBA
CiAJZGktPmJhcy5ic3QgPSAwOwogCWRpLT5iYXMucmVnc2hmdCA9IDA7CiAJ
ZGktPmJhcy5yY2xrID0gMDsKLQlkaS0+YmF1ZHJhdGUgPSAxMTUyMDA7CisJ
ZGktPmJhdWRyYXRlID0gMDsJLyogcmV0YWluIHRoZSBiYXVkcmF0ZSBjb25m
aWd1cmVkIGJ5IFlBTU9OICovCiAJZGktPmRhdGFiaXRzID0gODsKIAlkaS0+
c3RvcGJpdHMgPSAxOwogCWRpLT5wYXJpdHkgPSBVQVJUX1BBUklUWV9OT05F
Owo9PT09IC8vZGVwb3QvdXNlci9uZWVsbmF0dS9mcmVlYnNkX3NpYnl0ZS9z
cmMvc3lzL21pcHMvbWFsdGEvbWFsdGFfbWFjaGRlcC5jIzIgLSAvdS9uZWVs
bmF0dS9wNC9mcmVlYnNkX3NpYnl0ZS9zcmMvc3lzL21pcHMvbWFsdGEvbWFs
dGFfbWFjaGRlcC5jID09PT0KQEAgLTIyNiw2ICsyMjYsNTIgQEAKIAogfQog
CitzdGF0aWMgdWludDY0X3QKK21hbHRhX2NwdV9zcGVlZCh2b2lkKQorewor
CXVpbnQ2NF90IHBsYXRmb3JtX2NvdW50ZXJfZnJlcSA9IDA7CisKKyNpZiBk
ZWZpbmVkKFRJQ0tfVVNFX1lBTU9OX0ZSRVEpCisJLyoKKwkgKiBJZiB3ZSBh
cmUgcnVubmluZyBvbiBhIGJvYXJkIHdoaWNoIHVzZXMgWUFNT04gZmlybXdh
cmUsCisJICogdGhlbiBxdWVyeSBDUFUgcGlwZWxpbmUgY2xvY2sgZnJvbSB0
aGUgc3lzY29uIG9iamVjdC4KKwkgKiBJZiB1bnN1Y2Nlc3NmdWwsIHVzZSBo
YXJkLWNvZGVkIGRlZmF1bHQuCisJICovCisJcGxhdGZvcm1fY291bnRlcl9m
cmVxID0geWFtb25fZ2V0Y3B1ZnJlcSgpOworCisjZWxpZiBkZWZpbmVkKFRJ
Q0tfVVNFX01BTFRBX1JUQykKKwkvKgorCSAqIElmIHdlIGFyZSBydW5uaW5n
IG9uIGEgYm9hcmQgd2l0aCB0aGUgTUMxNDY4MTggUlRDLAorCSAqIHVzZSBp
dCB0byBkZXRlcm1pbmUgQ1BVIHBpcGVsaW5lIGNsb2NrIGZyZXF1ZW5jeS4K
KwkgKi8KKwl1X2ludDY0X3QgY291bnRlcnZhbFsyXTsKKworCS8qIFNldCBS
VEMgdG8gYmluYXJ5IG1vZGUuICovCisJd3JpdGVydGMoUlRDX1NUQVRVU0Is
IChydGNpbihSVENfU1RBVFVTQikgfCBSVENTQl9CQ0QpKTsKKworCS8qIEJ1
c3ktd2FpdCBmb3IgZmFsbGluZyBlZGdlIG9mIFJUQyB1cGRhdGUuICovCisJ
d2hpbGUgKCgocnRjaW4oUlRDX1NUQVRVU0EpICYgUlRDU0FfVFVQKSA9PSAw
KSkKKwkJOworCXdoaWxlICgoKHJ0Y2luKFJUQ19TVEFUVVNBKSYgUlRDU0Ff
VFVQKSAhPSAwKSkKKwkJOworCWNvdW50ZXJ2YWxbMF0gPSBtaXBzX3JkX2Nv
dW50KCk7CisKKwkvKiBCdXN5LXdhaXQgZm9yIGZhbGxpbmcgZWRnZSBvZiBS
VEMgdXBkYXRlLiAqLworCXdoaWxlICgoKHJ0Y2luKFJUQ19TVEFUVVNBKSAm
IFJUQ1NBX1RVUCkgPT0gMCkpCisJCTsKKwl3aGlsZSAoKChydGNpbihSVENf
U1RBVFVTQSkmIFJUQ1NBX1RVUCkgIT0gMCkpCisJCTsKKwljb3VudGVydmFs
WzFdID0gbWlwc19yZF9jb3VudCgpOworCisJcGxhdGZvcm1fY291bnRlcl9m
cmVxID0gY291bnRlcnZhbFsxXSAtIGNvdW50ZXJ2YWxbMF07CisjZW5kaWYK
KworCWlmIChwbGF0Zm9ybV9jb3VudGVyX2ZyZXEgPT0gMCkKKwkJcGxhdGZv
cm1fY291bnRlcl9mcmVxID0gTUlQU19ERUZBVUxUX0haOworCisJcmV0dXJu
IChwbGF0Zm9ybV9jb3VudGVyX2ZyZXEpOworfQorCiB2b2lkCiBwbGF0Zm9y
bV9zdGFydChfX3JlZ2lzdGVyX3QgYTAsIF9fcmVnaXN0ZXJfdCBhMSwgIF9f
cmVnaXN0ZXJfdCBhMiwgCiAgICAgX19yZWdpc3Rlcl90IGEzKQpAQCAtMjQy
LDYgKzI4OCw5IEBACiAJa2VybmVuZCA9IHJvdW5kX3BhZ2UoKHZtX29mZnNl
dF90KSZlbmQpOwogCW1lbXNldCgmZWRhdGEsIDAsIGtlcm5lbmQgLSAodm1f
b2Zmc2V0X3QpKCZlZGF0YSkpOwogCisJcGxhdGZvcm1fY291bnRlcl9mcmVx
ID0gbWFsdGFfY3B1X3NwZWVkKCk7CisJbWlwc190aW1lcl9lYXJseV9pbml0
KHBsYXRmb3JtX2NvdW50ZXJfZnJlcSk7CisKIAljbmluaXQoKTsKIAlwcmlu
dGYoImVudHJ5OiBwbGF0Zm9ybV9zdGFydCgpXG4iKTsKIApAQCAtMjYyLDQ0
ICszMTEsNSBAQAogCXJlYWxtZW0gPSBidG9jKG1lbXNpemUpOwogCW1pcHNf
aW5pdCgpOwogCi0JZG8gewotI2lmIGRlZmluZWQoVElDS19VU0VfWUFNT05f
RlJFUSkKLQkJLyoKLQkJICogSWYgd2UgYXJlIHJ1bm5pbmcgb24gYSBib2Fy
ZCB3aGljaCB1c2VzIFlBTU9OIGZpcm13YXJlLAotCQkgKiB0aGVuIHF1ZXJ5
IENQVSBwaXBlbGluZSBjbG9jayBmcm9tIHRoZSBzeXNjb24gb2JqZWN0Lgot
CQkgKiBJZiB1bnN1Y2Nlc3NmdWwsIHVzZSBoYXJkLWNvZGVkIGRlZmF1bHQu
Ci0JCSAqLwotCQlwbGF0Zm9ybV9jb3VudGVyX2ZyZXEgPSB5YW1vbl9nZXRj
cHVmcmVxKCk7Ci0JCWlmIChwbGF0Zm9ybV9jb3VudGVyX2ZyZXEgPT0gMCkK
LQkJCXBsYXRmb3JtX2NvdW50ZXJfZnJlcSA9IE1JUFNfREVGQVVMVF9IWjsK
LQotI2VsaWYgZGVmaW5lZChUSUNLX1VTRV9NQUxUQV9SVEMpCi0JCS8qCi0J
CSAqIElmIHdlIGFyZSBydW5uaW5nIG9uIGEgYm9hcmQgd2l0aCB0aGUgTUMx
NDY4MTggUlRDLAotCQkgKiB1c2UgaXQgdG8gZGV0ZXJtaW5lIENQVSBwaXBl
bGluZSBjbG9jayBmcmVxdWVuY3kuCi0JCSAqLwotCQl1X2ludDY0X3QgY291
bnRlcnZhbFsyXTsKLQotCQkvKiBTZXQgUlRDIHRvIGJpbmFyeSBtb2RlLiAq
LwotCQl3cml0ZXJ0YyhSVENfU1RBVFVTQiwgKHJ0Y2luKFJUQ19TVEFUVVNC
KSB8IFJUQ1NCX0JDRCkpOwotCi0JCS8qIEJ1c3ktd2FpdCBmb3IgZmFsbGlu
ZyBlZGdlIG9mIFJUQyB1cGRhdGUuICovCi0JCXdoaWxlICgoKHJ0Y2luKFJU
Q19TVEFUVVNBKSAmIFJUQ1NBX1RVUCkgPT0gMCkpCi0JCQk7Ci0JCXdoaWxl
ICgoKHJ0Y2luKFJUQ19TVEFUVVNBKSYgUlRDU0FfVFVQKSAhPSAwKSkKLQkJ
CTsKLQkJY291bnRlcnZhbFswXSA9IG1pcHNfcmRfY291bnQoKTsKLQotCQkv
KiBCdXN5LXdhaXQgZm9yIGZhbGxpbmcgZWRnZSBvZiBSVEMgdXBkYXRlLiAq
LwotCQl3aGlsZSAoKChydGNpbihSVENfU1RBVFVTQSkgJiBSVENTQV9UVVAp
ID09IDApKQotCQkJOwotCQl3aGlsZSAoKChydGNpbihSVENfU1RBVFVTQSkm
IFJUQ1NBX1RVUCkgIT0gMCkpCi0JCQk7Ci0JCWNvdW50ZXJ2YWxbMV0gPSBt
aXBzX3JkX2NvdW50KCk7Ci0KLQkJcGxhdGZvcm1fY291bnRlcl9mcmVxID0g
Y291bnRlcnZhbFsxXSAtIGNvdW50ZXJ2YWxbMF07Ci0jZW5kaWYKLQl9IHdo
aWxlKDApOwotCiAJbWlwc190aW1lcl9pbml0X3BhcmFtcyhwbGF0Zm9ybV9j
b3VudGVyX2ZyZXEsIDApOwogfQo=
--0-975419909-1245782086=:81685--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?618819.81685.qm>