diff --git a/src/mainboard/nintendo/switch/bootblock.c b/src/mainboard/nintendo/switch/bootblock.c
index fd5d293b6c..edae18f304 100644
--- a/src/mainboard/nintendo/switch/bootblock.c
+++ b/src/mainboard/nintendo/switch/bootblock.c
@@ -35,27 +35,6 @@ static const struct pad_config pmic_pads[] = {
 	PAD_CFG_SFIO(PWR_I2C_SDA, PINMUX_INPUT_ENABLE, I2CPMU),
 };
 
-/********************** SPI Flash *****************************/
-static const struct pad_config spiflash_pads[] = {
-	/* QSPI fLash: mosi, miso, clk, cs0, hold, wp  */
-	PAD_CFG_SFIO(QSPI_IO0, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP |
-		     PINMUX_DRIVE_2X, QSPI),
-	PAD_CFG_SFIO(QSPI_IO1, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP |
-		     PINMUX_DRIVE_2X, QSPI),
-	PAD_CFG_SFIO(QSPI_SCK, PINMUX_INPUT_ENABLE | PINMUX_DRIVE_2X, QSPI),
-	PAD_CFG_SFIO(QSPI_CS_N, PINMUX_INPUT_ENABLE | PINMUX_DRIVE_2X, QSPI),
-	PAD_CFG_SFIO(QSPI_IO2, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP |
-		     PINMUX_DRIVE_2X, QSPI),
-	PAD_CFG_SFIO(QSPI_IO3, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP |
-		     PINMUX_DRIVE_2X, QSPI),
-};
-
-/********************* TPM ************************************/
-static const struct pad_config tpm_pads[] = {
-	PAD_CFG_SFIO(GEN3_I2C_SCL, PINMUX_INPUT_ENABLE, I2C3),
-	PAD_CFG_SFIO(GEN3_I2C_SDA, PINMUX_INPUT_ENABLE, I2C3),
-};
-
 /********************* EC *************************************/
 static const struct pad_config ec_i2c_pads[] = {
 	PAD_CFG_SFIO(GEN2_I2C_SCL, PINMUX_INPUT_ENABLE, I2C2),
@@ -66,10 +45,6 @@ static const struct pad_config ec_i2c_pads[] = {
 static const struct funit_cfg funits[] = {
 	/* PMIC on I2C5 (PWR_I2C* pads) at 400kHz. */
 	FUNIT_CFG(I2C5, PLLP, 400, pmic_pads, ARRAY_SIZE(pmic_pads)),
-	/* SPI flash at 24MHz on QSPI controller. */
-	FUNIT_CFG(QSPI, PLLP, 24000, spiflash_pads, ARRAY_SIZE(spiflash_pads)),
-	/* TPM on I2C3  @ 400kHz */
-	FUNIT_CFG(I2C3, PLLP, 400, tpm_pads, ARRAY_SIZE(tpm_pads)),
 	/* EC on I2C2 - pulled to 3.3V @ 100kHz */
 	FUNIT_CFG(I2C2, PLLP, 100, ec_i2c_pads, ARRAY_SIZE(ec_i2c_pads)),
 };
@@ -94,28 +69,27 @@ static void set_clock_sources(void)
 	write32(CLK_RST_REG(clk_src_uarta), PLLP << CLK_SOURCE_SHIFT);
 }
 
+#if 0
 /********************* PADs ***********************************/
 static const struct pad_config padcfgs[] = {
 	/* Board build id bits 1:0 */
 	PAD_CFG_GPIO_INPUT(GPIO_PK1, PINMUX_PULL_NONE),
 	PAD_CFG_GPIO_INPUT(GPIO_PK0, PINMUX_PULL_NONE),
 };
+#endif
 
 void bootblock_mainboard_init(void)
 {
 	set_clock_sources();
 
 	/* Set up the pads required to load romstage. */
-	soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
+	// XXX soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
 	soc_configure_funits(funits, ARRAY_SIZE(funits));
 
 	/* PMIC */
 	i2c_init(I2CPWR_BUS);
 	pmic_init(I2CPWR_BUS);
 
-	/* TPM */
-	i2c_init(I2C3_BUS);
-
 	/* EC */
 	i2c_init(I2C2_BUS);
 
diff --git a/src/mainboard/nintendo/switch/mainboard.c b/src/mainboard/nintendo/switch/mainboard.c
index 94863d8bc8..644fb9bab5 100644
--- a/src/mainboard/nintendo/switch/mainboard.c
+++ b/src/mainboard/nintendo/switch/mainboard.c
@@ -37,6 +37,7 @@
 #include "gpio.h"
 #include "pmic.h"
 
+#if 0
 static const struct pad_config padcfgs[] = {
 	PAD_CFG_GPIO_INPUT(USB_VBUS_EN1, PINMUX_PULL_NONE | PINMUX_PARKED |
 			   PINMUX_INPUT_ENABLE | PINMUX_LPDR | PINMUX_IO_HV),
@@ -182,12 +183,14 @@ static void powergate_unused_partitions(void)
 	for (i = 0; i < ARRAY_SIZE(partitions); i++)
 		power_gate_partition(partitions[i]);
 }
+#endif
 
 static void mainboard_init(device_t dev)
 {
-	soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
-	soc_configure_funits(funits, ARRAY_SIZE(funits));
+	//soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
+	//soc_configure_funits(funits, ARRAY_SIZE(funits));
 
+#if 0
 	/* I2C6 bus (audio, etc.) */
 	soc_configure_i2c6pad();
 	i2c_init(I2C6_BUS);
@@ -196,13 +199,14 @@ static void mainboard_init(device_t dev)
 	/* if panel needs to bringup */
 	if (display_init_required())
 		configure_display_blocks();
+#endif
 
-	powergate_unused_partitions();
+	//powergate_unused_partitions();
 }
 
 void display_startup(device_t dev)
 {
-	dsi_display_startup(dev);
+	//dsi_display_startup(dev);
 }
 
 static void mainboard_enable(device_t dev)
diff --git a/src/mainboard/nintendo/switch/romstage.c b/src/mainboard/nintendo/switch/romstage.c
index fd7c07f84d..09bbed34cc 100644
--- a/src/mainboard/nintendo/switch/romstage.c
+++ b/src/mainboard/nintendo/switch/romstage.c
@@ -25,6 +25,7 @@
 #include "gpio.h"
 #include "pmic.h"
 
+#if 0
 static const struct pad_config padcfgs[] = {
 	/* AP_SYS_RESET_L - active low*/
 	PAD_CFG_GPIO_OUT1(SDMMC1_DAT0, PINMUX_PULL_UP),
@@ -37,10 +38,11 @@ static const struct pad_config padcfgs[] = {
 	/* BTN_AP_VOLU_L - active low */
 	PAD_CFG_GPIO_INPUT(SDMMC1_DAT1, PINMUX_PULL_UP),
 };
+#endif
 
 void romstage_mainboard_init(void)
 {
-	soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
+	//soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs));
 }
 
 void mainboard_configure_pmc(void)
diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c
index 3d4e8812a6..36d8b0f806 100644
--- a/src/soc/nvidia/tegra210/bootblock.c
+++ b/src/soc/nvidia/tegra210/bootblock.c
@@ -129,6 +129,7 @@ static struct workaround_op workaround_sequence[] = {
  */
 static void mbist_workaround(void)
 {
+return; // XXX
 	int i;
 	u32 val;
 	struct workaround_op *wa_op;
@@ -158,7 +159,7 @@ static void mbist_workaround(void)
 void main(void)
 {
 	// enable JTAG at the earliest stage
-	enable_jtag();
+	//enable_jtag();
 
 	mbist_workaround();