# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1639176008 0
# Node ID 30f567edd2b661d5da1fd192af78c9ecd3ae1bac
# Parent  09cda55086b15a4b9a45e6387ac38bf331067e75
add option of reverting to Calypso FDP for flash reset

diff -r 09cda55086b1 -r 30f567edd2b6 venus/src/MCL
--- a/venus/src/MCL	Fri Dec 10 20:26:05 2021 +0000
+++ b/venus/src/MCL	Fri Dec 10 22:40:08 2021 +0000
@@ -1221,6 +1221,13 @@
  part=MNR04-10k
  slotmap=slotmap/R361
 
+R372:
+ hier=mob.core.FDP_reset_option
+ footprint=0402
+ value=DNP
+ part=none
+ npins=2
+
 R401:
  hier=mob.uart.Host_TxD_pullup
  part=0402R-22k
diff -r 09cda55086b1 -r 30f567edd2b6 venus/src/core/core.v
--- a/venus/src/core/core.v	Fri Dec 10 20:26:05 2021 +0000
+++ b/venus/src/core/core.v	Fri Dec 10 22:40:08 2021 +0000
@@ -86,7 +86,7 @@
 wire Vflash, Vsram;
 wire MCU_FDP, MCU_nBLE, MCU_nBHE;
 wire INT_nCS0, INT_nCS1, INT_nCS2;
-wire ON_nOFF_2V8;
+wire Flash_RST;
 
 /* instantiate the blocks! */
 
@@ -100,7 +100,7 @@
 	     .RPWON(RPWON),
 	     .nTESTRESET(nTESTRESET),
 	     .ON_nOFF(ON_nOFF),
-	     .ON_nOFF_2V8(ON_nOFF_2V8),
+	     .ON_nOFF_2V8(Flash_RST),
 	     .CLKTCXO_IN(Clock_26MHz_DBB_in),
 	     .TDI(TDI),
 	     .TDO(TDO),
@@ -202,12 +202,18 @@
 	    .MCU_nWR(MCU_RnW),
 	    .MCU_nBHE(MCU_nBHE),
 	    .MCU_nBLE(MCU_nBLE),
-	    .Flash_RST(ON_nOFF_2V8),
+	    .Flash_RST(Flash_RST),
 	    .CS_flash1(INT_nCS0),
 	    .CS_flash2(INT_nCS2),
 	    .CS_RAM(INT_nCS1)
 	);
 
+/*
+ * The following resistor footprint must be left unpopulated
+ * when U303 (74AXP1T34) is populated, and vice-versa.
+ */
+resistor FDP_reset_option (MCU_FDP, Flash_RST);
+
 rf_section rf  (.GND(GND),
 		.VBAT_REG(VBAT2),
 		.VBAT_PA(VBAT3),