diff --git a/bootloader/Cargo.lock b/bootloader/Cargo.lock index 3e48379..2100950 100644 --- a/bootloader/Cargo.lock +++ b/bootloader/Cargo.lock @@ -3,7 +3,7 @@ [[package]] name = "aarch64" version = "2.2.2" -source = "git+https://github.com/equation314/aarch64#14a08f4d285ae0ff515b03bff9f5e66eb68feaed" +source = "git+https://github.com/rcore-os/aarch64#14a08f4d285ae0ff515b03bff9f5e66eb68feaed" dependencies = [ "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "bcm2837" version = "0.1.0" -source = "git+https://github.com/equation314/bcm2837#446f0ea04deb5216ba5e08f10af36e5c1729e6fd" +source = "git+https://github.com/rcore-os/bcm2837#446f0ea04deb5216ba5e08f10af36e5c1729e6fd" dependencies = [ "volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -32,7 +32,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -98,9 +98,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "rcore-bootloader" version = "0.1.0" dependencies = [ - "aarch64 2.2.2 (git+https://github.com/equation314/aarch64)", - "bcm2837 0.1.0 (git+https://github.com/equation314/bcm2837)", - "cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)", + "aarch64 2.2.2 (git+https://github.com/rcore-os/aarch64)", + "bcm2837 0.1.0 (git+https://github.com/rcore-os/bcm2837)", + "cc 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)", "fixedvec 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "xmas-elf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -205,11 +205,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] -"checksum aarch64 2.2.2 (git+https://github.com/equation314/aarch64)" = "" -"checksum bcm2837 0.1.0 (git+https://github.com/equation314/bcm2837)" = "" +"checksum aarch64 2.2.2 (git+https://github.com/rcore-os/aarch64)" = "" +"checksum bcm2837 0.1.0 (git+https://github.com/rcore-os/bcm2837)" = "" "checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" -"checksum cc 1.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = "d01c69d08ff207f231f07196e30f84c70f1c815b04f980f8b7b01ff01f05eb92" +"checksum cc 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)" = "c9ce8bb087aacff865633f0bd5aeaed910fe2fe55b55f4739527f2e023a2e53d" "checksum fixedvec 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7c6c16d316ccdac21a4dd648e314e76facbbaf316e83ca137d0857a9c07419d0" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797" diff --git a/bootloader/Cargo.toml b/bootloader/Cargo.toml index 09c8b6d..26ecb92 100644 --- a/bootloader/Cargo.toml +++ b/bootloader/Cargo.toml @@ -9,8 +9,8 @@ xmas-elf = "0.6.2" fixedvec = "0.2.3" [target.'cfg(target_arch = "aarch64")'.dependencies] -aarch64 = { git = "https://github.com/equation314/aarch64" } -bcm2837 = { git = "https://github.com/equation314/bcm2837" } +aarch64 = { git = "https://github.com/rcore-os/aarch64" } +bcm2837 = { git = "https://github.com/rcore-os/bcm2837" } [build-dependencies] cc = "1.0" diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock index c1bbe8f..f741316 100644 --- a/kernel/Cargo.lock +++ b/kernel/Cargo.lock @@ -12,6 +12,18 @@ dependencies = [ "ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "aarch64" +version = "2.2.2" +source = "git+https://github.com/rcore-os/aarch64#14a08f4d285ae0ff515b03bff9f5e66eb68feaed" +dependencies = [ + "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "register 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "usize_conversions 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ux 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "apic" version = "0.1.0" @@ -55,7 +67,7 @@ version = "0.1.0" [[package]] name = "bcm2837" version = "0.1.0" -source = "git+https://github.com/equation314/bcm2837#446f0ea04deb5216ba5e08f10af36e5c1729e6fd" +source = "git+https://github.com/rcore-os/bcm2837#446f0ea04deb5216ba5e08f10af36e5c1729e6fd" dependencies = [ "aarch64 2.2.2 (git+https://github.com/equation314/aarch64)", "volatile 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -132,7 +144,7 @@ source = "git+https://github.com/wangrunji0408/deque.git?branch=no_std#907d03935 [[package]] name = "device_tree" version = "1.0.3" -source = "git+https://github.com/rcore-os/device_tree-rs#4bcec298a212974b7a52ce3b5fb50e01aefdbbfe" +source = "git+https://github.com/rcore-os/device_tree-rs#0e887395ab92e99f68117b17d85b0b417bfd1b45" [[package]] name = "fixedvec" @@ -286,10 +298,10 @@ dependencies = [ name = "rcore" version = "0.2.0" dependencies = [ - "aarch64 2.2.2 (git+https://github.com/equation314/aarch64)", + "aarch64 2.2.2 (git+https://github.com/rcore-os/aarch64)", "apic 0.1.0 (git+https://github.com/rcore-os/apic-rs)", "bbl 0.1.0", - "bcm2837 0.1.0 (git+https://github.com/equation314/bcm2837)", + "bcm2837 0.1.0 (git+https://github.com/rcore-os/bcm2837)", "bit-allocator 0.1.0", "bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -570,11 +582,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] "checksum aarch64 2.2.2 (git+https://github.com/equation314/aarch64)" = "" +"checksum aarch64 2.2.2 (git+https://github.com/rcore-os/aarch64)" = "" "checksum apic 0.1.0 (git+https://github.com/rcore-os/apic-rs)" = "" "checksum apic 0.1.0 (git+https://github.com/wangrunji0408/APIC-Rust)" = "" "checksum array-init 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "23589ecb866b460d3a0f1278834750268c607e8e28a1b982c907219f3178cd72" "checksum bare-metal 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a3caf393d93b2d453e80638d0674597020cef3382ada454faacd43d1a55a735a" -"checksum bcm2837 0.1.0 (git+https://github.com/equation314/bcm2837)" = "" +"checksum bcm2837 0.1.0 (git+https://github.com/rcore-os/bcm2837)" = "" "checksum bit_field 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" "checksum bitvec 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cfadef5c4e2c2e64067b9ecc061179f12ac7ec65ba613b1f60f3972bbada1f5b" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 99d0a45..c7fb172 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -70,8 +70,8 @@ riscv = { git = "https://github.com/rcore-os/riscv" } bbl = { path = "../crate/bbl" } [target.'cfg(target_arch = "aarch64")'.dependencies] -aarch64 = { git = "https://github.com/equation314/aarch64" } -bcm2837 = { git = "https://github.com/equation314/bcm2837", optional = true } +aarch64 = { git = "https://github.com/rcore-os/aarch64" } +bcm2837 = { git = "https://github.com/rcore-os/bcm2837", optional = true } [package.metadata.bootimage] default-target = "targets/x86_64.json"