diff --git a/firmware/common/LPC4320_M4_memory.ld b/firmware/common/LPC4320_M4_memory.ld
index 48be94da2..182c5b807 100644
--- a/firmware/common/LPC4320_M4_memory.ld
+++ b/firmware/common/LPC4320_M4_memory.ld
@@ -20,16 +20,75 @@
  * Boston, MA 02110-1301, USA.
  */
 
-/* Linker script for HackRF One (LPC4320, 1M SPI flash, 200K SRAM). */
+/* Top-level linker script for HackRF One (LPC4320, 1M SPI flash, 200K SRAM). */
+
+/* Depending on the target, the following additional linker scripts are called:
+ *
+ * `hackrf_usb.bin`:
+ *   - ${MCU_PARTNO}_M4_memory.ld       -> This script
+ *   - LPC43xx_M4_memory.ld             -> Defines additional memory regions
+ *   - LPC43xx_M4_M0_image_from_text.ld -> Adds the M0 core's firmware
+ *   - LPC43xx_M4_memory_rom_only.ld    -> Adds the fpga bitstreams
+ *   - LPC43xx_M4_rtconfig.ld           -> Adds code stored in ram_rtconfig
+ *   - libopencm3_lpc43xx_m0.ld         -> Controls linking for M0 code
+ *   - libopencm3_lpc43xx_rom_to_ram.ld -> Controls linking for M4 and shadow region
+ *
+ * `hackrf_usb.dfu`:
+ *   - ${MCU_PARTNO}_M4_memory.ld       -> This script
+ *   - LPC43xx_M4_memory.ld             -> as above
+ *   - LPC43xx_M0_memory.ld             -> as above
+ *   - LPC43xx_M4_M0_image_from_text.ld -> as above
+ *   - LPC43xx_M4_rtconfig.ld           -> as above
+ *   - libopencm3_lpc43xx.ld            -> Controls linking for M4
+ *   - libopencm3_lpc43xx_m0.ld         -> as above
+ */
 
 MEMORY
 {
-	/* rom is really the shadow region that points to SPI flash or elsewhere */
-	rom (rx)  : ORIGIN = 0x00000000, LENGTH =  1M
-	ram_local1 (rwx) : ORIGIN = 0x10000000, LENGTH =  64K
-	ram_usb (rw) : ORIGIN = 0x10010000, LENGTH = 32K
-	ram_local2 (rwx) : ORIGIN = 0x10080000, LENGTH =  32K
-	ram_sleep (rwx) : ORIGIN = 0x10088000, LENGTH = 8K
+	/* UM10503 Rev. 2.5, 10 September 2019
+	 *   - Section 3.3.1  Table 10, LPC43xx/LPC43Sxx SRAM configuration
+	 *   - Section 3.3.3  On-chip flash
+	 *   - Section 3.3.5  Memory retention in the Power-down modes
+	 *   - Section 3.4    Figure 8, Flashless parts: Memory map with peripherals
+	 *   - Section 5      LPC43xx Boot ROM
+	 * LPC4350/30/20/10 Product data sheet Rev. 4.6, 14 March 2016
+	 *   - Section 7.17   Figure 7, LPC4350/30/20/10 Memory mapping (overview)
+	 */
+
+	/* - 0x0000 0000 : 256 MB shadow area ---------------------------------- */
+	/* The shadow area allows some LPC43xx memory regions to be remapped to
+	 * address 0x0000 0000.
+	 *
+	 * - The default value at RESET is:
+	 *   -> Factory boot ROM @ 0x1040 0000
+	 * - Once the boot ROM has initialized SPIFI and established the boot map
+	 *   it is re-mapped to our 1M SPI Flash:
+	 *   -> SPIFI data       @ 0x1400 0000
+	 * - Next, the `.text_ram` region is copied from SPIFI data to `ram_local1`.
+	 * - Finally, execution jumps to `ram_local1` and the firmware begins.
+	 */
+	rom          (rx)  : ORIGIN = 0x00000000, LENGTH =  1M
+
+	/* - 0x1000 0000 : 96 kB local SRAM ------------------------------------ */
+	ram_local1   (rwx) : ORIGIN = 0x10000000, LENGTH = 64K
+	ram_usb      (rw)  : ORIGIN = 0x10010000, LENGTH = 32K
+
+	/* - 0x1001 8000 : 32 kB local SRAM (LPC4350/30) ----------------------- */
+	/* - 0x1002 0000 : reserved -------------------------------------------- */
+
+	/* - 0x1008 0000 : 32 kB local SRAM (LPC4350/30/20/10) ----------------- */
+	ram_rtconfig (rx)  : ORIGIN = 0x10080000, LENGTH = 16K
+	ram_local2   (rwx) : ORIGIN = 0x10084000, LENGTH = 16K
+
+	/* - 0x1008 8000: 8 kB local SRAM (LPC4320/10) ------------------------- */
+	ram_sleep    (rwx) : ORIGIN = 0x10088000, LENGTH =  8K
+
+	/* - 0x1008 A000 : 32 kB local SRAM (LPC4350/30) ----------------------- */
 }
 
+ASSERT(
+	SIZEOF(.text) + SIZEOF(.init_array) + SIZEOF(.ARM.exidx) <= 64K,
+	"Error: region `ram_local1' exceeds 64 kB."
+)
+
 INCLUDE LPC43xx_M4_memory.ld
diff --git a/firmware/common/LPC4330_M4_memory.ld b/firmware/common/LPC4330_M4_memory.ld
index 1d42ebee9..be4fc6ef5 100644
--- a/firmware/common/LPC4330_M4_memory.ld
+++ b/firmware/common/LPC4330_M4_memory.ld
@@ -20,16 +20,36 @@
  * Boston, MA 02110-1301, USA.
  */
 
