diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile index cd987db5..15082c03 100644 --- a/01_wait_forever/Makefile +++ b/01_wait_forever/Makefile @@ -51,7 +51,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/01_wait_forever/src/bsp/raspberrypi/link.ld b/01_wait_forever/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 01_wait_forever/src/bsp/raspberrypi/link.ld rename to 01_wait_forever/src/bsp/raspberrypi/kernel.ld diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile index d1d71ec9..d44f07aa 100644 --- a/02_runtime_init/Makefile +++ b/02_runtime_init/Makefile @@ -51,7 +51,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/02_runtime_init/README.md b/02_runtime_init/README.md index 88c29239..f2f0f047 100644 --- a/02_runtime_init/README.md +++ b/02_runtime_init/README.md @@ -196,9 +196,9 @@ diff -uNr 01_wait_forever/src/bsp/raspberrypi/cpu.rs 02_runtime_init/src/bsp/ras +#[link_section = ".text._start_arguments"] +pub static BOOT_CORE_ID: u64 = 0; -diff -uNr 01_wait_forever/src/bsp/raspberrypi/link.ld 02_runtime_init/src/bsp/raspberrypi/link.ld ---- 01_wait_forever/src/bsp/raspberrypi/link.ld -+++ 02_runtime_init/src/bsp/raspberrypi/link.ld +diff -uNr 01_wait_forever/src/bsp/raspberrypi/kernel.ld 02_runtime_init/src/bsp/raspberrypi/kernel.ld +--- 01_wait_forever/src/bsp/raspberrypi/kernel.ld ++++ 02_runtime_init/src/bsp/raspberrypi/kernel.ld @@ -3,6 +3,8 @@ * Copyright (c) 2018-2022 Andre Richter */ diff --git a/02_runtime_init/src/bsp/raspberrypi/link.ld b/02_runtime_init/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 02_runtime_init/src/bsp/raspberrypi/link.ld rename to 02_runtime_init/src/bsp/raspberrypi/kernel.ld diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile index 49dcc1ed..ac52002f 100644 --- a/03_hacky_hello_world/Makefile +++ b/03_hacky_hello_world/Makefile @@ -51,7 +51,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/03_hacky_hello_world/src/bsp/raspberrypi/link.ld b/03_hacky_hello_world/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 03_hacky_hello_world/src/bsp/raspberrypi/link.ld rename to 03_hacky_hello_world/src/bsp/raspberrypi/kernel.ld diff --git a/04_safe_globals/Makefile b/04_safe_globals/Makefile index 49dcc1ed..ac52002f 100644 --- a/04_safe_globals/Makefile +++ b/04_safe_globals/Makefile @@ -51,7 +51,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/04_safe_globals/src/bsp/raspberrypi/link.ld b/04_safe_globals/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 04_safe_globals/src/bsp/raspberrypi/link.ld rename to 04_safe_globals/src/bsp/raspberrypi/kernel.ld diff --git a/05_drivers_gpio_uart/Makefile b/05_drivers_gpio_uart/Makefile index 28702bc8..193581e9 100644 --- a/05_drivers_gpio_uart/Makefile +++ b/05_drivers_gpio_uart/Makefile @@ -54,7 +54,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/05_drivers_gpio_uart/src/bsp/raspberrypi/link.ld b/05_drivers_gpio_uart/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 05_drivers_gpio_uart/src/bsp/raspberrypi/link.ld rename to 05_drivers_gpio_uart/src/bsp/raspberrypi/kernel.ld diff --git a/06_uart_chainloader/Makefile b/06_uart_chainloader/Makefile index b3af24c5..5ae54175 100644 --- a/06_uart_chainloader/Makefile +++ b/06_uart_chainloader/Makefile @@ -56,7 +56,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/06_uart_chainloader/README.md b/06_uart_chainloader/README.md index f07131ec..b3db670f 100644 --- a/06_uart_chainloader/README.md +++ b/06_uart_chainloader/README.md @@ -380,9 +380,9 @@ diff -uNr 05_drivers_gpio_uart/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs 0 {} } -diff -uNr 05_drivers_gpio_uart/src/bsp/raspberrypi/link.ld 06_uart_chainloader/src/bsp/raspberrypi/link.ld ---- 05_drivers_gpio_uart/src/bsp/raspberrypi/link.ld -+++ 06_uart_chainloader/src/bsp/raspberrypi/link.ld +diff -uNr 05_drivers_gpio_uart/src/bsp/raspberrypi/kernel.ld 06_uart_chainloader/src/bsp/raspberrypi/kernel.ld +--- 05_drivers_gpio_uart/src/bsp/raspberrypi/kernel.ld ++++ 06_uart_chainloader/src/bsp/raspberrypi/kernel.ld @@ -3,8 +3,6 @@ * Copyright (c) 2018-2022 Andre Richter */ diff --git a/06_uart_chainloader/src/bsp/raspberrypi/link.ld b/06_uart_chainloader/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 06_uart_chainloader/src/bsp/raspberrypi/link.ld rename to 06_uart_chainloader/src/bsp/raspberrypi/kernel.ld diff --git a/07_timestamps/Makefile b/07_timestamps/Makefile index 3f6b230a..d127c422 100644 --- a/07_timestamps/Makefile +++ b/07_timestamps/Makefile @@ -54,7 +54,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/07_timestamps/README.md b/07_timestamps/README.md index 14bdc6bd..6904f4f9 100644 --- a/07_timestamps/README.md +++ b/07_timestamps/README.md @@ -451,9 +451,9 @@ diff -uNr 06_uart_chainloader/src/bsp/device_driver/bcm/bcm2xxx_pl011_uart.rs 07 {} } -diff -uNr 06_uart_chainloader/src/bsp/raspberrypi/link.ld 07_timestamps/src/bsp/raspberrypi/link.ld ---- 06_uart_chainloader/src/bsp/raspberrypi/link.ld -+++ 07_timestamps/src/bsp/raspberrypi/link.ld +diff -uNr 06_uart_chainloader/src/bsp/raspberrypi/kernel.ld 07_timestamps/src/bsp/raspberrypi/kernel.ld +--- 06_uart_chainloader/src/bsp/raspberrypi/kernel.ld ++++ 07_timestamps/src/bsp/raspberrypi/kernel.ld @@ -3,6 +3,8 @@ * Copyright (c) 2018-2022 Andre Richter */ diff --git a/07_timestamps/src/bsp/raspberrypi/link.ld b/07_timestamps/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 07_timestamps/src/bsp/raspberrypi/link.ld rename to 07_timestamps/src/bsp/raspberrypi/kernel.ld diff --git a/08_hw_debug_JTAG/Makefile b/08_hw_debug_JTAG/Makefile index e3db66a9..1cf4d1aa 100644 --- a/08_hw_debug_JTAG/Makefile +++ b/08_hw_debug_JTAG/Makefile @@ -58,7 +58,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/08_hw_debug_JTAG/src/bsp/raspberrypi/link.ld b/08_hw_debug_JTAG/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 08_hw_debug_JTAG/src/bsp/raspberrypi/link.ld rename to 08_hw_debug_JTAG/src/bsp/raspberrypi/kernel.ld diff --git a/09_privilege_level/Makefile b/09_privilege_level/Makefile index e3db66a9..1cf4d1aa 100644 --- a/09_privilege_level/Makefile +++ b/09_privilege_level/Makefile @@ -58,7 +58,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/09_privilege_level/src/bsp/raspberrypi/link.ld b/09_privilege_level/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 09_privilege_level/src/bsp/raspberrypi/link.ld rename to 09_privilege_level/src/bsp/raspberrypi/kernel.ld diff --git a/10_virtual_mem_part1_identity_mapping/Makefile b/10_virtual_mem_part1_identity_mapping/Makefile index e3db66a9..1cf4d1aa 100644 --- a/10_virtual_mem_part1_identity_mapping/Makefile +++ b/10_virtual_mem_part1_identity_mapping/Makefile @@ -58,7 +58,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/10_virtual_mem_part1_identity_mapping/README.md b/10_virtual_mem_part1_identity_mapping/README.md index 1bf427c0..1a02666b 100644 --- a/10_virtual_mem_part1_identity_mapping/README.md +++ b/10_virtual_mem_part1_identity_mapping/README.md @@ -828,9 +828,9 @@ diff -uNr 09_privilege_level/src/_arch/aarch64/memory/mmu.rs 10_virtual_mem_part + } +} -diff -uNr 09_privilege_level/src/bsp/raspberrypi/link.ld 10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/link.ld ---- 09_privilege_level/src/bsp/raspberrypi/link.ld -+++ 10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/link.ld +diff -uNr 09_privilege_level/src/bsp/raspberrypi/kernel.ld 10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/kernel.ld +--- 09_privilege_level/src/bsp/raspberrypi/kernel.ld ++++ 10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/kernel.ld @@ -3,6 +3,9 @@ * Copyright (c) 2018-2022 Andre Richter */ diff --git a/10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/link.ld b/10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/link.ld rename to 10_virtual_mem_part1_identity_mapping/src/bsp/raspberrypi/kernel.ld diff --git a/11_exceptions_part1_groundwork/Makefile b/11_exceptions_part1_groundwork/Makefile index e3db66a9..1cf4d1aa 100644 --- a/11_exceptions_part1_groundwork/Makefile +++ b/11_exceptions_part1_groundwork/Makefile @@ -58,7 +58,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/11_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld b/11_exceptions_part1_groundwork/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 11_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld rename to 11_exceptions_part1_groundwork/src/bsp/raspberrypi/kernel.ld diff --git a/12_integrated_testing/Makefile b/12_integrated_testing/Makefile index afa22480..925ac45f 100644 --- a/12_integrated_testing/Makefile +++ b/12_integrated_testing/Makefile @@ -67,7 +67,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/12_integrated_testing/src/bsp/raspberrypi/link.ld b/12_integrated_testing/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 12_integrated_testing/src/bsp/raspberrypi/link.ld rename to 12_integrated_testing/src/bsp/raspberrypi/kernel.ld diff --git a/13_exceptions_part2_peripheral_IRQs/Makefile b/13_exceptions_part2_peripheral_IRQs/Makefile index afa22480..925ac45f 100644 --- a/13_exceptions_part2_peripheral_IRQs/Makefile +++ b/13_exceptions_part2_peripheral_IRQs/Makefile @@ -67,7 +67,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld b/13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld rename to 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/kernel.ld diff --git a/14_virtual_mem_part2_mmio_remap/Makefile b/14_virtual_mem_part2_mmio_remap/Makefile index afa22480..925ac45f 100644 --- a/14_virtual_mem_part2_mmio_remap/Makefile +++ b/14_virtual_mem_part2_mmio_remap/Makefile @@ -67,7 +67,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/14_virtual_mem_part2_mmio_remap/README.md b/14_virtual_mem_part2_mmio_remap/README.md index 07a82cda..9e9adb70 100644 --- a/14_virtual_mem_part2_mmio_remap/README.md +++ b/14_virtual_mem_part2_mmio_remap/README.md @@ -1431,9 +1431,9 @@ diff -uNr 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/driver.rs 14_v super::GPIO.map_pl011_uart(); } -diff -uNr 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld ---- 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld -+++ 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld +diff -uNr 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/kernel.ld 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel.ld +--- 13_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/kernel.ld ++++ 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel.ld @@ -38,7 +38,7 @@ ***********************************************************************************************/ .boot_core_stack (NOLOAD) : diff --git a/14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld b/14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld rename to 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel.ld diff --git a/15_virtual_mem_part3_precomputed_tables/Makefile b/15_virtual_mem_part3_precomputed_tables/Makefile index fec9097c..56a77692 100644 --- a/15_virtual_mem_part3_precomputed_tables/Makefile +++ b/15_virtual_mem_part3_precomputed_tables/Makefile @@ -67,7 +67,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld TT_TOOL_PATH = translation_table_tool diff --git a/15_virtual_mem_part3_precomputed_tables/README.md b/15_virtual_mem_part3_precomputed_tables/README.md index 37d157cc..39881214 100644 --- a/15_virtual_mem_part3_precomputed_tables/README.md +++ b/15_virtual_mem_part3_precomputed_tables/README.md @@ -813,7 +813,7 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/Makefile 15_virtual_mem_part3_precompu +++ 15_virtual_mem_part3_precomputed_tables/Makefile @@ -69,12 +69,19 @@ ##-------------------------------------------------------------------------------------------------- - KERNEL_LINKER_SCRIPT = link.ld + KERNEL_LINKER_SCRIPT = kernel.ld +TT_TOOL_PATH = translation_table_tool + @@ -1190,15 +1190,9 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/console.rs 15_virt + } +} -diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld ---- 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld -+++ 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld -@@ -0,0 +1 @@ -+__kernel_virt_addr_space_size = 1024 * 1024 * 1024 - -diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/link.ld ---- 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld -+++ 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/link.ld +diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel.ld 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel.ld +--- 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel.ld ++++ 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel.ld @@ -3,6 +3,8 @@ * Copyright (c) 2018-2022 Andre Richter */ @@ -1209,6 +1203,12 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/link.ld 15_virtual PAGE_MASK = PAGE_SIZE - 1; +diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld +--- 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld ++++ 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel_virt_addr_space_size.ld +@@ -0,0 +1 @@ ++__kernel_virt_addr_space_size = 1024 * 1024 * 1024 + diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/memory/mmu.rs 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/memory/mmu.rs --- 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/memory/mmu.rs +++ 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/memory/mmu.rs diff --git a/15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/link.ld b/15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/link.ld rename to 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel.ld diff --git a/16_virtual_mem_part4_higher_half_kernel/Makefile b/16_virtual_mem_part4_higher_half_kernel/Makefile index fec9097c..56a77692 100644 --- a/16_virtual_mem_part4_higher_half_kernel/Makefile +++ b/16_virtual_mem_part4_higher_half_kernel/Makefile @@ -67,7 +67,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld TT_TOOL_PATH = translation_table_tool diff --git a/16_virtual_mem_part4_higher_half_kernel/README.md b/16_virtual_mem_part4_higher_half_kernel/README.md index 52ca9bfe..f7c72aca 100644 --- a/16_virtual_mem_part4_higher_half_kernel/README.md +++ b/16_virtual_mem_part4_higher_half_kernel/README.md @@ -638,9 +638,9 @@ diff -uNr 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/console.rs panic_uart -diff -uNr 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/link.ld 16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/link.ld ---- 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/link.ld -+++ 16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/link.ld +diff -uNr 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel.ld 16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/kernel.ld +--- 15_virtual_mem_part3_precomputed_tables/src/bsp/raspberrypi/kernel.ld ++++ 16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/kernel.ld @@ -8,6 +8,13 @@ PAGE_SIZE = 64K; PAGE_MASK = PAGE_SIZE - 1; diff --git a/16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/link.ld b/16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from 16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/link.ld rename to 16_virtual_mem_part4_higher_half_kernel/src/bsp/raspberrypi/kernel.ld diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile index 3f6b230a..d127c422 100644 --- a/X1_JTAG_boot/Makefile +++ b/X1_JTAG_boot/Makefile @@ -54,7 +54,7 @@ export LD_SCRIPT_PATH ##-------------------------------------------------------------------------------------------------- ## Targets and Prerequisites ##-------------------------------------------------------------------------------------------------- -KERNEL_LINKER_SCRIPT = link.ld +KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/X1_JTAG_boot/src/bsp/raspberrypi/link.ld b/X1_JTAG_boot/src/bsp/raspberrypi/kernel.ld similarity index 100% rename from X1_JTAG_boot/src/bsp/raspberrypi/link.ld rename to X1_JTAG_boot/src/bsp/raspberrypi/kernel.ld