-/* Linker script for Rad1o badge - (LPC4330, 1M SPI flash, 264K SRAM). */
+/* Top-level linker script for Rad1o badge (LPC4330, 1M SPI flash, 264K SRAM). */
+
+/* See `LPC4320_M4_memory.ld` for documentation. */
 
 MEMORY
 {
-	/* rom is really the shadow region that points to SPI flash or elsewhere */
-	rom (rx)  : ORIGIN = 0x00000000, LENGTH =  128K
-	ram_local1 (rwx) : ORIGIN = 0x10000000, LENGTH =  96K
-	ram_usb(rw) : ORIGIN = 0x10018000, LENGTH = 32K
-	ram_local2 (rwx) : ORIGIN = 0x10080000, LENGTH =  64K
-	ram_sleep (rwx) : ORIGIN = 0x10090000, LENGTH = 8K
+	/* - 0x0000 0000 : 256 MB shadow area ---------------------------------- */
+	rom          (rx)  : ORIGIN = 0x00000000, LENGTH = 128K
+
+	/* - 0x1000 0000 : 96 kB local SRAM ------------------------------------ */
+	ram_local1   (rwx) : ORIGIN = 0x10000000, LENGTH =  96K
+
+	/* - 0x1001 8000 : 32 kB local SRAM (LPC4350/30) ----------------------- */
+	ram_usb      (rw)  : ORIGIN = 0x10018000, LENGTH =  32K
+
+	/* - 0x1002 0000 : reserved -------------------------------------------- */
+
+	/* - 0x1008 0000 : 32kB local SRAM (LPC4350/30/20/10) ------------------ */
+	ram_rtconfig (rx)  : ORIGIN = 0x10080000, LENGTH =  32K
+
+	/* - 0x1008 A000 : 32kB local SRAM (LPC4350/30) ------------------------ */
+	ram_local2   (rwx) : ORIGIN = 0x1008A000, LENGTH =  32K
+
+	/* - 0x1009 0000 : 8kB local SRAM  (LPC4350/30) ------------------------ */
+	ram_sleep    (rwx) : ORIGIN = 0x10090000, LENGTH =   8K
 }
 
+ASSERT(
+	SIZEOF(.text) + SIZEOF(.init_array) + SIZEOF(.ARM.exidx) <= 96K,
+	"Error: region `ram_local1' exceeds 96 kB."
+)
+
 INCLUDE LPC43xx_M4_memory.ld
diff --git a/firmware/common/LPC43xx_M4_M0_image_from_text.ld b/firmware/common/LPC43xx_M4_M0_image_from_text.ld
index a2dfed68f..c04c158d8 100644
--- a/firmware/common/LPC43xx_M4_M0_image_from_text.ld
+++ b/firmware/common/LPC43xx_M4_M0_image_from_text.ld
@@ -23,9 +23,11 @@
 SECTIONS
 {
 	.m0_text : {
-		PROVIDE(__m0_start__ = .);
+		. = ALIGN(4);
 		KEEP(*(.m0_bin*));
 		. = ALIGN(4);
-		PROVIDE(__m0_end__ = .);
-	} >rom
+	} >ram_m0 AT >rom
+
+	PROVIDE(__m0_start__ = LOADADDR(.m0_text));
+	PROVIDE(__m0_end__ = LOADADDR(.m0_text) + SIZEOF(.m0_text));
 }
diff --git a/firmware/common/LPC43xx_M4_memory.ld b/firmware/common/LPC43xx_M4_memory.ld
index fc7dcee7f..0728890c6 100644
--- a/firmware/common/LPC43xx_M4_memory.ld
+++ b/firmware/common/LPC43xx_M4_memory.ld
@@ -22,20 +22,33 @@
 
 MEMORY
 {
-	/* Physical address in Flash used to copy Code from Flash to RAM */
-	rom_flash (rx)    : ORIGIN = 0x80000000, LENGTH = 1M
+	/* UM10503 Rev. 2.5, 10 September 2019
+	 *   - Section 3.3.1  Table 10, LPC43xx/LPC43Sxx SRAM configuration
+	 *   - Section 3.4    Figure 8, Flashless parts: Memory map with peripherals
+	 * LPC4350/30/20/10 Product data sheet Rev. 4.6, 14 March 2016
+	 *   - Section 7.17   Figure 7, LPC4350/30/20/10 Memory mapping (overview)
+	 */
+
+	/* - 0x2000 0000 : 16 kB AHB SRAM (LPC4350/30/20/10) ------------------- */
+	/* - 0x2000 4000 : 16 kB AHB SRAM (LPC4350/30/20) ---------------------- */
 	/* Buffers for LZ4 decompression */
-	ram_lz4_in (rwx)  : ORIGIN = 0x20000000, LENGTH = 4K
-	ram_lz4_out (rwx) : ORIGIN = 0x20001000, LENGTH = 4K
+	ram_lz4_in  (rwx) : ORIGIN = 0x20000000, LENGTH =  4K
+	ram_lz4_out (rwx) : ORIGIN = 0x20001000, LENGTH =  4K
 	/* RAM for M0 code */
-	ram_m0 (rwx)      : ORIGIN = 0x20002000, LENGTH = 20K
+	ram_m0      (rwx) : ORIGIN = 0x20002000, LENGTH = 20K
 	/* RAM shared between M0 and M4 */
-	ram_shared (rwx)  : ORIGIN = 0x20007000, LENGTH = 4K
-	/* USB buffer. Straddles two blocks of RAM
-	 * to get performance benefit of having two USB buffers addressable
-	 * simultaneously (on two different buses of the AHB multilayer matrix)
-	 */
-	ram_samp (rwx)     : ORIGIN = 0x20008000, LENGTH = 32K
+	ram_shared  (rwx) : ORIGIN = 0x20007000, LENGTH =  4K
+
+	/* - 0x2000 8000 : 16 kB AHB SRAM (LPC4350/30/20) ---------------------- */
+	/* - 0x2000 C000 : 16 kB AHB SRAM (LPC4350/30/20/10) ------------------- */
+	/* USB buffer. Straddles two blocks of RAM to get the performance benefit
+	 * of having two USB buffers addressable simultaneously (on two different
+	 * buses of the AHB multilayer matrix) */
+	ram_samp    (rwx) : ORIGIN = 0x20008000, LENGTH = 32K
+
+	/* - 0x8000 0000 : SPIFI data ------------------------------------------ */
+	/* Physical address in Flash used to copy Code from Flash to RAM */
+	rom_flash   (rx)  : ORIGIN = 0x80000000, LENGTH =  1M
 }
 
 lz4_in_buf = ORIGIN(ram_lz4_in);
@@ -43,4 +56,6 @@ lz4_out_buf = ORIGIN(ram_lz4_out);
 usb_samp_buffer = ORIGIN(ram_samp);
 usb_bulk_buffer = ORIGIN(ram_usb);
 m0_state = ORIGIN(ram_shared);
+
+PROVIDE(__ram_rtconfig_start__ = ORIGIN(ram_rtconfig));
 PROVIDE(__ram_m0_start__ = ORIGIN(ram_m0));
diff --git a/firmware/common/LPC43xx_M4_rtconfig.ld b/firmware/common/LPC43xx_M4_rtconfig.ld
new file mode 100644
index 000000000..255fb84d4
--- /dev/null
+++ b/firmware/common/LPC43xx_M4_rtconfig.ld
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012-2025 Great Scott Gadgets <info@greatscottgadgets.com>
+ * Copyright 2012 Jared Boone <jared@sharebrained.com>
+ *
+ * This file is part of HackRF
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+SECTIONS
+{
+    .rtconfig_text : {
+        KEEP(*(.rtconfig));
+        . = ALIGN(4);
+    } >ram_rtconfig AT >rom
+
+    PROVIDE(__rtconfig_start__ = LOADADDR(.rtconfig_text));
+    PROVIDE(__rtconfig_end__ = LOADADDR(.rtconfig_text) + SIZEOF(.rtconfig_text));
+}
diff --git a/firmware/common/platform_gpio.c b/firmware/common/platform_gpio.c
index eeecd90e1..c4a24c730 100644
--- a/firmware/common/platform_gpio.c
+++ b/firmware/common/platform_gpio.c
@@ -27,6 +27,7 @@
 
 // clang-format off
 
+__attribute__((section(".rtconfig")))
 const platform_gpio_t* platform_gpio(void)
 {
 	static const platform_gpio_t* _platform_gpio = NULL;
diff --git a/firmware/common/platform_scu.c b/firmware/common/platform_scu.c
index c9e468e90..e0f5794d4 100644
--- a/firmware/common/platform_scu.c
+++ b/firmware/common/platform_scu.c
@@ -29,6 +29,7 @@
 
 // clang-format off
 
+__attribute__((section(".rtconfig")))
 const platform_scu_t* platform_scu(void)
 {
 	static const platform_scu_t* _platform_scu = NULL;
diff --git a/firmware/common/portapack.c b/firmware/common/portapack.c
index b84bf03c4..ca1923beb 100644
--- a/firmware/common/portapack.c
+++ b/firmware/common/portapack.c
@@ -617,7 +617,7 @@ bool portapack_present(void)
 	return portapack_detected;
 }
 
-bool portapack_init(void)
+__attribute__((section(".rtconfig"))) bool portapack_init(void)
 {
 	if (portapack_detect()) {
 		portapack_if_init();
diff --git a/firmware/common/radio.c b/firmware/common/radio.c
index 36f65cad7..b947cd624 100644
--- a/firmware/common/radio.c
+++ b/firmware/common/radio.c
@@ -60,6 +60,7 @@ void radio_init(radio_t* const radio)
 	radio->config[RADIO_BANK_TX][RADIO_OPMODE] = TRANSCEIVER_MODE_TX;
 	radio->config[RADIO_BANK_IDLE][RADIO_BIAS_TEE] = false;
 	radio->regs_dirty = 0;
+	radio->regs_locked = 0;
 }
 
 static inline void mark_dirty(radio_t* const radio, radio_register_t reg)
@@ -67,6 +68,11 @@ static inline void mark_dirty(radio_t* const radio, radio_register_t reg)
 	radio->regs_dirty |= (1 << reg);
 }
 
+static inline bool check_locked(radio_t* const radio, radio_register_t reg)
+{
+	return radio->regs_locked & (1 << reg);
+}
+
 radio_error_t radio_reg_write(
 	radio_t* const radio,
 	const radio_register_bank_t bank,
@@ -77,6 +83,10 @@ radio_error_t radio_reg_write(
 		return RADIO_ERR_INVALID_REGISTER;
 	}
 
+	if (check_locked(radio, reg)) {
+		return RADIO_ERR_LOCKED_REGISTER;
+	}
+
 	switch (bank) {
 	case RADIO_BANK_REQUESTED:
 		mark_dirty(radio, reg);
@@ -107,6 +117,20 @@ uint64_t radio_reg_read(
 	return radio->config[bank][reg];
 }
 
+radio_error_t radio_reg_lock(
+	radio_t* const radio,
+	const radio_register_t reg,
+	const bool locked)
+{
+	if (reg > RADIO_NUM_REGS) {
+		return RADIO_ERR_INVALID_REGISTER;
+	}
+
+	radio->regs_locked = (radio->regs_locked & ~(1 << reg)) | (locked << reg);
+
+	return RADIO_OK;
+}
+
 static uint32_t radio_update_direction(radio_t* const radio, uint64_t* bank)
 {
 	const uint64_t requested = bank[RADIO_OPMODE];
diff --git a/firmware/common/radio.h b/firmware/common/radio.h
index 8e12471a4..caaa222d3 100644
--- a/firmware/common/radio.h
+++ b/firmware/common/radio.h
@@ -34,6 +34,7 @@ typedef enum {
 	RADIO_ERR_INVALID_PARAM = -2,
 	RADIO_ERR_INVALID_BANK = -3,
 	RADIO_ERR_INVALID_REGISTER = -4,
+	RADIO_ERR_LOCKED_REGISTER = -5,
 	RADIO_ERR_UNSUPPORTED_OPERATION = -10,
 	RADIO_ERR_UNIMPLEMENTED = -19,
 	RADIO_ERR_OTHER = -9999,
@@ -231,6 +232,7 @@ typedef struct {
 	radio_config_mode_t config_mode;
 	uint64_t config[RADIO_NUM_BANKS][RADIO_NUM_REGS];
 	volatile uint32_t regs_dirty;
+	uint32_t regs_locked;
 	update_fn update_cb;
 } radio_t;
 
@@ -254,6 +256,15 @@ uint64_t radio_reg_read(
 	const radio_register_bank_t bank,
 	const radio_register_t reg);
 
+/**
+ * Lock a register. Prevents any future calls to `radio_reg_write`
+ * from overwriting the current stored value of the register.
+ */
+radio_error_t radio_reg_lock(
+	radio_t* const radio,
+	const radio_register_t reg,
+	const bool locked);
+
 /**
  * Apply changes requested in RADIO_BANK_REQUESTED.
  * Return true if any changes were applied.
diff --git a/firmware/common/ui_portapack.c b/firmware/common/ui_portapack.c
index 3387b5ebf..c4326c63a 100644
--- a/firmware/common/ui_portapack.c
+++ b/firmware/common/ui_portapack.c
@@ -33,7 +33,8 @@
 
 /* Pixel data within a font or bitmap byte is "reversed": LSB is left-most pixel. */
 
-static const uint8_t font_fixed_8x16_glyph_data[] = {
+__attribute__((
+	section(".rtconfig"))) static const uint8_t font_fixed_8x16_glyph_data[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
 	0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x24, 0x24,
@@ -152,10 +153,11 @@ static const uint8_t font_fixed_8x16_glyph_data[] = {
 	0x10, 0x20, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x8e, 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const ui_font_t font_fixed_8x16 =
+__attribute__((section(".rtconfig"))) static const ui_font_t font_fixed_8x16 =
 	{{8, 16}, font_fixed_8x16_glyph_data, 0x20, 95, (8 * 16 + 7U) >> 3};
 
-static const uint8_t font_fixed_24x19_glyph_data[] = {
+__attribute__((
+	section(".rtconfig"))) static const uint8_t font_fixed_24x19_glyph_data[] = {
 	0xe0, 0xff, 0x07, 0xf8, 0xff, 0x1f, 0xf8, 0xff, 0x1f, 0x3c, 0x00, 0x3c, 0x1c,
 	0x00, 0x38, 0x1c, 0x00, 0x38, 0x1c, 0x00, 0x38, 0x1c, 0x00, 0x38, 0x1c, 0x00,
 	0x38, 0x1c, 0x00, 0x38, 0x1c, 0x00, 0x38, 0x1c, 0x00, 0x38, 0x1c, 0x00, 0x38,
@@ -202,10 +204,11 @@ static const uint8_t font_fixed_24x19_glyph_data[] = {
 	0x00, 0x3c, 0xf8, 0xff, 0x1f, 0xf8, 0xff, 0x1f, 0xe0, 0xff, 0x07,
 };
 
-static const ui_font_t font_fixed_24x19 =
+__attribute__((section(".rtconfig"))) static const ui_font_t font_fixed_24x19 =
 	{{24, 19}, font_fixed_24x19_glyph_data, 0x30, 10, (24 * 19 + 7U) >> 3};
 
-static const uint8_t font_fixed_16x14_glyph_data[] = {
+__attribute__((
+	section(".rtconfig"))) static const uint8_t font_fixed_16x14_glyph_data[] = {
 	0xf8, 0x1f, 0xfc, 0x3f, 0x0e, 0x70, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06,
 	0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x06, 0x60, 0x0e, 0x70, 0xfc, 0x3f,
 	0xf8, 0x1f, 0x00, 0x03, 0x80, 0x03, 0xc0, 0x03, 0xe0, 0x03, 0x70, 0x03, 0x20,
@@ -230,10 +233,10 @@ static const uint8_t font_fixed_16x14_glyph_data[] = {
 	0x60, 0x0e, 0x70, 0xfc, 0x3f, 0xf8, 0x1f,
 };
 
-static const ui_font_t font_fixed_16x14 =
+__attribute__((section(".rtconfig"))) static const ui_font_t font_fixed_16x14 =
 	{{16, 14}, font_fixed_16x14_glyph_data, 0x30, 10, (16 * 14 + 7U) >> 3};
 
-static const uint8_t bitmap_amp_rx_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_amp_rx_data[] = {
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x06, 0x00, 0x60, 0x06, 0x00, 0x60,
 	0x0c, 0x00, 0x30, 0x0c, 0x00, 0x30, 0x18, 0x00, 0x18, 0x18, 0x00, 0x18,
 	0x30, 0x00, 0x0c, 0x30, 0x00, 0x0c, 0x60, 0x00, 0x06, 0x60, 0x00, 0x06,
@@ -241,9 +244,11 @@ static const uint8_t bitmap_amp_rx_data[] = {
 	0x00, 0xc3, 0x00, 0x00, 0xc3, 0x00, 0x00, 0x66, 0x00, 0x00, 0x66, 0x00,
 	0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00};
 
-static const ui_bitmap_t bitmap_amp_rx = {{24, 24}, bitmap_amp_rx_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_amp_rx = {
+	{24, 24},
+	bitmap_amp_rx_data};
 
-static const uint8_t bitmap_amp_tx_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_amp_tx_data[] = {
 	0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00,
 	0x00, 0x66, 0x00, 0x00, 0x66, 0x00, 0x00, 0xc3, 0x00, 0x00, 0xc3, 0x00,
 	0x80, 0x81, 0x01, 0x80, 0x81, 0x01, 0xc0, 0x00, 0x03, 0xc0, 0x00, 0x03,
@@ -251,9 +256,11 @@ static const uint8_t bitmap_amp_tx_data[] = {
 	0x18, 0x00, 0x18, 0x18, 0x00, 0x18, 0x0c, 0x00, 0x30, 0x0c, 0x00, 0x30,
 	0x06, 0x00, 0x60, 0x06, 0x00, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-static const ui_bitmap_t bitmap_amp_tx = {{24, 24}, bitmap_amp_tx_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_amp_tx = {
+	{24, 24},
+	bitmap_amp_tx_data};
 
-static const uint8_t bitmap_antenna_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_antenna_data[] = {
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x06, 0x18, 0x60, 0x06, 0x18, 0x60,
 	0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
 	0x30, 0x18, 0x0c, 0x30, 0x18, 0x0c, 0x60, 0x18, 0x06, 0x60, 0x18, 0x06,
@@ -261,9 +268,11 @@ static const uint8_t bitmap_antenna_data[] = {
 	0x00, 0xdb, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00,
 	0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00};
 
-static const ui_bitmap_t bitmap_antenna = {{24, 24}, bitmap_antenna_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_antenna = {
+	{24, 24},
+	bitmap_antenna_data};
 
-static const uint8_t bitmap_filter_hp_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_filter_hp_data[] = {
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0,
 	0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0, 0x03, 0xf8, 0xc7, 0x03, 0xfc, 0xc7,
 	0x03, 0x0e, 0xc0, 0x03, 0x06, 0xc0, 0x03, 0x03, 0xc0, 0x03, 0x03, 0xc0,
@@ -271,9 +280,11 @@ static const uint8_t bitmap_filter_hp_data[] = {
 	0x63, 0x00, 0xc0, 0x63, 0x00, 0xc0, 0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0,
 	0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-static const ui_bitmap_t bitmap_filter_hp = {{24, 24}, bitmap_filter_hp_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_filter_hp = {
+	{24, 24},
+	bitmap_filter_hp_data};
 
-static const uint8_t bitmap_filter_lp_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_filter_lp_data[] = {
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0,
 	0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0, 0xe3, 0x1f, 0xc0, 0xe3, 0x3f, 0xc0,
 	0x03, 0x70, 0xc0, 0x03, 0x60, 0xc0, 0x03, 0xc0, 0xc0, 0x03, 0xc0, 0xc0,
@@ -281,9 +292,11 @@ static const uint8_t bitmap_filter_lp_data[] = {
 	0x03, 0x00, 0xc6, 0x03, 0x00, 0xc6, 0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0,
 	0x03, 0x00, 0xc0, 0x03, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-static const ui_bitmap_t bitmap_filter_lp = {{24, 24}, bitmap_filter_lp_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_filter_lp = {
+	{24, 24},
+	bitmap_filter_lp_data};
 
-static const uint8_t bitmap_mixer_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_mixer_data[] = {
 	0x00, 0x7e, 0x00, 0xc0, 0xff, 0x03, 0xe0, 0x81, 0x07, 0x70, 0x00, 0x0e,
 	0x38, 0x00, 0x1c, 0x7c, 0x00, 0x3e, 0xee, 0x00, 0x77, 0xc6, 0x81, 0x63,
 	0x86, 0xc3, 0x61, 0x03, 0xe7, 0xc0, 0x03, 0x7e, 0xc0, 0x03, 0x3c, 0xc0,
@@ -291,9 +304,11 @@ static const uint8_t bitmap_mixer_data[] = {
 	0xc6, 0x81, 0x63, 0xee, 0x00, 0x77, 0x7c, 0x00, 0x3e, 0x38, 0x00, 0x1c,
 	0x70, 0x00, 0x0e, 0xe0, 0x81, 0x07, 0xc0, 0xff, 0x03, 0x00, 0x7e, 0x00};
 
-static const ui_bitmap_t bitmap_mixer = {{24, 24}, bitmap_mixer_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_mixer = {
+	{24, 24},
+	bitmap_mixer_data};
 
-static const uint8_t bitmap_oscillator_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_oscillator_data[] = {
 	0x00, 0x7e, 0x00, 0xc0, 0xff, 0x03, 0xe0, 0x81, 0x07, 0x70, 0x00, 0x0e,
 	0x38, 0x00, 0x1c, 0x1c, 0x00, 0x38, 0x0e, 0x03, 0x70, 0x86, 0x07, 0x60,
 	0xc6, 0x0f, 0x60, 0xc3, 0x0c, 0xc0, 0xe3, 0x1c, 0xc0, 0x63, 0x18, 0xc6,
@@ -301,13 +316,18 @@ static const uint8_t bitmap_oscillator_data[] = {
 	0x06, 0xe0, 0x61, 0x0e, 0xc0, 0x70, 0x1c, 0x00, 0x38, 0x38, 0x00, 0x1c,
 	0x70, 0x00, 0x0e, 0xe0, 0x81, 0x07, 0xc0, 0xff, 0x03, 0x00, 0x7e, 0x00};
 
-static const ui_bitmap_t bitmap_oscillator = {{24, 24}, bitmap_oscillator_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_oscillator = {
+	{24, 24},
+	bitmap_oscillator_data};
 
-static const uint8_t bitmap_wire_8_data[] = {0xff, 0xff};
+__attribute__((
+	section(".rtconfig"))) static const uint8_t bitmap_wire_8_data[] = {0xff, 0xff};
 
-static const ui_bitmap_t bitmap_wire_8 = {{2, 8}, bitmap_wire_8_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_wire_8 = {
+	{2, 8},
+	bitmap_wire_8_data};
 
-static const uint8_t bitmap_wire_24_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_wire_24_data[] = {
 	0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00,
 	0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00,
 	0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00,
@@ -315,9 +335,11 @@ static const uint8_t bitmap_wire_24_data[] = {
 	0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00,
 	0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00};
 
-static const ui_bitmap_t bitmap_wire_24 = {{24, 24}, bitmap_wire_24_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_wire_24 = {
+	{24, 24},
+	bitmap_wire_24_data};
 
-static const uint8_t bitmap_blank_24_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_blank_24_data[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -325,23 +347,29 @@ static const uint8_t bitmap_blank_24_data[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static const ui_bitmap_t bitmap_blank_24 = {{24, 24}, bitmap_blank_24_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_blank_24 = {
+	{24, 24},
+	bitmap_blank_24_data};
 
-static const uint8_t bitmap_waves_rx_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_waves_rx_data[] = {
 	0xc0, 0x00, 0x60, 0x00, 0x70, 0x06, 0x30, 0x07, 0x38, 0x03, 0x98, 0x33,
 	0x98, 0x39, 0x98, 0x19, 0xcc, 0x18, 0xcc, 0x0c, 0xcc, 0x0c, 0xcc, 0x0c,
 	0xcc, 0x0c, 0xcc, 0x0c, 0xcc, 0x0c, 0xcc, 0x18, 0x98, 0x19, 0x98, 0x39,
 	0x98, 0x33, 0x38, 0x03, 0x30, 0x07, 0x70, 0x06, 0x60, 0x00, 0xc0, 0x00};
 
-static const ui_bitmap_t bitmap_waves_rx = {{16, 24}, bitmap_waves_rx_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_waves_rx = {
+	{16, 24},
+	bitmap_waves_rx_data};
 
-static const uint8_t bitmap_waves_tx_data[] = {
+__attribute__((section(".rtconfig"))) static const uint8_t bitmap_waves_tx_data[] = {
 	0x00, 0x03, 0x00, 0x06, 0x60, 0x0e, 0xe0, 0x0c, 0xc0, 0x1c, 0xcc, 0x19,
 	0x9c, 0x19, 0x98, 0x19, 0x18, 0x33, 0x30, 0x33, 0x30, 0x33, 0x30, 0x33,
 	0x30, 0x33, 0x30, 0x33, 0x30, 0x33, 0x18, 0x33, 0x98, 0x19, 0x9c, 0x19,
 	0xcc, 0x19, 0xc0, 0x1c, 0xe0, 0x0c, 0x60, 0x0e, 0x00, 0x06, 0x00, 0x03};
 
-static const ui_bitmap_t bitmap_waves_tx = {{16, 24}, bitmap_waves_tx_data};
+__attribute__((section(".rtconfig"))) static const ui_bitmap_t bitmap_waves_tx = {
+	{16, 24},
+	bitmap_waves_tx_data};
 
 __attribute__((unused)) static ui_color_t portapack_color_rgb(
 	const uint_fast8_t r,
diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake
index 8f6698da8..0bd85f7f8 100644
--- a/firmware/hackrf-common.cmake
+++ b/firmware/hackrf-common.cmake
@@ -88,14 +88,14 @@ endif()
 
 SET(HACKRF_OPTS "-D${BOARD} -DLPC43XX -D${MCU_PARTNO} -DTX_ENABLE -D'VERSION_STRING=\"${VERSION}\"'")
 
-SET(LDSCRIPT_M4 "-T${PATH_HACKRF_FIRMWARE_COMMON}/${MCU_PARTNO}_M4_memory.ld -Tlibopencm3_lpc43xx_rom_to_ram.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_M0_image_from_text.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_memory_rom_only.ld")
+SET(LDSCRIPT_M4 "-T${PATH_HACKRF_FIRMWARE_COMMON}/${MCU_PARTNO}_M4_memory.ld -Tlibopencm3_lpc43xx_rom_to_ram.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_M0_image_from_text.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_memory_rom_only.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_rtconfig.ld")
 
-SET(LDSCRIPT_M4_RAM "-T${PATH_HACKRF_FIRMWARE_COMMON}/${MCU_PARTNO}_M4_memory.ld -Tlibopencm3_lpc43xx.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_M0_image_from_text.ld")
+SET(LDSCRIPT_M4_RAM "-T${PATH_HACKRF_FIRMWARE_COMMON}/${MCU_PARTNO}_M4_memory.ld -Tlibopencm3_lpc43xx.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_M0_image_from_text.ld -T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M4_rtconfig.ld")
 
 SET(LDSCRIPT_M0 "-T${PATH_HACKRF_FIRMWARE_COMMON}/LPC43xx_M0_memory.ld -Tlibopencm3_lpc43xx_m0.ld")
 
 SET(CFLAGS_COMMON "-Os -g3 -Wall -Wextra -Wstrict-prototypes -Wold-style-definition ${HACKRF_OPTS} -fno-common -MD")
-SET(LDFLAGS_COMMON "-nostartfiles -Wl,--gc-sections")
+SET(LDFLAGS_COMMON "-nostartfiles -Wl,--gc-sections -Wl,--print-memory-usage")
 
 if(V STREQUAL "1")
 	SET(LDFLAGS_COMMON "${LDFLAGS_COMMON} -Wl,--print-gc-sections")
diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index d0c09c612..43b636d9e 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -94,6 +94,9 @@
 extern uint32_t __m0_start__;
 extern uint32_t __m0_end__;
 extern uint32_t __ram_m0_start__;
+extern uint32_t __rtconfig_start__;
+extern uint32_t __rtconfig_end__;
+extern uint32_t __ram_rtconfig_start__;
 extern uint32_t _etext_ram, _text_ram, _etext_rom;
 
 static usb_request_handler_fn vendor_request_handler[] = {
@@ -183,6 +186,7 @@ static usb_request_handler_fn vendor_request_handler[] = {
 	usb_vendor_request_read_radio_reg,
 	usb_vendor_request_get_buffer_size,
 	usb_vendor_request_read_temperature,
+	usb_vendor_request_lock_radio_reg,
 };
 
 static const uint32_t vendor_request_handler_count =
@@ -271,6 +275,20 @@ static void m0_rom_to_ram(void)
 	memcpy(dest, (uint32_t*) (base + src), len);
 }
 
+static void rtconfig_rom_to_ram(void)
+{
+	uint32_t* dest = &__ram_rtconfig_start__;
+
+	// Calculate the base address of ROM
+	uint32_t base = (uint32_t) (&_etext_rom - (&_etext_ram - &_text_ram));
+
+	// rtconfig image location, relative to the start of ROM
+	uint32_t src = (uint32_t) &__rtconfig_start__;
+
+	uint32_t len = (uint32_t) &__rtconfig_end__ - (uint32_t) src;
+	memcpy(dest, (uint32_t*) (base + src), len);
+}
+
 #if defined(IS_PRALINE) && !(defined(DFU_MODE) || defined(RAM_MODE))
 extern uint32_t _binary_fpga_bin_start;
 
@@ -422,6 +440,9 @@ int main(void)
 	// Copy M0 image from ROM before SPIFI is disabled
 	m0_rom_to_ram();
 
+	// Copy rtconfig image from ROM before SPIFI is disabled
+	rtconfig_rom_to_ram();
+
 	// This will be cleared if any self-test check fails.
 	selftest.report.pass = true;
 
diff --git a/firmware/hackrf_usb/usb_api_register.c b/firmware/hackrf_usb/usb_api_register.c
index 626c75089..a46a22404 100644
--- a/firmware/hackrf_usb/usb_api_register.c
+++ b/firmware/hackrf_usb/usb_api_register.c
@@ -416,3 +416,20 @@ usb_request_status_t usb_vendor_request_read_radio_reg(
 	}
 	return USB_REQUEST_STATUS_OK;
 }
+
+usb_request_status_t usb_vendor_request_lock_radio_reg(
+	usb_endpoint_t* const endpoint,
+	const usb_transfer_stage_t stage)
+{
+	if (stage == USB_TRANSFER_STAGE_SETUP) {
+		uint8_t reg = endpoint->setup.index;
+		bool locked = endpoint->setup.value != 0 ? true : false;
+		if (reg >= RADIO_NUM_REGS) {
+			return USB_REQUEST_STATUS_STALL;
+		}
+		radio_reg_lock(&radio, reg, locked);
+		usb_transfer_schedule_ack(endpoint->in);
+	}
+
+	return USB_REQUEST_STATUS_OK;
+}
diff --git a/firmware/hackrf_usb/usb_api_register.h b/firmware/hackrf_usb/usb_api_register.h
index a5a36550d..7e434c1a7 100644
--- a/firmware/hackrf_usb/usb_api_register.h
+++ b/firmware/hackrf_usb/usb_api_register.h
@@ -70,3 +70,6 @@ usb_request_status_t usb_vendor_request_write_radio_reg(
 usb_request_status_t usb_vendor_request_read_radio_reg(
 	usb_endpoint_t* const endpoint,
 	const usb_transfer_stage_t stage);
+usb_request_status_t usb_vendor_request_lock_radio_reg(
+	usb_endpoint_t* const endpoint,
+	const usb_transfer_stage_t stage);
diff --git a/firmware/hackrf_usb/usb_descriptor.c b/firmware/hackrf_usb/usb_descriptor.c
index dde22e6e3..726e126a0 100644
--- a/firmware/hackrf_usb/usb_descriptor.c
+++ b/firmware/hackrf_usb/usb_descriptor.c
@@ -28,7 +28,7 @@
 
 #define USB_VENDOR_ID (0x1D50)
 
-#define USB_API_VERSION (0x0113)
+#define USB_API_VERSION (0x0114)
 
 #define USB_WORD(x) (x & 0xFF), ((x >> 8) & 0xFF)
 
diff --git a/host/hackrf-tools/src/hackrf_debug.c b/host/hackrf-tools/src/hackrf_debug.c
index c009e84cf..f179090f7 100644
--- a/host/hackrf-tools/src/hackrf_debug.c
+++ b/host/hackrf-tools/src/hackrf_debug.c
@@ -545,6 +545,30 @@ int radio_write_register(
 	return result;
 }
 
+int radio_lock_register(
+	hackrf_device* device,
+	const uint16_t register_number,
+	const bool register_locked)
+{
+	int result = HACKRF_SUCCESS;
+	result = hackrf_radio_lock_register(
+		device,
+		(uint8_t) register_number,
+		register_locked);
+
+	if (result == HACKRF_SUCCESS) {
+		printf("register [%2d] -> %s\n",
+		       register_number,
+		       register_locked ? "locked" : "unlocked");
+	} else {
+		printf("hackrf_radio_lock_register() failed: %s (%d)\n",
+		       hackrf_error_name(result),
+		       result);
+	}
+
+	return result;
+}
+
 int read_register(
 	hackrf_device* device,
 	uint8_t part,
@@ -621,6 +645,20 @@ int write_register(
 	return HACKRF_ERROR_INVALID_PARAM;
 }
 
+int lock_register(
+	hackrf_device* device,
+	uint8_t part,
+	const uint16_t register_number,
+	const bool register_locked)
+{
+	switch (part) {
+	case PART_RADIO:
+		return radio_lock_register(device, register_number, register_locked);
+	default:
+		return HACKRF_ERROR_INVALID_PARAM;
+	}
+}
+
 static const char* mode_name(uint32_t mode)
 {
 	const char* mode_names[] = {"IDLE", "WAIT", "RX", "TX_START", "TX_RUN"};
@@ -675,6 +713,7 @@ static void usage()
 	printf("\t-n, --register <n>: set register number for read/write operations\n");
 	printf("\t-r, --read: read register specified by last -n argument, or all registers\n");
 	printf("\t-w, --write <v>: write register specified by last -n argument with value <v>\n");
+	printf("\t-L, --lock <state>: lock register specified by last -n argument (0 for unlocked, 1 for locked)\n");
 	printf("\t-c, --config: print SI5351C multisynth configuration information\n");
 	printf("\t-d, --device <s>: specify a particular device by serial number\n");
 	printf("\t-m, --max283x: target MAX283x\n");
@@ -710,6 +749,7 @@ static struct option long_options[] = {
 	{"register", required_argument, 0, 'n'},
 	{"write", required_argument, 0, 'w'},
 	{"read", no_argument, 0, 'r'},
+	{"lock", required_argument, 0, 'L'},
 	{"device", required_argument, 0, 'd'},
 	{"help", no_argument, 0, 'h'},
 	{"max2837", no_argument, 0, 'm'},
@@ -742,10 +782,12 @@ int main(int argc, char** argv)
 	int bank = -1;
 	uint64_t register_number = REGISTER_INVALID;
 	uint64_t register_value;
+	uint64_t register_locked;
 	hackrf_device* device = NULL;
 	int option_index = 0;
 	bool read = false;
 	bool write = false;
+	bool lock = false;
 	bool dump_config = false;
 	bool dump_state = false;
 	uint8_t part = PART_NONE;
@@ -785,7 +827,7 @@ int main(int argc, char** argv)
 	while ((opt = getopt_long(
 			argc,
 			argv,
-			"b:n:rw:d:cmsfgi1:2:C:N:P:ST:R:h?u:l:ta:op",
+			"b:n:rw:L:d:cmsfgi1:2:C:N:P:ST:R:h?u:l:ta:op",
 			long_options,
 			&option_index)) != EOF) {
 		switch (opt) {
@@ -808,6 +850,11 @@ int main(int argc, char** argv)
 			read = true;
 			break;
 
+		case 'L':
+			lock = true;
+			result = parse_int(optarg, &register_locked);
+			break;
+
 		case 'c':
 			dump_config = true;
 			break;
@@ -938,8 +985,8 @@ int main(int argc, char** argv)
 		}
 	}
 
-	if (write && read) {
-		fprintf(stderr, "Read and write options are mutually exclusive.\n");
+	if ((write && read) || (lock && write) || (lock && read)) {
+		fprintf(stderr, "Read, write and lock options are mutually exclusive.\n");
 		usage();
 		return EXIT_FAILURE;
 	}
@@ -956,6 +1003,10 @@ int main(int argc, char** argv)
 		return EXIT_FAILURE;
 	}
 
+	if (lock && part != PART_RADIO) {
+		fprintf(stderr, "Lock option is only valid for radio.\n");
+	}
+
 	if ((bank > -1) && (part != PART_RADIO)) {
 		fprintf(stderr, "Bank valid only for radio.\n");
 		usage();
@@ -966,11 +1017,11 @@ int main(int argc, char** argv)
 		bank = 0;
 	}
 
-	if (!(write || read || dump_config || dump_state || set_tx_limit ||
+	if (!(write || read || lock || dump_config || dump_state || set_tx_limit ||
 	      set_rx_limit || set_ui || set_leds || set_p1 || set_p2 || set_clkin ||
 	      set_narrowband || set_fpga_bitstream || read_selftest || test_rtc_osc ||
 	      read_adc || read_temp)) {
-		fprintf(stderr, "Specify read, write, or config option.\n");
+		fprintf(stderr, "Specify read, write, lock, or config option.\n");
 		usage();
 		return EXIT_FAILURE;
 	}
@@ -1023,6 +1074,10 @@ int main(int argc, char** argv)
 		}
 	}
 
+	if (lock) {
+		result = lock_register(device, part, register_number, register_locked);
+	}
+
 	if (dump_config) {
 		si5351c_read_configuration(device);
 	}
diff --git a/host/libhackrf/src/hackrf.c b/host/libhackrf/src/hackrf.c
index 2efbfea42..80e8d3196 100644
--- a/host/libhackrf/src/hackrf.c
+++ b/host/libhackrf/src/hackrf.c
@@ -122,6 +122,7 @@ typedef enum {
 	HACKRF_VENDOR_REQUEST_RADIO_READ_REG = 60,
 	HACKRF_VENDOR_REQUEST_GET_BUFFER_SIZE = 61,
 	HACKRF_VENDOR_REQUEST_READ_TEMPERATURE = 62,
+	HACKRF_VENDOR_REQUEST_RADIO_LOCK_REG = 63,
 } hackrf_vendor_request;
 
 #define USB_CONFIG_STANDARD 0x1
@@ -3598,6 +3599,33 @@ int ADDCALL hackrf_radio_write_register(
 	}
 }
 
+int ADDCALL hackrf_radio_lock_register(
+	hackrf_device* device,
+	const uint8_t register_number,
+	const bool register_locked)
+{
+	USB_API_REQUIRED(device, 0x0114);
+	int result;
+
+	result = libusb_control_transfer(
+		device->usb_device,
+		LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR |
+			LIBUSB_RECIPIENT_DEVICE,
+		HACKRF_VENDOR_REQUEST_RADIO_LOCK_REG,
+		register_locked,
+		register_number,
+		NULL,
+		0,
+		DEFAULT_REQUEST_TIMEOUT);
+
+	if (result != 0) {
+		last_libusb_error = result;
+		return HACKRF_ERROR_LIBUSB;
+	}
+
+	return HACKRF_SUCCESS;
+}
+
 #ifdef __cplusplus
 } // __cplusplus defined.
 #endif
diff --git a/host/libhackrf/src/hackrf.h b/host/libhackrf/src/hackrf.h
index d9322d3c2..e0c09cda4 100644
--- a/host/libhackrf/src/hackrf.h
+++ b/host/libhackrf/src/hackrf.h
@@ -2395,6 +2395,20 @@ extern ADDAPI int ADDCALL hackrf_radio_write_register(
 	const uint8_t register_number,
 	const uint64_t value);
 
+/**
+ * Lock or unlock a radio configuration register.
+ *
+ * @param[in] device device to write
+ * @param[in] register_number register number to mask
+ * @param[out] locked locked state for the register
+ * @return @ref HACKRF_SUCCESS on success or @ref hackrf_error variant
+ * @ingroup debug
+ */
+extern ADDAPI int ADDCALL hackrf_radio_lock_register(
+	hackrf_device* device,
+	const uint8_t register_number,
+	const bool register_locked);
+
 #ifdef __cplusplus
 } // __cplusplus defined.
 #endif